Merge pull request #72 from BackEndSchoolPlus3th/SMS-98-feat-community

Sms 98 feat community

Author: skyeong42

src/main/java/org/com/stocknote/domain/comment/entity/Comment.java

@@ -22,7 +22,7 @@ public class Comment extends BaseEntity {
     private Post post;
 
     @Setter
-    @Column(nullable = false)
+    @Column(nullable = false, length = 500) // 최대 길이 제한
     private String body;
 
     @ManyToOne(fetch = FetchType.LAZY)

src/main/java/org/com/stocknote/domain/comment/repository/CommentRepository.java

@@ -5,11 +5,18 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public interface CommentRepository extends JpaRepository<Comment, Long> {
-    Page<Comment> findByPostId(Pageable pageable, Long postId);
+//    Page<Comment> findByPostId(Pageable pageable, Long postId);
     Page<Comment> findByMember(Member member, Pageable pageable);
     boolean existsByPostIdAndMember(Long postId, Member member);
+    @Query(value = "SELECT DISTINCT c FROM Comment c " +
+            "JOIN FETCH c.member " +
+            "WHERE c.post.id = :postId",
+            countQuery = "SELECT COUNT(c) FROM Comment c WHERE c.post.id = :postId")
+    Page<Comment> findByPostId(@Param("postId") Long postId, Pageable pageable);
 }

src/main/java/org/com/stocknote/domain/comment/service/CommentService.java

@@ -41,13 +41,15 @@ public CommentDetailResponse getCommentDetail(Long commentId) {
     }
 
     public Page<CommentDetailResponse> getComments(Long postId, Pageable pageable) {
-        Page<CommentDetailResponse> comments = commentRepository.findByPostId(pageable, postId)
-                .map(comment -> {
-                            Member member = memberRepository.findById(comment.getMember().getId()).orElseThrow(() -> new IllegalArgumentException("user not found"));
-                            return new CommentDetailResponse(comment.getId(), comment.getBody(), comment.getCreatedAt(), member.getId(), member.getName(),member.getProfile());
-                        }
-                );
-        return comments;
+        return commentRepository.findByPostId(postId, pageable)
+                .map(comment -> new CommentDetailResponse(
+                        comment.getId(),
+                        comment.getBody(),
+                        comment.getCreatedAt(),
+                        comment.getMember().getId(), //이미 로딩된 member 사용
+                        comment.getMember().getName(),
+                        comment.getMember().getProfile()
+                ));
     }
 
     @Transactional

src/main/java/org/com/stocknote/domain/post/controller/PostController.java

@@ -7,11 +7,10 @@
 import lombok.RequiredArgsConstructor;
 import org.com.stocknote.domain.member.entity.Member;
 import org.com.stocknote.domain.notification.service.KeywordNotificationElasticService;
-import org.com.stocknote.domain.notification.service.KeywordNotificationService;
 import org.com.stocknote.domain.post.dto.PostModifyDto;
 import org.com.stocknote.domain.post.dto.PostResponseDto;
-import org.com.stocknote.domain.post.entity.Post;
 import org.com.stocknote.domain.post.dto.PostSearchConditionDto;
+import org.com.stocknote.domain.post.entity.Post;
 import org.com.stocknote.domain.post.entity.PostCategory;
 import org.com.stocknote.domain.post.service.PostService;
 import org.com.stocknote.domain.searchDoc.document.PostDoc;
@@ -34,7 +33,7 @@ public class PostController {
 
     private final PostService postService;
     private final SearchDocService searchDocService;
-    private final KeywordNotificationService keywordNotificationService;
+//    private final KeywordNotificationService keywordNotificationService;
     private final KeywordNotificationElasticService keywordNotificationElasticService;
 
     @Transactional

src/main/java/org/com/stocknote/domain/post/dto/PostResponseDto.java

@@ -8,6 +8,7 @@
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public record PostResponseDto(
@@ -44,6 +45,15 @@ public static PostResponseDto fromPost(Post post, List<String> hashtags) {
         );
     }
 
+    // 지연 로딩용 메서드 추가
+    public List<CommentDetailResponse> getComments() {
+        if (comments == null) {
+            // 실제 댓글 로딩 로직 (서비스 레이어에서 처리)
+            return Collections.emptyList();
+        }
+        return comments;
+    }
+
     public static PostResponseDto fromPost(PostDoc postDoc) {
         return new PostResponseDto(
             Long.valueOf(postDoc.getId()),

src/main/java/org/com/stocknote/domain/post/entity/Post.java

@@ -45,9 +45,9 @@ public class Post extends BaseEntity {
 
     private LocalDateTime deletedAt;
 
-    public void softDelete() {
-        this.deletedAt = LocalDateTime.now();
-    }
+//    public void softDelete() {
+//        this.deletedAt = LocalDateTime.now();
+//    }
 
     public void titleUpdate(String title) {
         this.title = title;

src/main/java/org/com/stocknote/domain/post/repository/PostRepository.java

@@ -14,11 +14,28 @@
 
 @Repository
 public interface PostRepository extends JpaRepository<Post, Long> {
-    Page<Post> findByCategory(PostCategory category, Pageable pageable);
+    @Query("SELECT DISTINCT p FROM Post p " +
+            "LEFT JOIN FETCH p.member m " +
+            "LEFT JOIN FETCH p.comments c " +
+            "WHERE p.category = :category " +
+            "AND p.deletedAt IS NULL " +
+            "ORDER BY p.createdAt DESC")
 
-    Long id(Long id);
+    Page<Post> findByCategory(
+            @Param("category") PostCategory category,
+            Pageable pageable
+    );
 
-    Page<Post> findByMember(Member member, Pageable pageable);
+    @Query("SELECT DISTINCT p FROM Post p " +
+            "LEFT JOIN FETCH p.member m " +
+            "LEFT JOIN FETCH p.comments c " +
+            "WHERE p.member = :member " +
+            "AND p.deletedAt IS NULL " +
+            "ORDER BY p.createdAt DESC")
+    Page<Post> findByMember(
+            @Param("member") Member member,
+            Pageable pageable
+    );
 
     //인기 순으로 정렬(댓글순 + 좋아요순 3일 이내)
     @Query("""
@@ -48,13 +65,13 @@ public interface PostRepository extends JpaRepository<Post, Long> {
     Page<Post> findPopularPosts(Pageable pageable);
 
 
-    // 좋아요 순으로 정렬
-    @Query("SELECT p FROM Post p WHERE p.deletedAt IS NULL ORDER BY size(p.likes) DESC")
-    Page<Post> findPopularPostsByLikes(Pageable pageable);
-
-    // 댓글 순으로 정렬
-    @Query("SELECT p FROM Post p WHERE p.deletedAt IS NULL ORDER BY size(p.comments) DESC")
-    Page<Post> findPopularPostsByComments(Pageable pageable);
+//    // 좋아요 순으로 정렬
+//    @Query("SELECT p FROM Post p WHERE p.deletedAt IS NULL ORDER BY size(p.likes) DESC")
+//    Page<Post> findPopularPostsByLikes(Pageable pageable);
+//
+//    // 댓글 순으로 정렬
+//    @Query("SELECT p FROM Post p WHERE p.deletedAt IS NULL ORDER BY size(p.comments) DESC")
+//    Page<Post> findPopularPostsByComments(Pageable pageable);
 
 
     @Query("SELECT DISTINCT p FROM Post p " +