🔨 [Refactoring] Admin 페이지 프론트 요청사항에 의한 변경사항 #1156 (#1157)

Author: seyeon22222

gg-admin-repo/src/main/java/gg/admin/repo/calendar/PublicScheduleAdminRepository.java

@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
@@ -17,7 +15,7 @@ public interface PublicScheduleAdminRepository extends JpaRepository<PublicSched
 
 	List<PublicSchedule> findByAuthor(String author);
 
-	Page<PublicSchedule> findAllByClassification(DetailClassification detailClassification, Pageable pageable);
+	List<PublicSchedule> findAllByClassification(DetailClassification detailClassification);
 
 	List<PublicSchedule> findAll();
 }

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/totalschedule/controller/TotalScheduleAdminController.java

@@ -10,12 +10,9 @@
 import org.springframework.web.bind.annotation.RestController;
 
 import gg.calendar.api.admin.schedule.totalschedule.controller.request.TotalScheduleAdminSearchReqDto;
-import gg.calendar.api.admin.schedule.totalschedule.controller.response.TotalScheduleAdminResDto;
 import gg.calendar.api.admin.schedule.totalschedule.controller.response.TotalScheduleAdminSearchListResDto;
 import gg.calendar.api.admin.schedule.totalschedule.service.TotalScheduleAdminService;
 import gg.data.calendar.type.DetailClassification;
-import gg.utils.dto.PageRequestDto;
-import gg.utils.dto.PageResponseDto;
 import lombok.RequiredArgsConstructor;
 
 @RestController
@@ -26,26 +23,13 @@ public class TotalScheduleAdminController {
 	private final TotalScheduleAdminService totalScheduleAdminService;
 
 	@GetMapping("/list/{detailClassification}")
-	public ResponseEntity<PageResponseDto<TotalScheduleAdminResDto>> totalScheduleAdminClassificationList(
-		@PathVariable DetailClassification detailClassification, @ModelAttribute @Valid PageRequestDto pageRequestDto) {
-		int page = pageRequestDto.getPage();
-		int size = pageRequestDto.getSize();
+	public ResponseEntity<TotalScheduleAdminSearchListResDto> totalScheduleAdminClassificationList(
+		@PathVariable DetailClassification detailClassification) {
 
-		PageResponseDto<TotalScheduleAdminResDto> pageResponseDto = totalScheduleAdminService.findAllByClassification(
-			detailClassification, page, size);
+		TotalScheduleAdminSearchListResDto scheduleList = totalScheduleAdminService.findAllByClassification(
+			detailClassification);
 
-		return ResponseEntity.ok(pageResponseDto);
-	}
-
-	@GetMapping
-	public ResponseEntity<PageResponseDto<TotalScheduleAdminResDto>> totalScheduleAdminPageList(
-		@ModelAttribute @Valid PageRequestDto pageRequestDto) {
-		int page = pageRequestDto.getPage();
-		int size = pageRequestDto.getSize();
-
-		PageResponseDto<TotalScheduleAdminResDto> pageResponseDto = totalScheduleAdminService.findAll(page, size);
-
-		return ResponseEntity.ok(pageResponseDto);
+		return ResponseEntity.ok(scheduleList);
 	}
 
 	@GetMapping("/search")
@@ -63,4 +47,5 @@ public ResponseEntity<TotalScheduleAdminSearchListResDto> totalScheduleAdminList
 
 		return ResponseEntity.ok(scheduleList);
 	}
+
 }

gg-calendar-api/src/main/java/gg/calendar/api/admin/schedule/totalschedule/service/TotalScheduleAdminService.java

@@ -33,19 +33,16 @@ public class TotalScheduleAdminService {
 
 	private final PublicScheduleAdminRepository publicScheduleAdminRepository;
 
-	public PageResponseDto<TotalScheduleAdminResDto> findAllByClassification(DetailClassification detailClassification,
-		int page, int size) {
+	public TotalScheduleAdminSearchListResDto findAllByClassification(DetailClassification detailClassification) {
 
-		Pageable pageable = PageRequest.of(page - 1, size,
-			Sort.by(Sort.Order.asc("status"), Sort.Order.asc("startTime")));
-
-		Page<PublicSchedule> publicSchedules = publicScheduleAdminRepository.findAllByClassification(
-			detailClassification, pageable);
+		List<PublicSchedule> scheduleList = publicScheduleAdminRepository.findAllByClassification(
+			detailClassification);
 
-		List<TotalScheduleAdminResDto> publicScheduleList = publicSchedules.stream()
-			.map(TotalScheduleAdminResDto::new)
-			.collect(Collectors.toList());
-		return PageResponseDto.of(publicSchedules.getTotalElements(), publicScheduleList);
+		return TotalScheduleAdminSearchListResDto.builder()
+			.schedules(scheduleList.stream()
+				.map(TotalScheduleAdminResDto::new)
+				.collect(Collectors.toList()))
+			.build();
 	}
 
 	public PageResponseDto<TotalScheduleAdminResDto> findAll(int page, int size) {
@@ -92,6 +89,7 @@ public TotalScheduleAdminSearchListResDto searchTotalScheduleAdminList(TotalSche
 
 	public TotalScheduleAdminSearchListResDto totalScheduleAdminList() {
 		List<PublicSchedule> schedules = publicScheduleAdminRepository.findAll();
+
 		return TotalScheduleAdminSearchListResDto.builder()
 			.schedules(schedules.stream()
 				.map(TotalScheduleAdminResDto::new)

gg-calendar-api/src/test/java/gg/calendar/api/admin/schedule/totalschedule/controller/TotalScheduleAdminControllerTest.java

@@ -7,7 +7,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
 import java.time.LocalDate;
-import java.util.List;
 import java.util.stream.Stream;
 
 import javax.transaction.Transactional;
@@ -26,20 +25,17 @@
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import gg.calendar.api.admin.schedule.privateschedule.PrivateScheduleAdminMockData;
 import gg.calendar.api.admin.schedule.publicschedule.PublicScheduleAdminMockData;
 import gg.calendar.api.admin.schedule.totalschedule.controller.request.TotalScheduleAdminSearchReqDto;
 import gg.calendar.api.admin.schedule.totalschedule.controller.response.TotalScheduleAdminResDto;
 import gg.calendar.api.admin.schedule.totalschedule.controller.response.TotalScheduleAdminSearchListResDto;
-import gg.data.calendar.type.DetailClassification;
 import gg.data.user.User;
 import gg.utils.TestDataUtils;
 import gg.utils.annotation.IntegrationTest;
 import gg.utils.dto.PageRequestDto;
-import gg.utils.dto.PageResponseDto;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -79,8 +75,8 @@ void setUp() {
 	class GetTotalScheduleAdminTest {
 
 		private Stream<Arguments> inputParams() {
-			return Stream.of(Arguments.of("EVENT", 2, 10), Arguments.of("JOB_NOTICE", 1, 10),
-				Arguments.of("PRIVATE_SCHEDULE", 1, 2));
+			return Stream.of(Arguments.of("EVENT"), Arguments.of("JOB_NOTICE"),
+				Arguments.of("PRIVATE_SCHEDULE"));
 		}
 
 		private Stream<Arguments> inputPageReqDto() {
@@ -117,120 +113,44 @@ private Stream<Arguments> inputSearchParamEndBeforeStart() {
 		@ParameterizedTest
 		@MethodSource("inputParams")
 		@DisplayName("Admin TotalSchedule 태그 조회 테스트 - 성공")
-		void getTotalAdminClassificationListTestSuccess(String tags, int page, int size) throws Exception {
+		void getTotalAdminClassificationListTestSuccess(String tags) throws Exception {
 			// given
 			publicScheduleAdminMockData.createPublicScheduleEvent(20);
 			publicScheduleAdminMockData.createPublicScheduleJob(10);
 			publicScheduleAdminMockData.createPublicSchedulePrivate(5);
 
-			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-			params.add("page", String.valueOf(page));
-			params.add("size", String.valueOf(size));
-
 			// when
 			// multivalue map 을 통해서 값이 넘어옴
 			String response = mockMvc.perform(
 					get("/admin/calendar/list/{detailClassification}", tags).header("Authorization",
-						"Bearer " + accessToken).params(params))
+						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isOk())
 				.andReturn()
 				.getResponse()
 				.getContentAsString();
 
 			// then
-			PageResponseDto<TotalScheduleAdminResDto> pageResponseDto = objectMapper.readValue(response,
-				new TypeReference<>() {
-				});
-			List<TotalScheduleAdminResDto> result = pageResponseDto.getContent();
-
-			if (DetailClassification.valueOf(tags) == DetailClassification.PRIVATE_SCHEDULE) {
-				assertThat(result.size()).isEqualTo(2);
-			} else {
-				assertThat(result.size()).isEqualTo(10);
-			}
+			TotalScheduleAdminSearchListResDto result = objectMapper.readValue(response,
+				TotalScheduleAdminSearchListResDto.class);
 
-			for (TotalScheduleAdminResDto dto : result) {
-				System.out.println(dto.toString());
+			for (TotalScheduleAdminResDto dto : result.getTotalScheduleAdminResDtoList()) {
+				System.out.println("asdf : " + dto.toString());
 			}
 		}
 
-		@ParameterizedTest
-		@MethodSource("inputPageReqDto")
+		@Test
 		@DisplayName("Admin TotalSchedule 태그 조회 테스트 - 실패 : 잘못된 태그가 들어왔을 경우")
-		void getTotalAdminClassificationListTestFailNotMatchTag(PageRequestDto pageRequestDto) throws Exception {
+		void getTotalAdminClassificationListTestFailNotMatchTag() throws Exception {
 			// given
 			publicScheduleAdminMockData.createPublicScheduleEvent(20);
 			publicScheduleAdminMockData.createPublicScheduleJob(10);
 			publicScheduleAdminMockData.createPublicSchedulePrivate(5);
 
-			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-			params.add("page", String.valueOf(pageRequestDto.getPage()));
-			params.add("size", String.valueOf(pageRequestDto.getSize()));
-
 			// when
 			String response = mockMvc.perform(
 					get("/admin/calendar/list/{detailClassification}", "qweksd").header("Authorization",
-						"Bearer " + accessToken).params(params))
-				.andDo(print())
-				.andExpect(status().isBadRequest())
-				.andReturn()
-				.getResponse()
-				.getContentAsString();
-
-			// then
-			log.info("response :{}", response);
-		}
-
-		@ParameterizedTest
-		@MethodSource("inputPageReqDto")
-		@DisplayName("Admin TotalSchedule 페이지 조회 테스트 - 성공")
-		void getTotalAdminPageNationListTesSuccess(PageRequestDto pageRequestDto) throws Exception {
-			// given
-			publicScheduleAdminMockData.createPublicScheduleEvent(20);
-			publicScheduleAdminMockData.createPublicScheduleJob(10);
-			privateScheduleAdminMockData.createPrivateSchedules(5, user);
-
-			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-			params.add("page", String.valueOf(pageRequestDto.getPage()));
-			params.add("size", String.valueOf(pageRequestDto.getSize()));
-
-			// when
-			String response = mockMvc.perform(
-					get("/admin/calendar").header("Authorization", "Bearer " + accessToken).params(params))
-				.andDo(print())
-				.andExpect(status().isOk())
-				.andReturn()
-				.getResponse()
-				.getContentAsString();
-
-			// then
-			PageResponseDto<TotalScheduleAdminResDto> pageResponseDto = objectMapper.readValue(response,
-				new TypeReference<>() {
-				});
-			List<TotalScheduleAdminResDto> result = pageResponseDto.getContent();
-
-			for (TotalScheduleAdminResDto dto : result) {
-				System.out.println(dto.toString());
-			}
-		}
-
-		@ParameterizedTest
-		@MethodSource("invalidInput")
-		@DisplayName("Admin TotalSchedule 페이지 조회 테스트 - 실패 : 페이지 입력값이 잘못된 값일 경우")
-		void getTotalAdminPageNationListTestFailInvalidPage(PageRequestDto pageRequestDto) throws Exception {
-			// given
-			publicScheduleAdminMockData.createPublicScheduleEvent(20);
-			publicScheduleAdminMockData.createPublicScheduleJob(10);
-			privateScheduleAdminMockData.createPrivateSchedules(5, user);
-
-			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-			params.add("page", String.valueOf(pageRequestDto.getPage()));
-			params.add("size", String.valueOf(pageRequestDto.getSize()));
-
-			// when
-			String response = mockMvc.perform(
-					get("/admin/calendar").header("Authorization", "Bearer " + accessToken).params(params))
+						"Bearer " + accessToken))
 				.andDo(print())
 				.andExpect(status().isBadRequest())
 				.andReturn()