Merge pull request #133 from Dugout-Developers/fix/#132

[FIX] 직관 신청시 발생하는 동시성 이슈 해결

Author: jjeongdong

src/main/java/com/back/catchmate/domain/board/repository/BoardRepository.java

@@ -1,10 +1,13 @@
 package com.back.catchmate.domain.board.repository;
 
 import com.back.catchmate.domain.board.entity.Board;
+import jakarta.persistence.LockModeType;
 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.Lock;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
@@ -20,4 +23,8 @@ public interface BoardRepository extends JpaRepository<Board, Long>, BoardReposi
     Optional<Board> findTopByUserIdAndIsCompletedIsFalseAndDeletedAtIsNullOrderByCreatedAtDesc(Long userId);
 
     long countByDeletedAtIsNullAndIsCompletedIsTrue();
+
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("SELECT b FROM Board b WHERE b.id = :boardId")
+    Optional<Board> findByIdWithLock(@Param("boardId") Long boardId);
 }

src/main/java/com/back/catchmate/domain/chat/repository/ChatRoomRepository.java

@@ -1,7 +1,11 @@
 package com.back.catchmate.domain.chat.repository;
 
 import com.back.catchmate.domain.chat.entity.ChatRoom;
+import jakarta.persistence.LockModeType;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Lock;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 import java.util.Optional;
 
@@ -10,5 +14,9 @@ public interface ChatRoomRepository extends JpaRepository<ChatRoom, Long> {
 
     Optional<ChatRoom> findByBoardIdAndDeletedAtIsNull(Long boardId);
 
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("SELECT c FROM ChatRoom c WHERE c.board.id = :boardId AND c.deletedAt IS NULL")
+    Optional<ChatRoom> findByBoardIdWithLock(@Param("boardId") Long boardId);
+
     boolean existsByBoardId(Long boardId);
 }

src/main/java/com/back/catchmate/domain/enroll/repository/EnrollRepository.java

@@ -1,9 +1,13 @@
 package com.back.catchmate.domain.enroll.repository;
 
+import com.back.catchmate.domain.enroll.entity.AcceptStatus;
 import com.back.catchmate.domain.enroll.entity.Enroll;
+import jakarta.persistence.LockModeType;
 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.Lock;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
@@ -33,4 +37,12 @@ public interface EnrollRepository extends JpaRepository<Enroll, Long> {
     int countNewEnrollListByUserId(@Param("userId") Long userId);
 
     boolean existsByUserIdAndBoardIdAndDeletedAtIsNull(Long userId, Long boardId);
+
+    @Modifying
+    @Query("UPDATE Enroll e SET e.acceptStatus = :status WHERE e.id = :enrollId AND e.acceptStatus = 'PENDING'")
+    int updateEnrollStatus(@Param("enrollId") Long enrollId, @Param("status") AcceptStatus status);
+
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("SELECT e FROM Enroll e WHERE e.id = :enrollId")
+    Optional<Enroll> findByIdWithLock(@Param("enrollId") Long enrollId);
 }

src/main/java/com/back/catchmate/domain/enroll/service/EnrollServiceImpl.java

@@ -163,39 +163,44 @@ public UpdateEnrollInfo acceptEnroll(Long enrollId, Long userId) throws IOExcept
         User loginUser = userRepository.findById(userId)
                 .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_FOUND));
 
-        Enroll enroll = enrollRepository.findById(enrollId)
+        Enroll enroll = enrollRepository.findByIdWithLock(enrollId)
                 .orElseThrow(() -> new BaseException(ErrorCode.ENROLL_NOT_FOUND));
 
         User boardWriter = enroll.getBoard().getUser();
         User enrollApplicant = userRepository.findById(enroll.getUser().getId())
                 .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_FOUND));
 
-        Board board = enroll.getBoard();
+        Board board = boardRepository.findByIdWithLock(enroll.getBoard().getId())
+                .orElseThrow(() -> new BaseException(ErrorCode.BOARD_NOT_FOUND));
+
         if (board.canIncrementCurrentPerson()) {
             board.incrementCurrentPerson();
+        } else {
+            throw new BaseException(ErrorCode.FULL_PERSON);
         }
 
-        // 게시글 작성자와 로그인한 사용자가 다를 경우 예외 발생
         if (loginUser.isDifferentUserFrom(boardWriter)) {
             throw new BaseException(ErrorCode.ENROLL_ACCEPT_INVALID);
         }
 
+        int updatedRows = enrollRepository.updateEnrollStatus(enrollId, AcceptStatus.ACCEPTED);
+        if (updatedRows == 0) {
+            throw new BaseException(ErrorCode.ENROLL_ALREADY_ACCEPTED);
+        }
+
         enterChatRoom(enrollApplicant, board);
 
         String title = ENROLLMENT_ACCEPT_TITLE;
         String body = ENROLLMENT_ACCEPT_BODY;
 
-        // 직관 신청자에게 수락 푸시 알림 메세지 전송
         fcmService.sendMessageByToken(enrollApplicant.getFcmToken(), title, body, enroll.getBoard().getId(), AcceptStatus.ACCEPTED);
-        // 데이터베이스에 저장
         notificationService.createNotification(title, body, boardWriter.getProfileImageUrl(), enroll.getBoard().getId(), enrollApplicant.getId(), AcceptStatus.ACCEPTED);
 
-        enroll.respondToEnroll(AcceptStatus.ACCEPTED);
         return enrollConverter.toUpdateEnrollInfo(enroll, AcceptStatus.ACCEPTED);
     }
 
     private void enterChatRoom(User user, Board board) {
-        ChatRoom chatRoom = chatRoomRepository.findByBoardIdAndDeletedAtIsNull(board.getId())
+        ChatRoom chatRoom = chatRoomRepository.findByBoardIdWithLock(board.getId())
                 .orElseThrow(() -> new BaseException(ErrorCode.CHATROOM_NOT_FOUND));
 
         chatRoom.incrementParticipantCount();
@@ -213,30 +218,28 @@ public UpdateEnrollInfo rejectEnroll(Long enrollId, Long userId) throws IOExcept
         User loginUser = userRepository.findById(userId)
                 .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_FOUND));
 
-        Enroll enroll = enrollRepository.findById(enrollId)
+        Enroll enroll = enrollRepository.findByIdWithLock(enrollId)
                 .orElseThrow(() -> new BaseException(ErrorCode.ENROLL_NOT_FOUND));
 
         User boardWriter = enroll.getBoard().getUser();
         User enrollApplicant = userRepository.findById(enroll.getUser().getId())
                 .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_FOUND));
 
-        // 게시글 작성자와 로그인한 사용자가 다를 경우 예외 발생
         if (loginUser.isDifferentUserFrom(boardWriter)) {
             throw new BaseException(ErrorCode.ENROLL_REJECT_INVALID);
         }
 
         String title = ENROLLMENT_REJECT_TITLE;
         String body = ENROLLMENT_REJECT_BODY;
 
-        // 직관 신청자에게 거절 푸시 알림 메세지 전송
         fcmService.sendMessageByToken(enrollApplicant.getFcmToken(), title, body, enroll.getBoard().getId(), AcceptStatus.REJECTED);
-        // 데이터베이스에 저장
         notificationService.createNotification(title, body, boardWriter.getProfileImageUrl(), enroll.getBoard().getId(), enrollApplicant.getId(), AcceptStatus.REJECTED);
 
         enroll.respondToEnroll(AcceptStatus.REJECTED);
         return enrollConverter.toUpdateEnrollInfo(enroll, AcceptStatus.REJECTED);
     }
 
+
     @Override
     public EnrollDescriptionInfo getEnrollDescriptionById(Long boardId, Long userId) {
         User user = userRepository.findById(userId)

src/main/java/com/back/catchmate/domain/user/entity/BlockedUser.java

@@ -20,7 +20,7 @@
 @Builder
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @AllArgsConstructor
-@Table(name = "blocked_users")
+@Table(name = "blocked_user")
 public class BlockedUser extends BaseTimeEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/back/catchmate/global/error/ErrorCode.java

@@ -27,6 +27,7 @@ public enum ErrorCode {
     ENROLL_ACCEPT_INVALID(HttpStatus.BAD_REQUEST, "직관 신청을 수락할 권한이 없습니다."),
     ENROLL_REJECT_INVALID(HttpStatus.BAD_REQUEST, "직관 신청을 거절할 권한이 없습니다."),
     ENROLL_GET_INVALID(HttpStatus.BAD_REQUEST, "직관 신청을 조회할 권한이 없습니다."),
+    ENROLL_ALREADY_ACCEPTED(HttpStatus.BAD_REQUEST, "이미 수락된 신청입니다."),
 
     // 게시글
     BOARD_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 게시글입니다."),
@@ -42,6 +43,7 @@ public enum ErrorCode {
     ALREADY_BOOKMARK(HttpStatus.BAD_REQUEST, "이미 찜한 게시글입니다."),
     BOOKMARK_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 찜입니다."),
     BOOKMARK_BAD_REQUEST(HttpStatus.BAD_REQUEST, "본인 게시글은 찜할 수 없습니다."),
+    FULL_PERSON(HttpStatus.BAD_REQUEST, "해당 게시글은 마감되었습니다."),
 
     // 알림
     NOTIFICATION_NOT_FOUND(HttpStatus.NOT_FOUND, "존재하지 않는 알림입니다."),