🔨 [Refactoring] && 🧪 [Test] Party 테스트코드 리팩토링 및 중복처리를 위한 에러코드 수정에 따른 t…

…est 코드 추가 (#770)

gg-pingpong-api/src/main/java/gg/party/api/admin/comment/service/CommentAdminService.java

@@ -7,6 +7,7 @@
 import gg.admin.repo.comment.CommentAdminRepository;
 import gg.data.party.Comment;
 import gg.party.api.admin.comment.controller.request.CommentUpdateAdminReqDto;
+import gg.utils.exception.party.ChangeSameStatusException;
 import gg.utils.exception.party.CommentNotFoundException;
 import lombok.RequiredArgsConstructor;
 
@@ -18,12 +19,16 @@ public class CommentAdminService {
 	/**
 	 * 댓글 숨김
 	 * @param commentId 댓글 번호
-	 * @exception CommentNotFoundException 유효하지 않은 댓글
+	 * @throws CommentNotFoundException 유효하지 않은 댓글 입력 - 404
+	 * @throws ChangeSameStatusException 같은 상태로 변경 - 409
 	 */
 	@Transactional
 	public void modifyHideComment(Long commentId, CommentUpdateAdminReqDto reqDto) {
 		Comment comment = commentAdminRepository.findById(commentId)
 			.orElseThrow(CommentNotFoundException::new);
+		if (reqDto.getIsHidden() == comment.isHidden()) {
+			throw new ChangeSameStatusException();
+		}
 		comment.updateHidden(reqDto.getIsHidden());
 	}
 }

gg-pingpong-api/src/main/java/gg/party/api/admin/room/service/RoomAdminService.java

@@ -23,8 +23,8 @@
 import gg.repo.party.CommentRepository;
 import gg.repo.party.RoomRepository;
 import gg.repo.party.UserRoomRepository;
+import gg.utils.exception.party.ChangeSameStatusException;
 import gg.utils.exception.party.RoomNotFoundException;
-import gg.utils.exception.party.RoomSameStatusException;
 import lombok.RequiredArgsConstructor;
 
 @Service
@@ -39,15 +39,15 @@ public class RoomAdminService {
 	 * @param roomId 방 id
 	 * @param newStatus 바꿀 status
 	 * @exception RoomNotFoundException 유효하지 않은 방 입력 - 404
-	 * @exception RoomSameStatusException 같은 상태로 변경 -409
+	 * @exception ChangeSameStatusException 같은 상태로 변경 - 409
 	 */
 	@Transactional
 	public void modifyRoomStatus(Long roomId, RoomType newStatus) {
 		Room room = roomRepository.findById(roomId)
 			.orElseThrow(RoomNotFoundException::new);
 
 		if (room.getStatus() == newStatus) {
-			throw new RoomSameStatusException();
+			throw new ChangeSameStatusException();
 		}
 
 		room.updateRoomStatus(newStatus);

gg-pingpong-api/src/main/java/gg/party/api/user/comment/controller/request/CommentCreateReqDto.java

@@ -11,7 +11,7 @@ public class CommentCreateReqDto {
 	@Size(min = 1, max = 100)
 	private String content;
 
-	public void saveContent(String content) {
+	public CommentCreateReqDto(String content) {
 		this.content = content;
 	}
 }

gg-pingpong-api/src/main/java/gg/party/api/user/comment/service/CommentService.java

@@ -36,6 +36,10 @@ public class CommentService {
 	/**
 	 * 댓글 생성
 	 * @param roomId 방 번호
+	 * @throws RoomNotFoundException 방을 찾을 수 없음 - 404
+	 * @throws RoomNotOpenException 방이 열려있지 않음 - 400
+	 * @throws OnPenaltyException 패널티 상태의 유저 입력 - 403
+	 * @throws RoomNotParticipantException 방 참가자가 아님 - 400
 	 * @param reqDto 댓글 정보
 	 */
 	@Transactional

gg-pingpong-api/src/test/java/gg/party/api/admin/category/CategoryAdminControllerTest.java

@@ -76,12 +76,12 @@ public void success() throws Exception {
 			CategoryAddAdminReqDto categoryAddAdminReqDto = new CategoryAddAdminReqDto("category");
 			String jsonRequest = objectMapper.writeValueAsString(categoryAddAdminReqDto);
 			//when
-			String contentAsString = mockMvc.perform(post(url)
+			mockMvc.perform(post(url)
 					.contentType(MediaType.APPLICATION_JSON)
 					.content(jsonRequest)
 					.header(HttpHeaders.AUTHORIZATION, "Bearer " + userAccessToken))
 				.andExpect(status().isCreated())
-				.andReturn().getResponse().getContentAsString();
+				.andReturn().getResponse();
 			//then
 			assertThat(categoryRepository.findAll()).size().isEqualTo(2);
 		}
@@ -95,11 +95,11 @@ public void fail() throws Exception {
 			CategoryAddAdminReqDto categoryAddAdminReqDto = new CategoryAddAdminReqDto("category");
 			String jsonRequest = objectMapper.writeValueAsString(categoryAddAdminReqDto);
 			//when & then
-			String contentAsString = mockMvc.perform(post(url)
+			mockMvc.perform(post(url)
 					.contentType(MediaType.APPLICATION_JSON)
 					.content(jsonRequest)
 					.header(HttpHeaders.AUTHORIZATION, "Bearer " + userAccessToken))
-				.andExpect(status().isConflict()).toString();
+				.andExpect(status().isConflict());
 		}
 	}
 
@@ -124,11 +124,11 @@ public void success() throws Exception {
 			String categoryID = testCategory.getId().toString();
 			String url = "/party/admin/categories/" + categoryID;
 			//when
-			String contentAsString = mockMvc.perform(delete(url)
+			mockMvc.perform(delete(url)
 					.contentType(MediaType.APPLICATION_JSON)
 					.header(HttpHeaders.AUTHORIZATION, "Bearer " + userAccessToken))
 				.andExpect(status().isNoContent())
-				.andReturn().getResponse().getContentAsString();
+				.andReturn().getResponse();
 			//then
 			assertThat(categoryRepository.findAll()).size().isEqualTo(1);
 			assertThat(roomRepository.findById(testRoom.getId()).get().getCategory().getName()).isEqualTo("etc");
@@ -141,10 +141,10 @@ public void noCategoryFail() throws Exception {
 			String categoryID = "10";
 			String url = "/party/admin/categories/" + categoryID;
 			//when & then
-			String contentAsString = mockMvc.perform(delete(url)
+			mockMvc.perform(delete(url)
 					.contentType(MediaType.APPLICATION_JSON)
 					.header(HttpHeaders.AUTHORIZATION, "Bearer " + userAccessToken))
-				.andExpect(status().isNotFound()).toString();
+				.andExpect(status().isNotFound());
 		}
 
 		@Test
@@ -154,10 +154,10 @@ public void fail() throws Exception {
 			String categoryID = defaultCategory.getId().toString();
 			String url = "/party/admin/categories/" + categoryID;
 			//when & then
-			String contentAsString = mockMvc.perform(delete(url)
+			mockMvc.perform(delete(url)
 					.contentType(MediaType.APPLICATION_JSON)
 					.header(HttpHeaders.AUTHORIZATION, "Bearer " + userAccessToken))
-				.andExpect(status().isBadRequest()).toString();
+				.andExpect(status().isBadRequest());
 		}
 	}
 }

gg-pingpong-api/src/test/java/gg/party/api/admin/comment/CommentAdminControllerTest.java

@@ -23,7 +23,6 @@
 import gg.auth.utils.AuthTokenProvider;
 import gg.data.party.Category;
 import gg.data.party.Comment;
-import gg.data.party.PartyPenalty;
 import gg.data.party.Room;
 import gg.data.party.UserRoom;
 import gg.data.party.type.RoomType;
@@ -32,11 +31,6 @@
 import gg.data.user.type.RoleType;
 import gg.data.user.type.SnsType;
 import gg.party.api.admin.comment.controller.request.CommentUpdateAdminReqDto;
-import gg.repo.party.CategoryRepository;
-import gg.repo.party.CommentRepository;
-import gg.repo.party.PartyPenaltyRepository;
-import gg.repo.party.RoomRepository;
-import gg.repo.party.UserRoomRepository;
 import gg.utils.TestDataUtils;
 import gg.utils.annotation.IntegrationTest;
 import lombok.RequiredArgsConstructor;
@@ -56,16 +50,6 @@ public class CommentAdminControllerTest {
 	ObjectMapper objectMapper;
 	@Autowired
 	AuthTokenProvider tokenProvider;
-	@Autowired
-	RoomRepository roomRepository;
-	@Autowired
-	UserRoomRepository userRoomRepository;
-	@Autowired
-	CategoryRepository categoryRepository;
-	@Autowired
-	PartyPenaltyRepository partyPenaltyRepository;
-	@Autowired
-	CommentRepository commentRepository;
 	User userTester;
 	User reportedTester;
 	User adminTester;
@@ -84,8 +68,7 @@ void beforeEach() {
 				RacketType.DUAL, SnsType.SLACK, RoleType.USER, "userImage");
 			reportedTester = testDataUtils.createNewImageUser("reportedTester", "reportedTester",
 				RacketType.DUAL, SnsType.SLACK, RoleType.USER, "reportedImage");
-			PartyPenalty testPenalty = testDataUtils.createNewPenalty(reportedTester, "test", "test",
-				LocalDateTime.now(), 60);
+			testDataUtils.createNewPenalty(reportedTester, "test", "test", LocalDateTime.now(), 60);
 			adminTester = testDataUtils.createNewImageUser("adminTester", "adminTester",
 				RacketType.DUAL, SnsType.SLACK, RoleType.ADMIN, "adminImage");
 			adminAccessToken = tokenProvider.createToken(adminTester.getId());
@@ -110,12 +93,13 @@ public void success() throws Exception {
 			String url = "/party/admin/comments/" + commentId;
 			CommentUpdateAdminReqDto commentUpdateAdminReqDto = new CommentUpdateAdminReqDto(TRUE);
 			String requestBody = objectMapper.writeValueAsString(commentUpdateAdminReqDto);
-			//when && then
-			String contentAsString = mockMvc.perform(patch(url)
+			//when
+			mockMvc.perform(patch(url)
 					.contentType(MediaType.APPLICATION_JSON)
 					.content(requestBody)
 					.header(HttpHeaders.AUTHORIZATION, "Bearer " + adminAccessToken))
-				.andExpect(status().isNoContent()).toString();
+				.andExpect(status().isNoContent());
+			//then
 			assertThat(testComment.isHidden()).isEqualTo(TRUE);
 		}
 
@@ -127,29 +111,46 @@ public void reportCommentSuccess() throws Exception {
 			String url = "/party/admin/comments/" + commentId;
 			CommentUpdateAdminReqDto commentUpdateAdminReqDto = new CommentUpdateAdminReqDto(FALSE);
 			String requestBody = objectMapper.writeValueAsString(commentUpdateAdminReqDto);
-			//when && then
-			String contentAsString = mockMvc.perform(patch(url)
+			//when
+			mockMvc.perform(patch(url)
 					.contentType(MediaType.APPLICATION_JSON)
 					.content(requestBody)
 					.header(HttpHeaders.AUTHORIZATION, "Bearer " + adminAccessToken))
-				.andExpect(status().isNoContent()).toString();
+				.andExpect(status().isNoContent());
 			//then
 			assertThat(reportComment.isHidden()).isEqualTo(FALSE);
 		}
 
+		@Test
+		@DisplayName("같은 내용으로 변경으로 인한 에러 409")
+		public void duplicationFail() throws Exception {
+			//given
+			String commentId = reportComment.getId().toString();
+			String url = "/party/admin/comments/" + commentId;
+			CommentUpdateAdminReqDto commentUpdateAdminReqDto = new CommentUpdateAdminReqDto(TRUE);
+			String requestBody = objectMapper.writeValueAsString(commentUpdateAdminReqDto);
+			//when && then
+			mockMvc.perform(patch(url)
+					.contentType(MediaType.APPLICATION_JSON)
+					.content(requestBody)
+					.header(HttpHeaders.AUTHORIZATION, "Bearer " + adminAccessToken))
+				.andExpect(status().isConflict());
+		}
+
 		@Test
 		@DisplayName("없는 Comment로 인한 에러 404")
 		public void fail() throws Exception {
+			//given
 			String commentId = "1000";
 			String url = "/party/admin/comments/" + commentId;
 			CommentUpdateAdminReqDto commentUpdateAdminReqDto = new CommentUpdateAdminReqDto(TRUE);
 			String requestBody = objectMapper.writeValueAsString(commentUpdateAdminReqDto);
-			//given
-			String contentAsString = mockMvc.perform(patch(url)
+			//when && then
+			mockMvc.perform(patch(url)
 					.contentType(MediaType.APPLICATION_JSON)
 					.content(requestBody)
 					.header(HttpHeaders.AUTHORIZATION, "Bearer " + adminAccessToken))
-				.andExpect(status().isNotFound()).toString();
+				.andExpect(status().isNotFound());
 		}
 	}
 }

gg-pingpong-api/src/test/java/gg/party/api/admin/report/ReportAdminControllerTest.java

@@ -31,8 +31,6 @@
 import gg.party.api.admin.report.controller.response.CommentReportListResDto;
 import gg.party.api.admin.report.controller.response.RoomReportListResDto;
 import gg.party.api.admin.report.controller.response.UserReportListResDto;
-import gg.party.api.admin.report.service.ReportAdminService;
-import gg.repo.party.CategoryRepository;
 import gg.utils.TestDataUtils;
 import gg.utils.annotation.IntegrationTest;
 import lombok.RequiredArgsConstructor;
@@ -52,10 +50,6 @@ public class ReportAdminControllerTest {
 	ObjectMapper objectMapper;
 	@Autowired
 	AuthTokenProvider tokenProvider;
-	@Autowired
-	CategoryRepository categoryRepository;
-	@Autowired
-	ReportAdminService reportAdminService;
 	User userTester;
 	String userAccessToken;
 	Category testCategory;