[test] photo_request 테이블에 비관적 락을 적용해 동시성 문제 해결하기

src/main/java/gdsc/cau/puangbe/photo/entity/PhotoRequest.java

@@ -46,9 +46,6 @@ public class PhotoRequest {
     @OneToMany(mappedBy = "request", cascade = {CascadeType.PERSIST, CascadeType.REMOVE})
     private List<PhotoOrigin> photoUrls = new ArrayList<>();
 
-    @Version
-    private Long version;
-
     @Builder
     public PhotoRequest(User user, Gender gender, List<String> urls, String email) {
         this.user = user;
@@ -69,13 +66,4 @@ public void modifyEmail(String email) {
         this.email = email;
         this.updateDate = LocalDateTime.now();
     }
-
-    @Override
-    public String toString() {
-        return "PhotoRequest{" +
-                "id=" + id +
-                ", email='" + email + '\'' +
-                ", version=" + version +
-                '}';
-    }
 }

src/main/java/gdsc/cau/puangbe/photo/repository/PhotoRequestRepository.java

@@ -12,8 +12,11 @@
 
 @Repository
 public interface PhotoRequestRepository extends JpaRepository<PhotoRequest, Long> {
+
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
     Optional<PhotoRequest> findById(Long photoRequestId);
 
     // 특정 유저의 최근에 만들어진 PhotoRequest 조회
+    @Lock(LockModeType.PESSIMISTIC_WRITE)
     Optional<PhotoRequest> findTopByUserIdOrderByCreateDateDesc(Long photoRequestId);
 }

src/main/java/gdsc/cau/puangbe/photo/service/PhotoServiceImpl.java

@@ -42,12 +42,6 @@ public class PhotoServiceImpl implements PhotoService {
     // 완성된 요청 id 및 imageUrl을 받아 저장
     @Override
     @Transactional
-    @Lock(LockModeType.OPTIMISTIC)
-    @Retryable(
-            retryFor = {ObjectOptimisticLockingFailureException.class},
-            maxAttempts = 1000,
-            backoff = @Backoff(100)
-    )
     public void uploadPhoto(Long photoRequestId, String imageUrl) {
         // 예외처리
         PhotoRequest photoRequest = photoRequestRepository.findById(photoRequestId)
@@ -65,18 +59,18 @@ public void uploadPhoto(Long photoRequestId, String imageUrl) {
         photoResult.update(imageUrl);
         photoResultRepository.save(photoResult);
 
-        log.info("uploadPhoto - PhotoRequest version: {}", photoRequest.getVersion());
+        log.info("upload photo");
 
 
         // 이메일 발송
-        EmailInfo emailInfo = EmailInfo.builder()
-                .email(photoRequest.getEmail())
-                .photoUrl(imageUrl)
-                .name(user.getUserName())
-                .framePageUrl("https://www.google.com/") // TODO : 프론트 분들 링크 관련 답변 오면 프레임 페이지 링크 관련 수정
-                .build();
-
-        sendEmail(emailInfo);
+//        EmailInfo emailInfo = EmailInfo.builder()
+//                .email(photoRequest.getEmail())
+//                .photoUrl(imageUrl)
+//                .name(user.getUserName())
+//                .framePageUrl("https://www.google.com/") // TODO : 프론트 분들 링크 관련 답변 오면 프레임 페이지 링크 관련 수정
+//                .build();
+//
+//        sendEmail(emailInfo);
     }
 
     // 특정 요청의 imageUrl 조회

src/main/java/gdsc/cau/puangbe/photorequest/service/PhotoRequestServiceImpl.java

@@ -131,12 +131,6 @@ public String getRequestStatus(Long userId){
 
     @Override
     @Transactional
-    @Lock(LockModeType.OPTIMISTIC)
-    @Retryable(
-            retryFor = {ObjectOptimisticLockingFailureException.class},
-            maxAttempts = 1000,
-            backoff = @Backoff(100)
-    )
     public Long updateEmail(Long userId, String email) {
 
         // 가장 최근의 PhotoRequest 조회
@@ -146,7 +140,7 @@ public Long updateEmail(Long userId, String email) {
         photoRequest.modifyEmail(email);
         photoRequestRepository.save(photoRequest);
 
-        log.info("updateEmail - PhotoRequest version: {}", photoRequest.getVersion());
+        log.info("update email");
 
         return photoRequest.getId();
     }