Merge pull request #142 from dnd-side-project/feature/#141-deleteComment

youcastle03 · web-flow · commit d5ca384f4300 · 2025-05-12T11:37:46.000+09:00
Feature/#141 delete comment
diff --git a/src/main/java/com/dnd/reevserver/domain/comment/dto/response/CommentResponseDto.java b/src/main/java/com/dnd/reevserver/domain/comment/dto/response/CommentResponseDto.java
@@ -5,5 +5,5 @@
 @Builder
 public record CommentResponseDto(Long commentId, String userId, Long retrospectId,
                                  String content, String nickName,String timeMessage,
-                                 boolean isDeleted, Integer likeCount, boolean isAuthor) {
+                                 Integer likeCount, boolean isAuthor) {
 }
diff --git a/src/main/java/com/dnd/reevserver/domain/comment/dto/response/ReplyResponseDto.java b/src/main/java/com/dnd/reevserver/domain/comment/dto/response/ReplyResponseDto.java
@@ -5,5 +5,5 @@
 @Builder
 public record ReplyResponseDto(Long commentId, String userId, Long retrospectId,
                                String content, String nickName,String timeMessage,
-                               boolean isDeleted, Integer likeCount, boolean isAuthor) {
+                               Integer likeCount, boolean isAuthor) {
 }
diff --git a/src/main/java/com/dnd/reevserver/domain/comment/entity/Comment.java b/src/main/java/com/dnd/reevserver/domain/comment/entity/Comment.java
@@ -10,11 +10,13 @@
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.SQLRestriction;
 
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SQLDelete(sql = "update comment set is_deleted = true where comment_id = ?")
+@SQLRestriction("is_deleted = false")
 public class Comment extends BaseEntity {
 
     @Id
diff --git a/src/main/java/com/dnd/reevserver/domain/comment/repository/CommentRepository.java b/src/main/java/com/dnd/reevserver/domain/comment/repository/CommentRepository.java
@@ -10,21 +10,21 @@
 
 public interface CommentRepository extends JpaRepository<Comment, Long> {
     @Query("SELECT c FROM Comment c " +
-            "JOIN FETCH c.member " +
-            "JOIN FETCH c.retrospect " +
-            "WHERE c.retrospect.retrospectId = :retrospectId " +
-            "and c.parentComment is null")
+        "JOIN FETCH c.member " +
+        "JOIN FETCH c.retrospect " +
+        "WHERE c.retrospect.retrospectId = :retrospectId " +
+        "and c.parentComment is null")
     List<Comment> findByRetrospectId(@Param("retrospectId") Long retrospectId);
 
 
     @Query("SELECT c FROM Comment c " +
-            "JOIN FETCH c.member " +
-            "JOIN FETCH c.retrospect " +
-            "WHERE c.parentComment.commentId = :parentCommentId")
+        "JOIN FETCH c.member " +
+        "JOIN FETCH c.retrospect " +
+        "WHERE c.parentComment.commentId = :parentCommentId")
     List<Comment> findAllByParentCommentId(@Param("parentCommentId") Long parentCommentId);
 
 
     int countByRetrospect(Retrospect retrospect);
 
     void deleteAllByRetrospectRetrospectId(Long retrospectId);
-}
+}
diff --git a/src/main/java/com/dnd/reevserver/domain/comment/service/CommentService.java b/src/main/java/com/dnd/reevserver/domain/comment/service/CommentService.java
@@ -143,7 +143,6 @@ private CommentResponseDto convertToCommentDto(Comment comment, boolean isAuthor
                 .content(comment.getContent())
                 .nickName(comment.getMember().getNickname())
                 .timeMessage(timeStringUtil.getTimeString(comment.getUpdatedAt()))
-                .isDeleted(comment.isDeleted())
                 .likeCount(comment.getLikeCount())
                 .isAuthor(isCommentAuthor(comment))
                 .build();
@@ -155,7 +154,6 @@ private CommentResponseDto convertToCommentDto(Comment comment, boolean isAuthor
             .content(comment.getContent())
             .nickName(comment.getMember().getNickname())
             .timeMessage(timeStringUtil.getTimeString(comment.getUpdatedAt()))
-            .isDeleted(comment.isDeleted())
             .build();
     }
 
@@ -168,7 +166,6 @@ private ReplyResponseDto convertToReplyDto(Comment reply, boolean isAuthorExiste
                 .content(reply.getContent())
                 .nickName(reply.getMember().getNickname())
                 .timeMessage(timeStringUtil.getTimeString(reply.getUpdatedAt()))
-                .isDeleted(reply.isDeleted())
                 .likeCount(reply.getLikeCount())
                 .isAuthor(isCommentAuthor(reply))
                 .build();
@@ -180,7 +177,6 @@ private ReplyResponseDto convertToReplyDto(Comment reply, boolean isAuthorExiste
             .content(reply.getContent())
             .nickName(reply.getMember().getNickname())
             .timeMessage(timeStringUtil.getTimeString(reply.getUpdatedAt()))
-            .isDeleted(reply.isDeleted())
             .build();
     }
 }
diff --git a/src/main/java/com/dnd/reevserver/domain/memo/controller/MemoController.java b/src/main/java/com/dnd/reevserver/domain/memo/controller/MemoController.java
@@ -19,18 +19,26 @@
 public class MemoController {
     private final MemoService memoService;
 
+    @Operation(summary = "메모 단일 조회, 그룹이 없을 경우 groupId가 0으로 표시됩니다.")
     @GetMapping("/{memoId}")
     public ResponseEntity<MemoResponseDto> findMemoById(@PathVariable Long memoId) {
         return ResponseEntity.ok(memoService.findMemoById(memoId));
     }
 
-    @Operation(summary = "유저의 전체 메모 조회")
+    @Operation(summary = "유저의 전체 메모 조회, 그룹이 없을 경우 groupId가 0으로 표시됩니다.")
     @GetMapping
     public ResponseEntity<List<MemoResponseDto>> findMemosByUserId(@AuthenticationPrincipal String userId) {
         List<MemoResponseDto> memos = memoService.findMemosByUserId(userId);
         return ResponseEntity.ok(memos);
     }
 
+    @Operation(summary = "유저와 그룹으로 메모들 조회")
+    @GetMapping("/group/{groupId}")
+    public ResponseEntity<List<MemoResponseDto>> findMemosByUserIdAndGroupId(@AuthenticationPrincipal String userId,
+                                                                             @PathVariable Long groupId) {
+        return ResponseEntity.ok(memoService.findMemosByUserIdAndGroupId(userId, groupId));
+    }
+
     @Operation(summary = "유저의 메모 수 조회")
     @GetMapping("/count")
     public ResponseEntity<Integer> countMemosByUserId(@AuthenticationPrincipal String userId) {
diff --git a/src/main/java/com/dnd/reevserver/domain/memo/dto/request/CreateMemoRequestDto.java b/src/main/java/com/dnd/reevserver/domain/memo/dto/request/CreateMemoRequestDto.java
@@ -2,5 +2,6 @@
 
 import java.util.List;
 
-public record CreateMemoRequestDto(String title, String content, String templateName, List<String> categoriesName) {
+public record CreateMemoRequestDto(String title, String content, String templateName,
+                                   List<String> categoriesName, Long groupId) {
 }
diff --git a/src/main/java/com/dnd/reevserver/domain/memo/dto/response/MemoResponseDto.java b/src/main/java/com/dnd/reevserver/domain/memo/dto/response/MemoResponseDto.java
@@ -5,5 +5,6 @@
 import java.util.List;
 
 @Builder
-public record MemoResponseDto(Long memoId, String userId, String title, String content, String templateName, List<String> categories){
+public record MemoResponseDto(Long memoId, String userId, String title,
+                              String content, String templateName, List<String> categories, Long groupId){
 }
diff --git a/src/main/java/com/dnd/reevserver/domain/memo/entity/Memo.java b/src/main/java/com/dnd/reevserver/domain/memo/entity/Memo.java
@@ -2,6 +2,7 @@
 
 import com.dnd.reevserver.domain.category.entity.MemoCategory;
 import com.dnd.reevserver.domain.member.entity.Member;
+import com.dnd.reevserver.domain.team.entity.Team;
 import com.dnd.reevserver.domain.template.entity.Template;
 import com.dnd.reevserver.global.common.entity.BaseEntity;
 import jakarta.persistence.*;
@@ -38,4 +39,8 @@ public class Memo extends BaseEntity {
 
     @OneToMany(mappedBy = "memo", cascade = CascadeType.REMOVE, orphanRemoval = true)
     private List<MemoCategory> memoCategories = new ArrayList<>();
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "group_id")
+    private Team team;
 }
diff --git a/src/main/java/com/dnd/reevserver/domain/memo/repository/MemoRepository.java b/src/main/java/com/dnd/reevserver/domain/memo/repository/MemoRepository.java
@@ -11,6 +11,15 @@ public interface MemoRepository extends JpaRepository<Memo, Long> {
     @Query("SELECT m FROM Memo m " +
             "JOIN FETCH m.member " +
             "JOIN FETCH m.template " +
+            "JOIN FETCH m.team "+
             "WHERE m.member.userId = :userId")
     List<Memo> findMemosByMemberUserId(@Param("userId") String userId);
+
+    @Query("SELECT m FROM Memo m " +
+            "JOIN FETCH m.member " +
+            "JOIN FETCH m.template " +
+            "JOIN FETCH m.team "+
+            "WHERE m.member.userId = :userId " +
+            "AND m.team.groupId = :groupId")
+    List<Memo> findMemosByMemberUserIdAndGroupId(@Param("userId") String userId, @Param("groupId") Long groupId);
 }
diff --git a/src/main/java/com/dnd/reevserver/domain/memo/service/MemoService.java b/src/main/java/com/dnd/reevserver/domain/memo/service/MemoService.java
@@ -11,6 +11,7 @@
 import com.dnd.reevserver.domain.memo.entity.Memo;
 import com.dnd.reevserver.domain.memo.exception.MemoNotFoundException;
 import com.dnd.reevserver.domain.memo.repository.MemoRepository;
+import com.dnd.reevserver.domain.team.service.TeamService;
 import com.dnd.reevserver.domain.template.entity.Template;
 import com.dnd.reevserver.domain.template.service.TemplateService;
 import lombok.RequiredArgsConstructor;
@@ -29,6 +30,7 @@ public class MemoService {
     private final MemoCategoryRepository memoCategoryRepository;
     private final CategoryRepository categoryRepository;
     private final MemoCategoryBatchRepository memoCategoryBatchRepository;
+    private final TeamService teamService;
 
     public Memo findById(Long id) {
         return memoRepository.findById(id).orElseThrow(MemoNotFoundException::new);
@@ -46,6 +48,13 @@ public List<MemoResponseDto> findMemosByUserId(String userId){
                 .collect(Collectors.toList());
     }
 
+    // 유저의 그룹에 있는 메모들 조회
+    public List<MemoResponseDto> findMemosByUserIdAndGroupId(String userId, Long groupId){
+        return memoRepository.findMemosByMemberUserIdAndGroupId(userId, groupId).stream()
+                .map(this::convertToDto)
+                .collect(Collectors.toList());
+    }
+
     // 유저의 메모 수 조회
     public Integer countMemosByUserId(String userId){
         return memoRepository.findMemosByMemberUserId(userId).size();
@@ -56,11 +65,12 @@ public Integer countMemosByUserId(String userId){
     public void createMemo(String userId, CreateMemoRequestDto dto){
         Template template = templateService.findByName(dto.templateName());
         Memo memo = Memo.builder()
-                .member(memberService.findById(userId))
-                .title(dto.title())
-                .content(dto.content())
-                .template(template) // null 가능
-                .build();
+                    .member(memberService.findById(userId))
+                    .title(dto.title())
+                    .content(dto.content())
+                    .template(template) // null 가능
+                    .team(dto.groupId() == null ? null : teamService.findById(dto.groupId())) // null 가능
+                    .build();
         // 메모-태그 생성
         memoRepository.save(memo);
         List<Category> categories = categoryRepository.findByCategoryNameIn(dto.categoriesName());
@@ -90,6 +100,9 @@ private MemoResponseDto convertToDto(Memo memo){
                             .map(mc -> mc.getCategory().getCategoryName())
                             .toList()
                 )
+                .groupId(
+                        memo.getTeam() == null ? 0 : memo.getTeam().getGroupId()
+                )
                 .build();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`@Builder`
`6`	`6`	`public record CommentResponseDto(Long commentId, String userId, Long retrospectId,`
`7`	`7`	`String content, String nickName,String timeMessage,`
`8`		`- boolean isDeleted, Integer likeCount, boolean isAuthor) {`
	`8`	`+ Integer likeCount, boolean isAuthor) {`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`@Builder`
`6`	`6`	`public record ReplyResponseDto(Long commentId, String userId, Long retrospectId,`
`7`	`7`	`String content, String nickName,String timeMessage,`
`8`		`- boolean isDeleted, Integer likeCount, boolean isAuthor) {`
	`8`	`+ Integer likeCount, boolean isAuthor) {`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,6 @@`
`2`	`2`
`3`	`3`	`import java.util.List;`
`4`	`4`
`5`		`-public record CreateMemoRequestDto(String title, String content, String templateName, List<String> categoriesName) {`
	`5`	`+public record CreateMemoRequestDto(String title, String content, String templateName,`
	`6`	`+ List<String> categoriesName, Long groupId) {`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,6 @@`
`5`	`5`	`import java.util.List;`
`6`	`6`
`7`	`7`	`@Builder`
`8`		`-public record MemoResponseDto(Long memoId, String userId, String title, String content, String templateName, List<String> categories){`
	`8`	`+public record MemoResponseDto(Long memoId, String userId, String title,`
	`9`	`+ String content, String templateName, List<String> categories, Long groupId){`
`9`	`10`	`}`