Merge pull request #99 from mummhy0811/main

Fix: 편지 자동 상태변경 오류 수정 및 댓글 read에 댓글 id 추가
ForOneStep · Nov 18, 2023 · f88b1cc · f88b1cc
2 parents a055246 + ea0afd9
commit f88b1cc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/com/onestep/server/entity/comment/ViewCommentDto.java b/src/main/java/com/onestep/server/entity/comment/ViewCommentDto.java
@@ -8,6 +8,7 @@
 @Getter
 @Setter
 public class ViewCommentDto {
+    private Long comment_id;
     private String writer_nickname;
     private String writer_profile;
     private Long root_comment_id;

diff --git a/src/main/java/com/onestep/server/repository/ILetterRepository.java b/src/main/java/com/onestep/server/repository/ILetterRepository.java
@@ -4,8 +4,10 @@
 import com.onestep.server.entity.Letter;
 import com.onestep.server.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -24,6 +26,8 @@ public interface ILetterRepository extends JpaRepository<Letter, Long> {
     List<Letter> findWeeklyLetterByFamilyId(@Param("family") Family family);
 
     //쪽지 상태 변경
+    @Transactional
+    @Modifying
     @Query("UPDATE Letter l SET l.letter_state = l.letter_state+1  WHERE l.letter_state<2")
     void changeLetterState();
 }
diff --git a/src/main/java/com/onestep/server/service/comment/CommentService.java b/src/main/java/com/onestep/server/service/comment/CommentService.java
@@ -65,7 +65,7 @@ public List<ViewCommentDto> viewComment(Long answerId){
             ViewCommentDto viewCommentDto = new ViewCommentDto();
 
             viewCommentDto.setComment_txt(comment.getComment_txt());
-
+            viewCommentDto.setComment_id(comment.getComment_id());
             if(comment.getComment()!=null){
                 viewCommentDto.setRoot_comment_id(comment.getComment().getComment_id());
             }