🐛 [Bug] party penalty 여러번 받은 유저는 영원히 사용할 수 없는 버그 수정 및 (패널티 수정) 버그 수정 (#…

…785)
42organization · Mar 28, 2024 · d2117ee · d2117ee
1 parent 4094d62
commit d2117ee
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/.../src/main/java/gg/party/api/admin/penalty/controller/request/PartyPenaltyAdminReqDto.java b/.../src/main/java/gg/party/api/admin/penalty/controller/request/PartyPenaltyAdminReqDto.java
@@ -24,7 +24,7 @@ public class PartyPenaltyAdminReqDto {
 	String message;
 
 	@NotNull(message = "penaltyTime이 비어있습니다")
-	@Min(value = 1, message = "올바른 penaltyTime을 넣어주세요")
+	@Min(value = 0, message = "올바른 penaltyTime을 넣어주세요")
 	int penaltyTime;
 
 	@NotBlank(message = "IntraId가 비어있습니다")

diff --git a/gg-pingpong-api/src/main/java/gg/party/api/user/category/service/CategoryService.java b/gg-pingpong-api/src/main/java/gg/party/api/user/category/service/CategoryService.java
@@ -32,7 +32,7 @@ public class CategoryService {
 	@Transactional(readOnly = true)
 	public CategoryListResDto findCategoryList(UserDto userDto) {
 		User user = userRepository.findById(userDto.getId()).get();
-		PartyPenalty partyPenalty = partyPenaltyRepository.findByUserId(user.getId());
+		PartyPenalty partyPenalty = partyPenaltyRepository.findLatestByUserId(user.getId());
 		if (PartyPenalty.isOnPenalty(partyPenalty)) {
 			throw new OnPenaltyException();
 		}

diff --git a/gg-pingpong-api/src/main/java/gg/party/api/user/comment/service/CommentService.java b/gg-pingpong-api/src/main/java/gg/party/api/user/comment/service/CommentService.java
@@ -48,7 +48,7 @@ public void addCreateComment(Long roomId, CommentCreateReqDto reqDto, Long userI
 			throw new RoomNotOpenException();
 		}
 
-		PartyPenalty partyPenalty = partyPenaltyRepository.findByUserId(userId);
+		PartyPenalty partyPenalty = partyPenaltyRepository.findLatestByUserId(userId);
 		if (PartyPenalty.isOnPenalty(partyPenalty)) {
 			throw new OnPenaltyException();
 		}

diff --git a/gg-pingpong-api/src/main/java/gg/party/api/user/report/service/ReportService.java b/gg-pingpong-api/src/main/java/gg/party/api/user/report/service/ReportService.java
@@ -183,7 +183,7 @@ public void addReportUser(Long roomId, ReportReqDto reportReqDto, String userInt
 	@Transactional
 	public void partyGivePenalty(String intraId, Integer penaltyTime, String penaltyType) {
 		User user = userRepository.findByIntraId(intraId).get();
-		PartyPenalty pPenalty = partyPenaltyRepository.findByUserId(user.getId());
+		PartyPenalty pPenalty = partyPenaltyRepository.findLatestByUserId(user.getId());
 
 		if (pPenalty != null && LocalDateTime.now().isBefore(pPenalty.getStartTime()
 			.plusMinutes(pPenalty.getPenaltyTime()))) {

diff --git a/gg-pingpong-api/src/main/java/gg/party/api/user/room/service/RoomManagementService.java b/gg-pingpong-api/src/main/java/gg/party/api/user/room/service/RoomManagementService.java
@@ -61,7 +61,7 @@ public class RoomManagementService {
 	@Transactional
 	public RoomCreateResDto addCreateRoom(RoomCreateReqDto roomCreateReqDto, UserDto userDto) {
 		User user = userRepository.findById(userDto.getId()).get();
-		PartyPenalty partyPenalty = partyPenaltyRepository.findByUserId(user.getId());
+		PartyPenalty partyPenalty = partyPenaltyRepository.findLatestByUserId(user.getId());
 		if (PartyPenalty.isOnPenalty(partyPenalty)) {
 			throw new OnPenaltyException();
 		}
@@ -176,7 +176,7 @@ public RoomStartResDto modifyStartRoom(Long roomId, UserDto user) {
 	public RoomJoinResDto addJoinRoom(Long roomId, UserDto userDto) {
 		User user = userRepository.findById(userDto.getId()).get();
 		Room room = roomRepository.findById(roomId).orElseThrow(RoomNotFoundException::new);
-		PartyPenalty partyPenalty = partyPenaltyRepository.findByUserId(user.getId());
+		PartyPenalty partyPenalty = partyPenaltyRepository.findLatestByUserId(user.getId());
 		if (PartyPenalty.isOnPenalty(partyPenalty)) {
 			throw new OnPenaltyException();
 		}

diff --git a/gg-repo/src/main/java/gg/repo/party/PartyPenaltyRepository.java b/gg-repo/src/main/java/gg/repo/party/PartyPenaltyRepository.java
@@ -11,7 +11,8 @@
 import gg.data.party.PartyPenalty;
 
 public interface PartyPenaltyRepository extends JpaRepository<PartyPenalty, Long> {
-	PartyPenalty findByUserId(Long id);
+	@Query("SELECT p FROM PartyPenalty p WHERE p.user.id = :userId ORDER BY p.startTime DESC")
+	PartyPenalty findLatestByUserId(@Param("userId") Long userId);
 
 	List<PartyPenalty> findAllByUserId(Long userId);