Merge pull request #266 from Team-Capple/feat/#265/entityConcurrentIssue

[FEAT] 좋아요, 댓글 개수 동시성 문제 해결

Author: jaewonLeeKOR

build.gradle

@@ -70,6 +70,8 @@ dependencies {
 	implementation 'io.micrometer:micrometer-registry-prometheus'
 //	open csv
 	implementation 'com.opencsv:opencsv:5.5.1'
+//	redisson
+	implementation 'org.redisson:redisson-spring-boot-starter:3.46.0'
 }
 
 dependencyManagement {

config

@@ -0,0 +1,24 @@
+package com.server.capple.config;
+
+import org.redisson.Redisson;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class RedissonConfig {
+    @Value("${spring.data.redis.host}")
+    private String redisHost;
+    @Value("${spring.data.redis.port}")
+    private String redisPort;
+    @Value("${spring.data.redis.database}")
+    private Integer redisDatabase;
+    @Bean
+    public RedissonClient redissonClient() {
+        Config config = new Config();
+        config.useSingleServer().setAddress("redis://" + redisHost + ":" + redisPort).setDatabase(redisDatabase);
+        return Redisson.create(config);
+    }
+}

src/main/java/com/server/capple/config/RedissonConfig.java

@@ -8,6 +8,7 @@
 import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.SQLRestriction;
 
 @Getter
@@ -17,6 +18,7 @@
 @AllArgsConstructor
 @SQLRestriction("deleted_at is null")
 @DynamicInsert
+@DynamicUpdate
 public class Answer extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

src/main/java/com/server/capple/domain/answer/entity/Answer.java

@@ -0,0 +1,34 @@
+package com.server.capple.domain.answer.service;
+
+import com.server.capple.domain.answer.entity.Answer;
+import com.server.capple.domain.answer.repository.AnswerRepository;
+import com.server.capple.global.utils.distributedLock.DistributedLock;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AnswerConcurrentService {
+    private final AnswerRepository answerRepository;
+
+    @DistributedLock("'answer::heartCount::' + #answer.id")
+    public Boolean setHeartCount(Answer answer, boolean isLiked) {
+        answer = answerRepository.findById(answer.getId()).get();
+        answer.setHeartCount(isLiked);
+        return true;
+    }
+
+    @DistributedLock("'answer::commentCount::' + #answer.id")
+    public Boolean increaseCommentCount(Answer answer) {
+        answer = answerRepository.findById(answer.getId()).get();
+        answer.increaseCommentCount();
+        return true;
+    }
+
+    @DistributedLock("'answer::commentCount::' + #answer.id")
+    public Boolean decreaseCommentCount(Answer answer) {
+        answer = answerRepository.findById(answer.getId()).get();
+        answer.decreaseCommentCount();
+        return true;
+    }
+}

src/main/java/com/server/capple/domain/answer/service/AnswerConcurrentService.java

@@ -14,7 +14,6 @@
 import com.server.capple.domain.answer.repository.AnswerHeartRedisRepository;
 import com.server.capple.domain.answer.repository.AnswerHeartRepository;
 import com.server.capple.domain.answer.repository.AnswerRepository;
-import com.server.capple.domain.answerComment.repository.AnswerCommentRepository;
 import com.server.capple.domain.member.entity.Member;
 import com.server.capple.domain.member.service.MemberService;
 import com.server.capple.domain.notifiaction.service.NotificationService;
@@ -54,6 +53,7 @@ public class AnswerServiceImpl implements AnswerService {
     private final NotificationService notificationService;
     private final AnswerHeartRepository answerHeartRepository;
     private final AnswerHeartMapper answerHeartMapper;
+    private final AnswerConcurrentService answerConcurrentService;
 
     @Transactional
     @Override
@@ -121,7 +121,9 @@ public AnswerLike toggleAnswerHeart(Member loginMember, Long answerId) {
                 });
 
         boolean isLiked = answerHeart.toggleHeart();
-        answer.setHeartCount(answerHeart.isLiked()); // 답변에 대한 좋아요 heartCount 증가/감소
+        if (!answerConcurrentService.setHeartCount(answer, isLiked)) { // 답변에 대한 좋아요 heartCount 증가/감소
+            throw new RestApiException(AnswerErrorCode.ANSWER_COUNT_CHANGE_FAILED);
+        }
 
         if(isLiked)
             notificationService.sendAnswerHeartNotification(loginMember.getId(), answer);

src/main/java/com/server/capple/domain/answer/service/AnswerServiceImpl.java

@@ -7,6 +7,7 @@
 import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.SQLRestriction;
 
 @Getter
@@ -16,6 +17,7 @@
 @AllArgsConstructor
 @SQLRestriction("deleted_at is null")
 @DynamicInsert
+@DynamicUpdate
 public class AnswerComment extends BaseEntity {
 
     @Id

src/main/java/com/server/capple/domain/answerComment/entity/AnswerComment.java

@@ -0,0 +1,20 @@
+package com.server.capple.domain.answerComment.service;
+
+import com.server.capple.domain.answerComment.entity.AnswerComment;
+import com.server.capple.domain.answerComment.repository.AnswerCommentRepository;
+import com.server.capple.global.utils.distributedLock.DistributedLock;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class AnswerCommentConcurrentService {
+    private final AnswerCommentRepository answerCommentRepository;
+
+    @DistributedLock("'answerComment::heartCount::' + #answerComment.id")
+    Boolean setHeartCount(AnswerComment answerComment, boolean isLiked) {
+        answerComment = answerCommentRepository.findById(answerComment.getId()).get();
+        answerComment.setHeartCount(isLiked);
+        return true;
+    }
+}

src/main/java/com/server/capple/domain/answerComment/service/AnswerCommentConcurrentService.java

@@ -1,6 +1,7 @@
 package com.server.capple.domain.answerComment.service;
 
 import com.server.capple.domain.answer.entity.Answer;
+import com.server.capple.domain.answer.service.AnswerConcurrentService;
 import com.server.capple.domain.answer.service.AnswerService;
 import com.server.capple.domain.answerComment.dto.AnswerCommentRequest;
 import com.server.capple.domain.answerComment.dto.AnswerCommentResponse.*;
@@ -32,6 +33,8 @@ public class AnswerCommentServiceImpl implements AnswerCommentService{
     private final AnswerService answerService;
     private final NotificationService notificationService;
     private final AnswerSubscribeMemberService answerSubscribeMemberService;
+    private final AnswerCommentConcurrentService answerCommentConcurrentService;
+    private final AnswerConcurrentService answerConcurrentService;
 
     /* 댓글 작성 */
     @Override
@@ -41,7 +44,9 @@ public AnswerCommentId createAnswerComment(Member member, Long answerId, AnswerC
         Answer answer = answerService.findAnswer(answerId);
         AnswerComment answerComment = answerCommentRepository.save(answerCommentMapper.toAnswerCommentEntity(loginMember, answer, request.getAnswerComment()));
         notificationService.sendAnswerCommentNotification(answer, answerComment);
-        answer.increaseCommentCount(); // 답변 commentCount 증가
+        if (!answerConcurrentService.increaseCommentCount(answer)) { // 답변 commentCount 증가
+            throw new RestApiException(CommentErrorCode.COMMENT_COUNT_INCREASE_FAILED);
+        }
         return new AnswerCommentId(answerComment.getId());
     }
 
@@ -53,7 +58,9 @@ public AnswerCommentId deleteAnswerComment(Member member, Long commentId) {
         checkPermission(member, answerComment); // 유저 권한 체크
 
         answerSubscribeMemberService.deleteAnswerSubscribeMemberByAnswerId(answerComment.getAnswer().getId());
-        answerComment.getAnswer().decreaseCommentCount(); // 답변 commentCount 감소
+        if (!answerConcurrentService.decreaseCommentCount(answerComment.getAnswer())) { // 답변 commentCount 감소
+            throw new RestApiException(CommentErrorCode.COMMENT_COUNT_DECREASE_FAILED);
+        }
         answerComment.delete();
         return new AnswerCommentId(answerComment.getId());
     }
@@ -77,7 +84,9 @@ public AnswerCommentHeart heartAnswerComment(Member member, Long commentId) {
         Boolean isLiked = answerCommentHeartRedisRepository.toggleAnswerCommentHeart(commentId, member.getId());
         if(isLiked)
             notificationService.sendAnswerCommentHeartNotification(answerComment);
-        answerComment.setHeartCount(isLiked); // 댓글 좋아요 heartCount 감소
+        if (!answerCommentConcurrentService.setHeartCount(answerComment, isLiked)) { // 댓글 좋아요 heartCount 감소
+            throw new RestApiException(CommentErrorCode.COMMENT_HEART_CHANGE_FAILED);
+        }
         return new AnswerCommentHeart(commentId, isLiked);
     }
 

src/main/java/com/server/capple/domain/answerComment/service/AnswerCommentServiceImpl.java

@@ -1,13 +1,12 @@
 package com.server.capple.domain.board.entity;
 
-import com.server.capple.domain.answer.dto.AnswerRequest;
-import com.server.capple.domain.board.dto.BoardRequest;
 import com.server.capple.domain.member.entity.Member;
 import com.server.capple.global.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.SQLRestriction;
 
 @Getter
@@ -17,6 +16,7 @@
 @AllArgsConstructor
 @SQLRestriction("deleted_at is null")
 @DynamicInsert
+@DynamicUpdate
 public class Board extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)