🔨 [Refactoring + Feature] 패널티 확인 API 작성 및 패널티 정책 수정 #790

gg-data/src/main/java/gg/data/party/type/RoomType.java

@@ -1,9 +1,5 @@
 package gg.data.party.type;
 
-import java.util.Locale;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -18,19 +14,4 @@ public enum RoomType {
 
 	private final String code;
 	private final String desc;
-
-	@JsonCreator
-	public static RoomType getEnumFromValue(String value) {
-		if (value == null) {
-			return null;
-		}
-		for (RoomType e : values()) {
-			if (e.name().equals(value)) {
-				return e;
-			} else if (e.code.toUpperCase(Locale.ROOT).equals(value.toUpperCase(Locale.ROOT))) {
-				return e;
-			}
-		}
-		return null;
-	}
 }

gg-pingpong-api/src/main/java/gg/party/api/user/category/controller/CategoryController.java

@@ -6,11 +6,8 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import gg.auth.UserDto;
-import gg.auth.argumentresolver.Login;
 import gg.party.api.user.category.controller.response.CategoryListResDto;
 import gg.party.api.user.category.service.CategoryService;
-import io.swagger.v3.oas.annotations.Parameter;
 import lombok.RequiredArgsConstructor;
 
 @RestController
@@ -24,7 +21,7 @@ public class CategoryController {
 	 * @return 카테고리 전체 리스트
 	 */
 	@GetMapping
-	public ResponseEntity<CategoryListResDto> categoryList(@Parameter(hidden = true) @Login UserDto user) {
-		return ResponseEntity.status(HttpStatus.OK).body(categoryService.findCategoryList(user));
+	public ResponseEntity<CategoryListResDto> categoryList() {
+		return ResponseEntity.status(HttpStatus.OK).body(categoryService.findCategoryList());
 	}
 }

gg-pingpong-api/src/main/java/gg/party/api/user/category/service/CategoryService.java

@@ -6,36 +6,22 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import gg.auth.UserDto;
-import gg.data.party.PartyPenalty;
-import gg.data.user.User;
 import gg.party.api.user.category.controller.response.CategoryListResDto;
 import gg.party.api.user.category.controller.response.CategoryResDto;
 import gg.repo.party.CategoryRepository;
-import gg.repo.party.PartyPenaltyRepository;
-import gg.repo.user.UserRepository;
-import gg.utils.exception.party.OnPenaltyException;
 import lombok.RequiredArgsConstructor;
 
 @Service
 @RequiredArgsConstructor
 public class CategoryService {
 	private final CategoryRepository categoryRepository;
-	private final PartyPenaltyRepository partyPenaltyRepository;
-	private final UserRepository userRepository;
 
 	/**
 	 * 카테고리 전체 조회
-	 * @throws OnPenaltyException 패널티 상태의 유저 입력 - 403
 	 * @return 카테고리 전체 리스트 (id 순으로 오름차순 정렬)
 	 */
 	@Transactional(readOnly = true)
-	public CategoryListResDto findCategoryList(UserDto userDto) {
-		User user = userRepository.findById(userDto.getId()).get();
-		PartyPenalty partyPenalty = partyPenaltyRepository.findTopByUserIdOrderByStartTimeDesc(user.getId());
-		if (PartyPenalty.isOnPenalty(partyPenalty)) {
-			throw new OnPenaltyException();
-		}
+	public CategoryListResDto findCategoryList() {
 		return new CategoryListResDto(categoryRepository.findAll(Sort.by(Sort.Direction.ASC, "id")).stream()
 			.map(CategoryResDto::new)
 			.collect(Collectors.toList()));

gg-pingpong-api/src/main/java/gg/party/api/user/penalty/controller/PartyPenaltyController.java

@@ -0,0 +1,30 @@
+package gg.party.api.user.penalty.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import gg.auth.UserDto;
+import gg.auth.argumentresolver.Login;
+import gg.party.api.user.penalty.controller.response.PenaltyResDto;
+import gg.party.api.user.penalty.service.PartyPenaltyService;
+import io.swagger.v3.oas.annotations.Parameter;
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/party/penalty")
+public class PartyPenaltyController {
+	private final PartyPenaltyService partyPenaltyService;
+
+	/**
+	 * 현재 유저가 패널티 상태인지 조회
+	 * @return 언제까지 패널티인지 DateTime으로 리턴
+	 */
+	@GetMapping
+	public ResponseEntity<PenaltyResDto> findPenalty(@Parameter(hidden = true) @Login UserDto user) {
+		return ResponseEntity.status(HttpStatus.OK).body(partyPenaltyService.findIsPenalty(user));
+	}
+}

gg-pingpong-api/src/main/java/gg/party/api/user/penalty/controller/response/PenaltyResDto.java

@@ -0,0 +1,19 @@
+package gg.party.api.user.penalty.controller.response;
+
+import java.time.LocalDateTime;
+
+import gg.data.party.PartyPenalty;
+import lombok.Getter;
+
+@Getter
+public class PenaltyResDto {
+	private LocalDateTime penaltyEndTime;
+
+	public PenaltyResDto(PartyPenalty partyPenalty) {
+		this.penaltyEndTime = partyPenalty.getStartTime().plusMinutes(partyPenalty.getPenaltyTime());
+	}
+
+	public PenaltyResDto() {
+		this.penaltyEndTime = null;
+	}
+}

gg-pingpong-api/src/main/java/gg/party/api/user/penalty/service/PartyPenaltyService.java

@@ -0,0 +1,31 @@
+package gg.party.api.user.penalty.service;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import gg.auth.UserDto;
+import gg.data.party.PartyPenalty;
+import gg.party.api.user.penalty.controller.response.PenaltyResDto;
+import gg.repo.party.PartyPenaltyRepository;
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class PartyPenaltyService {
+	private final PartyPenaltyRepository partyPenaltyRepository;
+
+	/**
+	 * 현재 유저가 패널티 상태인지 조회
+	 * @return 언제까지 패널티인지 DateTime으로 리턴
+	 */
+	@Transactional
+	public PenaltyResDto findIsPenalty(UserDto userDto) {
+		PartyPenalty partyPenalty = partyPenaltyRepository.findTopByUserIdOrderByStartTimeDesc(userDto.getId());
+		if (PartyPenalty.isOnPenalty(partyPenalty)) {
+			return new PenaltyResDto(partyPenalty);
+		} else {
+			return new PenaltyResDto();
+		}
+	}
+
+}

gg-pingpong-api/src/main/java/gg/party/api/user/report/service/ReportService.java

@@ -28,8 +28,9 @@
 import gg.repo.party.UserReportRepository;
 import gg.repo.party.UserRoomRepository;
 import gg.repo.user.UserRepository;
-import gg.utils.exception.party.AlredayReportedException;
+import gg.utils.exception.party.AlreadyReportedException;
 import gg.utils.exception.party.CommentNotFoundException;
+import gg.utils.exception.party.OnPenaltyException;
 import gg.utils.exception.party.RoomNotFoundException;
 import gg.utils.exception.party.RoomNotParticipantException;
 import gg.utils.exception.party.SelfReportException;
@@ -57,12 +58,17 @@ public class ReportService {
 	 * @param reportReqDto 신고 내용
 	 * @param user 신고자
 	 * @return 방 번호
+	 * @throws OnPenaltyException 패널티 상태의 유저 입력 - 403
 	 * @throws RoomNotFoundException 방을 찾을 수 없음 - 404
-	 * @throws AlredayReportedException 이미 신고한 경우 - 409
+	 * @throws AlreadyReportedException 이미 신고한 경우 - 409
 	 * @throws SelfReportException 자신을 신고한 경우 - 400
 	 */
 	@Transactional
 	public void addReportRoom(Long roomId, ReportReqDto reportReqDto, UserDto user) {
+		PartyPenalty partyPenalty = partyPenaltyRepository.findTopByUserIdOrderByStartTimeDesc(user.getId());
+		if (PartyPenalty.isOnPenalty(partyPenalty)) {
+			throw new OnPenaltyException();
+		}
 		Room targetRoom = roomRepository.findById(roomId)
 			.orElseThrow(RoomNotFoundException::new);
 		User userEntity = userRepository.findById(user.getId()).get();
@@ -72,14 +78,14 @@ public void addReportRoom(Long roomId, ReportReqDto reportReqDto, UserDto user)
 		Optional<RoomReport> existingReport = roomReportRepository.findByReporterAndRoomId(userEntity,
 			targetRoom.getId());
 		if (existingReport.isPresent()) {
-			throw new AlredayReportedException();
+			throw new AlreadyReportedException();
 		}
 		RoomReport roomReport = new RoomReport(userEntity, targetRoom.getCreator(), targetRoom,
 			reportReqDto.getContent());
 		roomReportRepository.save(roomReport);
 
 		List<RoomReport> allReportRoom = roomReportRepository.findByRoomId(targetRoom.getId());
-		if (allReportRoom.size() == 3) {
+		if (allReportRoom.size() == 5) {
 			targetRoom.updateRoomStatus(RoomType.HIDDEN);
 			roomRepository.save(targetRoom);
 			User targetUser = targetRoom.getCreator();
@@ -89,17 +95,22 @@ public void addReportRoom(Long roomId, ReportReqDto reportReqDto, UserDto user)
 
 	/**
 	 * 댓글을 신고한다.
-	 *
-	 * @param commentId    방 번호
+	 * @param commentId 방 번호
 	 * @param reportReqDto 신고 내용
-	 * @param user         신고자
+	 * @param user 신고자
 	 * @return 방 번호
-	 * @throws CommentNotFoundException 방을 찾을 수 없음 - 404
-	 * @throws AlredayReportedException 이미 신고한 경우 - 409
+	 * @throws OnPenaltyException 패널티 상태의 유저 입력 - 403
+	 * @throws RoomNotFoundException 방을 찾을 수 없음 - 404
+	 * @throws CommentNotFoundException 댓글을 찾을 수 없음 - 404
+	 * @throws AlreadyReportedException 이미 신고한 경우 - 409
 	 * @throws SelfReportException 자신을 신고한 경우 - 400
 	 */
 	@Transactional
 	public void addReportComment(Long commentId, ReportReqDto reportReqDto, UserDto user) {
+		PartyPenalty partyPenalty = partyPenaltyRepository.findTopByUserIdOrderByStartTimeDesc(user.getId());
+		if (PartyPenalty.isOnPenalty(partyPenalty)) {
+			throw new OnPenaltyException();
+		}
 		Comment targetComment = commentRepository.findById(commentId)
 			.orElseThrow(CommentNotFoundException::new);
 		User userEntity = userRepository.findById(user.getId()).get();
@@ -109,7 +120,7 @@ public void addReportComment(Long commentId, ReportReqDto reportReqDto, UserDto
 		Optional<CommentReport> existingReport = commentReportRepository.findByReporterAndCommentId(userEntity,
 			targetComment.getId());
 		if (existingReport.isPresent()) {
-			throw new AlredayReportedException();
+			throw new AlreadyReportedException();
 		}
 		Room targetRoom = roomRepository.findById(targetComment.getRoom().getId())
 			.orElseThrow(RoomNotFoundException::new);
@@ -128,16 +139,15 @@ public void addReportComment(Long commentId, ReportReqDto reportReqDto, UserDto
 
 	/**
 	 * 유저 노쇼 신고한다.
-	 *
-	 * @param roomId       방 번호
+	 * @param roomId 방 번호
 	 * @param reportReqDto 신고 내용
-	 * @param user         신고자
-	 * @param userIntraId  피신고자
+	 * @param user 신고자
+	 * @param userIntraId 피신고자
 	 * @return 방 번호
 	 * @throws CommentNotFoundException 방을 찾을 수 없음 - 404
-	 * @throws AlredayReportedException 이미 신고한 경우 - 409
-	 * @throws SelfReportException 자신을 신고한 경우 - 400
+	 * @throws AlreadyReportedException 이미 신고한 경우 - 409
 	 * @throws RoomNotParticipantException 방에 참여하지 않은 경우 - 400
+	 * @throws SelfReportException 자신을 신고한 경우 - 400
 	 */
 	@Transactional
 	public void addReportUser(Long roomId, ReportReqDto reportReqDto, String userIntraId, UserDto user) {
@@ -158,25 +168,23 @@ public void addReportUser(Long roomId, ReportReqDto reportReqDto, String userInt
 			throw new RoomNotFoundException();
 		}
 		// 이미 신고한 경우
-		userReportRepository.findByReporterAndReporteeAndRoom(
-				reporterEntity, reporteeEntity, targetRoom)
+		userReportRepository.findByReporterAndReporteeAndRoom(reporterEntity, reporteeEntity, targetRoom)
 			.ifPresent(userReport -> {
-				throw new AlredayReportedException();
+				throw new AlreadyReportedException();
 			});
 		// 신고 저장
 		UserReport userReport = new UserReport(reporterEntity, reporteeEntity, targetRoom, reportReqDto.getContent());
 		userReportRepository.save(userReport);
 		// 노쇼 패널티 판단
 		List<UserReport> allReportUser = userReportRepository.findByReporteeAndRoomId(reporteeEntity, roomId);
-		if (allReportUser.size() == targetRoom.getMaxPeople() / 2) {
+		if (allReportUser.size() == targetRoom.getCurrentPeople() / 2) {
 			partyGivePenalty(reporteeEntity.getIntraId(), NO_SHOW_PENALTY_TIME, "노쇼 패널티");
 		}
 	}
 
 	/**
 	 * 패널티 부여
-	 *
-	 * @param intraId     신고당한 유저 아이디
+	 * @param intraId 신고당한 유저 아이디
 	 * @param penaltyTime 패널티 시간
 	 * @param penaltyType 패널티 타입
 	 */

gg-pingpong-api/src/test/java/gg/party/api/user/category/CategoryControllerTest.java

@@ -44,28 +44,21 @@ public class CategoryControllerTest {
 	@Autowired
 	private AuthTokenProvider tokenProvider;
 	User userTester;
-	User reportedTester;
 	User anotherTester;
 	String userAccessToken;
-	String reportedAccessToken;
 	String anotherAccessToken;
 
 	@BeforeEach
 	void beforeEach() {
 		userTester = testDataUtils.createNewUser("commentUserTester", "emailTester",
 			RacketType.DUAL, SnsType.SLACK, RoleType.USER);
-		reportedTester = testDataUtils.createNewUser("reportedTester", "reportedTester",
-			RacketType.DUAL, SnsType.SLACK, RoleType.USER);
 		anotherTester = testDataUtils.createNewUser("anotherUserTester", "anotherUserTester",
 			RacketType.DUAL, SnsType.SLACK, RoleType.USER);
-		testDataUtils.createNewPenalty(reportedTester, "test", "test",
-			LocalDateTime.now(), 60);
 		testDataUtils.createNewPenalty(anotherTester, "test1", "test1",
 			LocalDateTime.now(), 0);
 		testDataUtils.createNewPenalty(anotherTester, "test2", "test2",
 			LocalDateTime.now(), 0);
 		userAccessToken = tokenProvider.createToken(userTester.getId());
-		reportedAccessToken = tokenProvider.createToken(reportedTester.getId());
 		anotherAccessToken = tokenProvider.createToken(anotherTester.getId());
 		for (int i = 0; i < 10; i++) {
 			testDataUtils.createNewCategory("테스트 카테고리" + i);
@@ -92,7 +85,7 @@ void success() throws Exception {
 		}
 
 		@Test
-		@DisplayName("카테고리 목록 조회 성공 200")
+		@DisplayName("패널티 받았다가 풀린 유저 카테고리 목록 조회 성공 200")
 		void unLockPenaltySuccess() throws Exception {
 			//given
 			String uri = "/party/categories";
@@ -106,17 +99,5 @@ void unLockPenaltySuccess() throws Exception {
 			CategoryListResDto clrd = objectMapper.readValue(contentAsString, CategoryListResDto.class);
 			assertThat(clrd.getCategoryList().size()).isEqualTo(10);
 		}
-
-		@Test
-		@DisplayName("패널티 상태의 유저 카테고리 목록 조회 실패 403")
-		void penaltyUserFail() throws Exception {
-			//given
-			String uri = "/party/categories";
-			//when && then
-			mockMvc.perform(get(uri)
-					.header("Authorization", "Bearer " + reportedAccessToken)
-					.contentType(MediaType.APPLICATION_JSON))
-				.andExpect(status().isForbidden());
-		}
 	}
 }