[BE] 자동 예약 및 자동 업데이트 동시성 제어(#586)

backend/src/main/java/corea/scheduler/repository/AutomaticMatchingRepository.java

@@ -2,14 +2,19 @@
 
 import corea.scheduler.domain.AutomaticMatching;
 import corea.scheduler.domain.ScheduleStatus;
+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 java.util.List;
 import java.util.Optional;
 
 public interface AutomaticMatchingRepository extends JpaRepository<AutomaticMatching, Long> {
 
-    Optional<AutomaticMatching> findByRoomId(long roomId);
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("SELECT am FROM AutomaticMatching am WHERE am.roomId = :roomId AND am.status = :status")
+    Optional<AutomaticMatching> findByRoomIdAndStatusForUpdate(long roomId, ScheduleStatus status);
 
     List<AutomaticMatching> findAllByStatus(ScheduleStatus status);
 

backend/src/main/java/corea/scheduler/repository/AutomaticUpdateRepository.java

@@ -2,14 +2,19 @@
 
 import corea.scheduler.domain.AutomaticUpdate;
 import corea.scheduler.domain.ScheduleStatus;
+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 java.util.List;
 import java.util.Optional;
 
 public interface AutomaticUpdateRepository extends JpaRepository<AutomaticUpdate, Long> {
 
-    Optional<AutomaticUpdate> findByRoomId(long roomId);
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
+    @Query("SELECT au FROM AutomaticUpdate au WHERE au.roomId = :roomId AND au.status = :status")
+    Optional<AutomaticUpdate> findByRoomIdAndStatusForUpdate(long roomId, ScheduleStatus status);
 
     List<AutomaticUpdate> findAllByStatus(ScheduleStatus status);
 

backend/src/main/java/corea/scheduler/service/AutomaticMatchingExecutor.java

@@ -1,88 +1,24 @@
 package corea.scheduler.service;
 
-import corea.exception.CoreaException;
-import corea.exception.ExceptionType;
-import corea.matching.domain.PullRequestInfo;
-import corea.matching.service.MatchingService;
-import corea.matching.service.PullRequestProvider;
-import corea.matchresult.domain.FailedMatching;
-import corea.matchresult.repository.FailedMatchingRepository;
-import corea.room.domain.Room;
-import corea.room.repository.RoomRepository;
-import corea.scheduler.domain.AutomaticMatching;
+import corea.scheduler.domain.ScheduleStatus;
 import corea.scheduler.repository.AutomaticMatchingRepository;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.transaction.annotation.Transactional;
 
-@Slf4j
 @Component
 @RequiredArgsConstructor
 public class AutomaticMatchingExecutor {
 
-    private final PlatformTransactionManager transactionManager;
-    private final MatchingService matchingService;
-    private final PullRequestProvider pullRequestProvider;
-    private final RoomRepository roomRepository;
-    private final FailedMatchingRepository failedMatchingRepository;
+    private final MatchingExecutor matchingExecutor;
     private final AutomaticMatchingRepository automaticMatchingRepository;
 
-    @Async
+    @Transactional
     public void execute(long roomId) {
-        //TODO: 트랜잭션 분리
-        TransactionTemplate template = new TransactionTemplate(transactionManager);
-
-        try {
-            template.execute(status -> {
-                startMatching(roomId);
-                return null;
-            });
-        } catch (CoreaException e) {
-            log.warn("매칭 실행 중 에러 발생: {}", e.getMessage(), e);
-            recordMatchingFailure(roomId, e.getExceptionType());
-        }
-    }
-
-    private void startMatching(long roomId) {
-        Room room = getRoom(roomId);
-
-        PullRequestInfo pullRequestInfo = pullRequestProvider.getUntilDeadline(room.getRepositoryLink(), room.getRecruitmentDeadline());
-        matchingService.match(roomId, pullRequestInfo);
-
-        AutomaticMatching automaticMatching = getAutomaticMatchingByRoomId(roomId);
-        automaticMatching.updateStatusToDone();
-    }
-
-    private void recordMatchingFailure(long roomId, ExceptionType exceptionType) {
-        //TODO: 위와 동일
-        TransactionTemplate template = new TransactionTemplate(transactionManager);
-        template.execute(status -> {
-            updateRoomStatusToFail(roomId);
-            saveFailedMatching(roomId, exceptionType);
-            return null;
-        });
-    }
-
-    private void updateRoomStatusToFail(long roomId) {
-        Room room = getRoom(roomId);
-        room.updateStatusToFail();
-    }
-
-    private void saveFailedMatching(long roomId, ExceptionType exceptionType) {
-        FailedMatching failedMatching = new FailedMatching(roomId, exceptionType);
-        failedMatchingRepository.save(failedMatching);
-    }
-
-    private Room getRoom(long roomId) {
-        return roomRepository.findById(roomId)
-                .orElseThrow(() -> new CoreaException(ExceptionType.ROOM_NOT_FOUND));
-    }
-
-    private AutomaticMatching getAutomaticMatchingByRoomId(long roomId) {
-        return automaticMatchingRepository.findByRoomId(roomId)
-                .orElseThrow(() -> new CoreaException(ExceptionType.AUTOMATIC_MATCHING_NOT_FOUND));
+        automaticMatchingRepository.findByRoomIdAndStatusForUpdate(roomId, ScheduleStatus.PENDING)
+                .ifPresent(automaticMatching -> {
+                    matchingExecutor.match(roomId);
+                    automaticMatching.updateStatusToDone();
+                });
     }
 }

backend/src/main/java/corea/scheduler/service/AutomaticUpdateExecutor.java

@@ -1,88 +1,24 @@
 package corea.scheduler.service;
 
-import corea.exception.CoreaException;
-import corea.exception.ExceptionType;
-import corea.feedback.domain.DevelopFeedback;
-import corea.feedback.domain.SocialFeedback;
-import corea.feedback.repository.DevelopFeedbackRepository;
-import corea.feedback.repository.SocialFeedbackRepository;
-import corea.matchresult.domain.MatchResult;
-import corea.matchresult.domain.ReviewStatus;
-import corea.matchresult.repository.MatchResultRepository;
-import corea.member.domain.Member;
-import corea.member.domain.MemberRole;
-import corea.room.domain.Room;
-import corea.room.repository.RoomRepository;
-import corea.scheduler.domain.AutomaticUpdate;
+import corea.scheduler.domain.ScheduleStatus;
 import corea.scheduler.repository.AutomaticUpdateRepository;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-@Slf4j
 @Component
 @RequiredArgsConstructor
 public class AutomaticUpdateExecutor {
 
-    private final RoomRepository roomRepository;
-    private final MatchResultRepository matchResultRepository;
-    private final SocialFeedbackRepository socialFeedbackRepository;
-    private final DevelopFeedbackRepository developFeedbackRepository;
+    private final UpdateExecutor updateExecutor;
     private final AutomaticUpdateRepository automaticUpdateRepository;
 
-    @Async
     @Transactional
     public void execute(long roomId) {
-        Room room = getRoom(roomId);
-        room.updateStatusToClose();
-
-        updateReviewCount(roomId);
-        updateFeedbackPoint(roomId);
-
-        AutomaticUpdate automaticUpdate = getAutomaticUpdateByRoomId(roomId);
-        automaticUpdate.updateStatusToDone();
-    }
-
-    private void updateReviewCount(long roomId) {
-        matchResultRepository.findAllByRoomIdAndReviewStatus(roomId, ReviewStatus.COMPLETE)
-                .forEach(this::increaseMembersReviewCountIn);
-    }
-
-    private void increaseMembersReviewCountIn(MatchResult matchResult) {
-        Member reviewer = matchResult.getReviewer();
-        reviewer.increaseReviewCount(MemberRole.REVIEWER);
-
-        Member reviewee = matchResult.getReviewee();
-        reviewee.increaseReviewCount(MemberRole.REVIEWEE);
-    }
-
-    private void updateFeedbackPoint(long roomId) {
-        socialFeedbackRepository.findAllByRoomId(roomId)
-                .forEach(this::updateSocialFeedbackPoint);
-
-        developFeedbackRepository.findAllByRoomId(roomId)
-                .forEach(this::updateDevelopFeedbackPoint);
-    }
-
-    private void updateSocialFeedbackPoint(SocialFeedback socialFeedback) {
-        Member receiver = socialFeedback.getReceiver();
-        receiver.updateAverageRating(socialFeedback.getEvaluatePoint());
-    }
-
-    private void updateDevelopFeedbackPoint(DevelopFeedback developFeedback) {
-        Member receiver = developFeedback.getReceiver();
-        receiver.updateAverageRating(developFeedback.getEvaluatePoint());
-    }
-
-    private Room getRoom(long roomId) {
-        return roomRepository.findById(roomId)
-                .orElseThrow(() -> new CoreaException(ExceptionType.ROOM_NOT_FOUND));
-    }
-
-    private AutomaticUpdate getAutomaticUpdateByRoomId(long roomId) {
-        return automaticUpdateRepository.findByRoomId(roomId)
-                .orElseThrow(() -> new CoreaException(ExceptionType.AUTOMATIC_UPDATE_NOT_FOUND));
+        automaticUpdateRepository.findByRoomIdAndStatusForUpdate(roomId, ScheduleStatus.PENDING)
+                .ifPresent(automaticUpdate -> {
+                    updateExecutor.update(roomId);
+                    automaticUpdate.updateStatusToDone();
+                });
     }
 }

backend/src/main/java/corea/scheduler/service/MatchingExecutor.java

@@ -0,0 +1,66 @@
+package corea.scheduler.service;
+
+import corea.exception.CoreaException;
+import corea.exception.ExceptionType;
+import corea.matching.domain.PullRequestInfo;
+import corea.matching.service.MatchingService;
+import corea.matching.service.PullRequestProvider;
+import corea.room.domain.Room;
+import corea.room.repository.RoomRepository;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionTemplate;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class MatchingExecutor {
+
+    private final PlatformTransactionManager transactionManager;
+    private final PullRequestProvider pullRequestProvider;
+    private final MatchingService matchingService;
+    private final RoomRepository roomRepository;
+
+    @Async
+    public void match(long roomId) {
+        //TODO: 트랜잭션 분리
+        TransactionTemplate template = new TransactionTemplate(transactionManager);
+
+        try {
+            template.execute(status -> {
+                startMatching(roomId);
+                return null;
+            });
+        } catch (CoreaException e) {
+            log.warn("매칭 실행 중 에러 발생: {}", e.getMessage(), e);
+            updateRoomStatusToFail(roomId);
+        }
+    }
+
+    private void startMatching(long roomId) {
+        Room room = getRoom(roomId);
+        PullRequestInfo pullRequestInfo = pullRequestProvider.getUntilDeadline(room.getRepositoryLink(), room.getRecruitmentDeadline());
+
+        matchingService.match(roomId, pullRequestInfo);
+    }
+
+
+    private void updateRoomStatusToFail(long roomId) {
+        //TODO: 위와 동일
+        TransactionTemplate template = new TransactionTemplate(transactionManager);
+        template.execute(status -> {
+            Room room = getRoom(roomId);
+            room.updateStatusToFail();
+            return null;
+        });
+    }
+
+    private Room getRoom(long roomId) {
+        return roomRepository.findById(roomId)
+                .orElseThrow(() -> new CoreaException(ExceptionType.ROOM_NOT_FOUND));
+    }
+}

backend/src/main/java/corea/scheduler/service/UpdateExecutor.java

@@ -0,0 +1,75 @@
+package corea.scheduler.service;
+
+import corea.exception.CoreaException;
+import corea.exception.ExceptionType;
+import corea.feedback.domain.DevelopFeedback;
+import corea.feedback.domain.SocialFeedback;
+import corea.feedback.repository.DevelopFeedbackRepository;
+import corea.feedback.repository.SocialFeedbackRepository;
+import corea.matchresult.domain.MatchResult;
+import corea.matchresult.domain.ReviewStatus;
+import corea.matchresult.repository.MatchResultRepository;
+import corea.member.domain.Member;
+import corea.member.domain.MemberRole;
+import corea.room.domain.Room;
+import corea.room.repository.RoomRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Component
+@RequiredArgsConstructor
+public class UpdateExecutor {
+
+    private final RoomRepository roomRepository;
+    private final MatchResultRepository matchResultRepository;
+    private final SocialFeedbackRepository socialFeedbackRepository;
+    private final DevelopFeedbackRepository developFeedbackRepository;
+
+    @Async
+    @Transactional
+    public void update(long roomId) {
+        Room room = getRoom(roomId);
+        room.updateStatusToClose();
+
+        updateReviewCount(roomId);
+        updateFeedbackPoint(roomId);
+    }
+
+    private void updateReviewCount(long roomId) {
+        matchResultRepository.findAllByRoomIdAndReviewStatus(roomId, ReviewStatus.COMPLETE)
+                .forEach(this::increaseMembersReviewCountIn);
+    }
+
+    private void increaseMembersReviewCountIn(MatchResult matchResult) {
+        Member reviewer = matchResult.getReviewer();
+        reviewer.increaseReviewCount(MemberRole.REVIEWER);
+
+        Member reviewee = matchResult.getReviewee();
+        reviewee.increaseReviewCount(MemberRole.REVIEWEE);
+    }
+
+    private void updateFeedbackPoint(long roomId) {
+        socialFeedbackRepository.findAllByRoomId(roomId)
+                .forEach(this::updateSocialFeedbackPoint);
+
+        developFeedbackRepository.findAllByRoomId(roomId)
+                .forEach(this::updateDevelopFeedbackPoint);
+    }
+
+    private void updateSocialFeedbackPoint(SocialFeedback socialFeedback) {
+        Member receiver = socialFeedback.getReceiver();
+        receiver.updateAverageRating(socialFeedback.getEvaluatePoint());
+    }
+
+    private void updateDevelopFeedbackPoint(DevelopFeedback developFeedback) {
+        Member receiver = developFeedback.getReceiver();
+        receiver.updateAverageRating(developFeedback.getEvaluatePoint());
+    }
+
+    private Room getRoom(long roomId) {
+        return roomRepository.findById(roomId)
+                .orElseThrow(() -> new CoreaException(ExceptionType.ROOM_NOT_FOUND));
+    }
+}

backend/src/test/java/corea/matchresult/domain/MatchingFailedReasonTest.java

@@ -7,7 +7,6 @@
 import org.junit.jupiter.params.provider.CsvSource;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 class MatchingFailedReasonTest {