🐛 [Bug] [Refactoring] 6기 Party 서비스 전체 리팩토링 중 찾은 버그들 수정 (#779)

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

@@ -5,8 +5,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 @Getter
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class CategoryListResDto {
 	private List<CategoryResDto> categoryList;
 

gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/response/CommentResDto.java

@@ -6,8 +6,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@NoArgsConstructor
 @Getter
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class CommentResDto {
 	private Long commentId;
 	private String nickname;

gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/response/LeaveRoomResDto.java

@@ -3,8 +3,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 @Getter
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class LeaveRoomResDto {
 	private String nickname;
 

gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/response/RoomCreateResDto.java

@@ -3,8 +3,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 @Getter
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class RoomCreateResDto {
 	private Long roomId;
 

gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/response/RoomDetailResDto.java

@@ -8,8 +8,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 @Getter
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class RoomDetailResDto {
 	private Long roomId;
 	private String title;

gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/response/RoomJoinResDto.java

@@ -4,7 +4,7 @@
 import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class RoomJoinResDto {
 	private Long roomId;
 

gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/response/RoomListResDto.java

@@ -5,8 +5,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 @Getter
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class RoomListResDto {
 	private List<RoomResDto> roomList;
 

gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/response/RoomResDto.java

@@ -7,7 +7,7 @@
 import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class RoomResDto {
 	private Long roomId;
 	private String categoryName;

gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/response/RoomStartResDto.java

@@ -4,7 +4,7 @@
 import lombok.NoArgsConstructor;
 
 @Getter
-@NoArgsConstructor
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class RoomStartResDto {
 	private Long roomId;
 

gg-pingpong-api/src/main/java/gg/party/api/user/room/controller/response/UserRoomResDto.java

@@ -4,8 +4,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 @Getter
+@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED)
 public class UserRoomResDto {
 	private Long roomUserId;
 	private String nickname;

gg-pingpong-api/src/main/java/gg/party/api/user/room/service/RoomFindService.java

@@ -1,16 +1,14 @@
 package gg.party.api.user.room.service;
 
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.transaction.Transactional;
-
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import gg.data.party.Room;
 import gg.data.party.UserRoom;
@@ -38,18 +36,28 @@ public class RoomFindService {
 	 * 시작하지 않은 방과 시작한 방을 모두 조회한다
 	 * @return 시작하지 않은 방 (최신순) + 시작한 방(끝나는 시간이 빠른 순) 전체 List
 	 */
-	@Transactional
+	@Transactional(readOnly = true)
 	public RoomListResDto findRoomList() {
-		Sort sortForNotStarted = Sort.by("createdAt").descending();
-		Sort sortForStarted = Sort.by("startDate").descending();
+		List<RoomType> statuses = Arrays.asList(RoomType.OPEN, RoomType.START, RoomType.FINISH);
+		List<Room> rooms = roomRepository.findByStatusIn(statuses);
 
-		List<Room> notStartedRooms = roomRepository.findByStatus(RoomType.OPEN, sortForNotStarted);
-		List<Room> startedRooms = roomRepository.findByStatus(RoomType.START, sortForStarted);
-		List<Room> finishRooms = roomRepository.findByStatus(RoomType.FINISH, sortForStarted);
+		List<Room> openRooms = rooms.stream()
+			.filter(room -> room.getStatus() == RoomType.OPEN)
+			.sorted(Comparator.comparing(Room::getCreatedAt).reversed())
+			.collect(Collectors.toList());
 
-		List<Room> limitedFinishRooms = finishRooms.stream().limit(10).collect(Collectors.toList());
+		List<Room> startRooms = rooms.stream()
+			.filter(room -> room.getStatus() == RoomType.START)
+			.sorted(Comparator.comparing(Room::getStartDate).reversed())
+			.collect(Collectors.toList());
+
+		List<Room> finishRooms = rooms.stream()
+			.filter(room -> room.getStatus() == RoomType.FINISH)
+			.sorted(Comparator.comparing(Room::getStartDate).reversed())
+			.limit(10)
+			.collect(Collectors.toList());
 
-		List<Room> combinedRooms = Stream.of(notStartedRooms, startedRooms, limitedFinishRooms)
+		List<Room> combinedRooms = Stream.of(openRooms, startRooms, finishRooms)
 			.flatMap(List::stream)
 			.collect(Collectors.toList());
 
@@ -62,43 +70,48 @@ public RoomListResDto findRoomList() {
 
 	/**
 	 * 현재 참여중인 방을 모두 조회한다(만든 방 포함)
+	 * 시작한 방 뒤에 시작하지 않은 방이 오게 작성
 	 * @param userId 자신의 id
 	 * @return 참여한 방 전체 List
 	 */
-	@Transactional
+	@Transactional(readOnly = true)
 	public RoomListResDto findJoinedRoomList(Long userId) {
 		List<UserRoom> userRooms = userRoomRepository.findByUserId(userId);
 		List<Room> joinedRooms = userRooms.stream()
 			.map(UserRoom::getRoom)
 			.collect(Collectors.toList());
 
-		Collections.sort(joinedRooms, Comparator.comparing(Room::getDueDate));
+		List<Room> openRoom = joinedRooms.stream()
+			.filter(room -> room.getStatus() == RoomType.OPEN)
+			.sorted(Comparator.comparing(Room::getDueDate))
+			.collect(Collectors.toList());
 
-		List<Room> playingRoom = joinedRooms.stream()
-			.filter(room -> room.getStatus() == RoomType.OPEN || room.getStatus() == RoomType.START)
+		List<Room> startRoom = joinedRooms.stream()
+			.filter(room -> room.getStatus() == RoomType.START)
+			.sorted(Comparator.comparing(Room::getStartDate))
 			.collect(Collectors.toList());
 
-		Collections.sort(playingRoom, Comparator.comparing(Room::getDueDate));
+		startRoom.addAll(openRoom);
 
-		List<RoomResDto> roomListResDto = playingRoom.stream()
+		List<RoomResDto> roomListResDto = openRoom.stream()
 			.map(RoomResDto::new)
 			.collect(Collectors.toList());
 
 		return new RoomListResDto(roomListResDto);
 	}
 
 	/**
-	 * 시간이 지나 보이지 않게 된 내가 플레이한(시작한) 방을 모두 조회한다
+	 * 시간이 지나 보이지 않게 된 내가 플레이한(FINISH) 방을 모두 조회한다
 	 * @param userId 자신의 id
-	 * user_room db에서 자신의 id와 isExist이 true(나가지 않았음)
-	 * 이면서 status가 FINISH인 경우를 마감기한 최신순으로 정렬
-	 * @return 끝난 방 전체 List
+	 * isExist이 true(나가지 않았음)이면서 status가 FINISH인 경우
+	 * @return 시작시간으로 정렬된 끝난 방 전체 List
 	 */
-	@Transactional
+	@Transactional(readOnly = true)
 	public RoomListResDto findMyHistoryRoomList(Long userId) {
-		List<Room> finishRooms = userRoomRepository.findFinishRoomsByUserId(userId, RoomType.FINISH);
+		List<Room> finishRooms = userRoomRepository.findByUserIdAndStatusAndIsExistTrue(userId, RoomType.FINISH);
 
 		List<RoomResDto> roomListResDto = finishRooms.stream()
+			.sorted(Comparator.comparing(Room::getStartDate))
 			.map(RoomResDto::new)
 			.collect(Collectors.toList());
 
@@ -110,11 +123,11 @@ public RoomListResDto findMyHistoryRoomList(Long userId) {
 	 * @param userId 자신의 id
 	 * @param roomId 방 id
 	 * @return 방 상세정보 dto
-	 * @throws RoomNotFoundException 유효하지 않은 방 입력
-	 * @throws RoomReportedException 신고 받은 방 처리 | 시작한 방도 볼 수 있게 해야하므로 별도처리
+	 * @throws RoomNotFoundException 유효하지 않은 방 입력 - 404
+	 * @throws RoomReportedException 신고 받은 방 처리 - 403
 	 * 익명성을 지키기 위해 nickname을 리턴
 	 */
-	@Transactional
+	@Transactional(readOnly = true)
 	public RoomDetailResDto findRoomDetail(Long userId, Long roomId) {
 		Room room = roomRepository.findById(roomId).orElseThrow(RoomNotFoundException::new);
 		if (room.getStatus() == RoomType.HIDDEN) {
@@ -125,37 +138,37 @@ public RoomDetailResDto findRoomDetail(Long userId, Long roomId) {
 
 		String myNickname = null;
 		if (userRoomOptional.isPresent()) {
-			UserRoom userRoom = userRoomOptional.get();
-			myNickname = userRoom.getNickname();
+			myNickname = userRoomOptional.get().getNickname();
 		}
 
-		Optional<UserRoom> hostUserRoomOptional = userRoomRepository.findByUserIdAndRoomIdAndIsExistTrue(
-			room.getHost().getId(), roomId);
-		String hostNickname = hostUserRoomOptional.get().getNickname();
+		Optional<UserRoom> hostUserRoom = userRoomRepository.findByUserIdAndRoomIdAndIsExistTrue(room.getHost().getId(),
+			roomId);
+		String hostNickname = hostUserRoom.get().getNickname();
 
 		if ((room.getStatus() == RoomType.START || room.getStatus() == RoomType.FINISH)
 			&& userRoomOptional.isPresent()) {
+			List<UserRoomResDto> roomUsers = userRoomRepository.findByRoomIdAndIsExistTrue(roomId).stream()
+				.map(userRoom -> new UserRoomResDto(userRoom, userRoom.getUser().getIntraId(),
+					userRoom.getUser().getImageUri()))
+				.collect(Collectors.toList());
+
 			List<CommentResDto> comments = commentRepository.findAllWithCommentFetchJoin(roomId).stream()
+				.filter(comment -> !comment.isHidden())
 				.map(comment -> new CommentResDto(comment, comment.getUser().getIntraId()))
 				.collect(Collectors.toList());
 
-			List<UserRoomResDto> roomUsers = userRoomRepository.findByRoomId(roomId).stream()
-				.filter(UserRoom::getIsExist)
-				.map(userRoom -> new UserRoomResDto(userRoom, userRoom.getUser().getIntraId(),
-					userRoom.getUser().getImageUri()))
-				.collect(Collectors.toList());
 			return new RoomDetailResDto(room, myNickname, hostNickname, roomUsers, comments);
-		} else { // if 참여자 && Start or Finish 상태인 경우 intraID || else intraId == null
+		} else { // if 참여자 && Start or Finish 상태인 경우 intraID 제공 || else intraId == null
+			List<UserRoomResDto> roomUsers = userRoomRepository.findByRoomIdAndIsExistTrue(roomId).stream()
+				.map(UserRoomResDto::new)
+				.collect(Collectors.toList());
+
 			List<CommentResDto> comments = commentRepository.findAllWithCommentFetchJoin(roomId).stream()
+				.filter(comment -> !comment.isHidden())
 				.map(CommentResDto::new)
 				.collect(Collectors.toList());
 
-			List<UserRoomResDto> roomUsers = userRoomRepository.findByRoomId(roomId).stream()
-				.filter(UserRoom::getIsExist)
-				.map(UserRoomResDto::new)
-				.collect(Collectors.toList());
 			return new RoomDetailResDto(room, myNickname, hostNickname, roomUsers, comments);
 		}
 	}
-
 }

gg-pingpong-api/src/main/java/gg/party/api/user/room/service/RoomManagementService.java

@@ -102,16 +102,6 @@ public LeaveRoomResDto modifyLeaveRoom(Long roomId, UserDto user) {
 		UserRoom targetUserRoom = userRoomRepository.findByUserAndRoom(userRepository.findById(user.getId()).get(),
 			targetRoom).orElseThrow(RoomNotParticipantException::new);
 
-		// 모두 나갈 때 방 fail처리
-		if (targetRoom.getCurrentPeople() == 1) {
-			targetRoom.updateCurrentPeople(0);
-			targetRoom.updateRoomStatus(RoomType.FAIL);
-			targetUserRoom.updateIsExist(false);
-			roomRepository.save(targetRoom);
-			userRoomRepository.save(targetUserRoom);
-			return new LeaveRoomResDto(targetUserRoom.getNickname());
-		}
-
 		targetRoom.updateCurrentPeople(targetRoom.getCurrentPeople() - 1);
 		targetUserRoom.updateIsExist(false);
 
@@ -124,8 +114,17 @@ public LeaveRoomResDto modifyLeaveRoom(Long roomId, UserDto user) {
 				targetRoom.updateHost(null);
 			}
 		}
-		userRoomRepository.save(targetUserRoom);
+
+		// 모두 나갈 때 방 fail처리
+		if (targetRoom.getCurrentPeople() == 0) {
+			targetRoom.updateRoomStatus(RoomType.FAIL);
+			roomRepository.save(targetRoom);
+			userRoomRepository.save(targetUserRoom);
+			return new LeaveRoomResDto(targetUserRoom.getNickname());
+		}
+
 		roomRepository.save(targetRoom);
+		userRoomRepository.save(targetUserRoom);
 
 		return new LeaveRoomResDto(targetUserRoom.getNickname());
 	}
@@ -136,27 +135,27 @@ public LeaveRoomResDto modifyLeaveRoom(Long roomId, UserDto user) {
 	 * @param roomId, user
 	 * @return 방 id
 	 * @throws RoomNotFoundException 방 없음 - 404
-	 * @throws RoomNotOpenException 방이 열리지 않은 상태 - 400
-	 * @throws RoomNotEnoughPeopleException 방에 충분한 인원이 없음 - 400
 	 * @throws RoomNotParticipantException 방에 참가하지 않은 유저 - 400
 	 * @throws UserNotHostException 방장이 아닌 경우 - 403
+	 * @throws RoomNotOpenException 방이 열리지 않은 상태 - 400
+	 * @throws RoomNotEnoughPeopleException 방에 충분한 인원이 없음 - 400
 	 */
 	@Transactional
 	public RoomStartResDto modifyStartRoom(Long roomId, UserDto user) {
 		Room targetRoom = roomRepository.findById(roomId)
 			.orElseThrow(RoomNotFoundException::new);
-		if (!targetRoom.getStatus().equals(RoomType.OPEN)) {
-			throw new RoomNotOpenException();
-		}
-		if (targetRoom.getMinPeople() > targetRoom.getCurrentPeople()
-			|| targetRoom.getMaxPeople() < targetRoom.getCurrentPeople()) {
-			throw new RoomNotEnoughPeopleException();
-		}
 		UserRoom targetUserRoom = userRoomRepository.findByUserAndRoom(userRepository.findById(user.getId()).get(),
 			targetRoom).orElseThrow(RoomNotParticipantException::new);
 		if (targetRoom.getHost() != targetUserRoom.getUser()) {
 			throw new UserNotHostException();
 		}
+		if (!targetRoom.getStatus().equals(RoomType.OPEN)) {
+			throw new RoomNotOpenException();
+		}
+		if (targetRoom.getMinPeople() > targetRoom.getCurrentPeople()) {
+			throw new RoomNotEnoughPeopleException();
+		}
+
 		targetRoom.updateRoomStatus(RoomType.START);
 		List<User> users = userRoomRepository.findByIsExist(roomId);
 		targetRoom.startRoom(LocalDateTime.now());

gg-pingpong-api/src/main/java/gg/party/api/user/room/utils/GenerateRandomNickname.java

@@ -2,18 +2,22 @@
 
 import java.util.Random;
 
+/*
+ * 익명 닉네임을 만드는 클래스입니다.
+ * PREFIX와 SUFFIX 배열에서 랜덤으로 단어를 선택하여 조합합니다.
+ * 둘 중 중복되는 요소도 가능하게 작성했습니다. ex) 용감한 int, 용감한 string이 공존할 수 있습니다.
+ * 최대 4글자 || 7글자로 작성했습니다.
+ */
 public class GenerateRandomNickname {
-	private String nickname;
-
-	private static final String[] PREFIX = {"용감한", "대담한", "밝은", "뛰어난", "쾌활한", "영리한", "도망가는",
+	private static final String[] PREFIX = {"용감한", "대담한", "밝은", "뛰어난", "쾌활한", "영리한", "도망가는", "든든한",
 		"대담한", "열심인", "힘찬", "불같은", "신선한", "관대한", "유쾌한", "행복한", "희망찬", "명랑한", "친절한", "활기찬",
-		"착한", "이상한", "자랑스러운", "빠른", "안도하는", "수줍은", "어리석은", "강한", "감사하는", "힘든", "용감한", "열정적인",
+		"착한", "이상한", "빠른", "안도하는", "수줍은", "어리석은", "강한", "감사하는", "힘든", "용감한", "열정적인", "졸린",
 		"똑똑한", "즐거운", "굉장한", "고수", "엄청난", "뜬금없는", "충무공", "제너럴", "엠페러", "마제스티", "판타스틱", "레전더리",
-		"먼치킨", "다크호스", "슈퍼루키", "엘리트", "정점", "전교회장", "베테랑"};
+		"먼치킨", "다크호스", "슈퍼루키", "엘리트", "정점", "전교회장", "베테랑", "킹", "퀸", "챔피언"};
 
-	private static final String[] SUFFIX = {"list", "vector", "string", "boolean", "number", "object", "array",
-		"set", "map", "date", "function", "null", "undefined", "buffer", "json", "error", "stack", "queue", "deque",
-		"tree", "graph", "pair", "int", "char", "float", "double", "long", "longlong", "size_t", "short", "struct"};
+	private static final String[] SUFFIX = {"list", "vector", "string", "bool", "number", "object", "array",
+		"set", "map", "date", "null", "buffer", "json", "error", "stack", "queue", "deque", "struct", "tree",
+		"graph", "pair", "int", "char", "float", "double", "long", "size_t", "short", "byte", "bit", "pointer"};
 
 	public static String generateRandomNickname() {
 		Random random = new Random();

gg-pingpong-api/src/main/java/gg/party/api/user/template/controller/TemplateController.java

@@ -17,8 +17,8 @@ public class TemplateController {
 	private final TemplateService templateService;
 
 	/**
-	 * 탬플릿 목록을 조회한다
-	 * @return 탬플릿 전체 List
+	 * 템플릿 전체 조회
+	 * @return 템플릿 전체 리스트 (가나다 순으로 정렬) 200
 	 */
 	@GetMapping
 	public ResponseEntity<TemplateListResDto> templateList() {