Feat/#71 comment

src/main/java/com/hyetaekon/hyetaekon/answer/controller/AnswerController.java

@@ -58,16 +58,11 @@ public ResponseEntity<Void> selectAnswer(
 
     // 답변 삭제 (관리자만 가능)
     @DeleteMapping("/{answerId}")
-    @PreAuthorize("hasAnyRole('USER', 'ADMIN')")
     public ResponseEntity<Void> deleteAnswer(
             @PathVariable Long postId,
             @PathVariable Long answerId,
             @AuthenticationPrincipal CustomUserDetails userDetails) {
-
-        Long userId = userDetails.getId();
-        boolean isAdmin = "ROLE_ADMIN".equals(userDetails.getRole());
-
-        answerService.deleteAnswer(postId, answerId, userId, isAdmin);
+        answerService.deleteAnswer(postId, answerId, userDetails.getId(), userDetails.getRole());
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/com/hyetaekon/hyetaekon/answer/entity/Answer.java

@@ -1,39 +1,44 @@
 package com.hyetaekon.hyetaekon.answer.entity;
 
+import com.hyetaekon.hyetaekon.common.util.BaseEntity;
+import com.hyetaekon.hyetaekon.post.entity.Post;
+import com.hyetaekon.hyetaekon.user.entity.User;
 import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import java.time.LocalDateTime;
+import lombok.*;
+
 
 @Entity
 @Getter
 @Setter
+@Builder
 @NoArgsConstructor
+@AllArgsConstructor
 @Table(name = "answer")
-public class Answer {
+public class Answer extends BaseEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id; // 답변 ID
 
-    @Column(name = "post_id", nullable = false)
-    private Long postId; // 게시글 ID
+    @ManyToOne
+    @JoinColumn(name = "post_id")
+    private Post post;
 
-    @Column(name = "user_id", nullable = false)
-    private Long userId; // 회원 ID
+    @ManyToOne
+    @JoinColumn(name = "user_id")
+    private User user;
 
     @Column(name = "content", columnDefinition = "TEXT", nullable = false)
     private String content; // 답변 내용
 
-    @Column(name = "created_at", nullable = false)
-    private LocalDateTime createdAt; // 생성일
-
     @Column(name = "selected", nullable = false)
     private boolean selected; // 채택 여부
 
-    // ⭐ 생성 시점에 createdAt 자동 설정
-    @PrePersist
-    protected void onCreate() {
-        this.createdAt = LocalDateTime.now();
+    public String getDisplayContent() {
+        if (getDeletedAt() != null) {
+            return "삭제된 답변입니다.";
+        } else if (getSuspendAt() != null) {
+            return "관리자에 의해 삭제된 답변입니다.";
+        }
+        return content;
     }
 }

src/main/java/com/hyetaekon/hyetaekon/answer/mapper/AnswerMapper.java

@@ -4,16 +4,12 @@
 import com.hyetaekon.hyetaekon.answer.entity.Answer;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
-import org.mapstruct.factory.Mappers;
+import org.mapstruct.ReportingPolicy;
 
-@Mapper(componentModel = "spring")
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
 public interface AnswerMapper {
-    AnswerMapper INSTANCE = Mappers.getMapper(AnswerMapper.class);
-
+    @Mapping(target = "content", expression = "java(answer.getDisplayContent())")
     AnswerDto toDto(Answer answer);
 
-    @Mapping(target = "id", ignore = true)  // id는 자동 생성되므로 무시
-    @Mapping(target = "selected", ignore = true)  // 기본값 false 처리
-    @Mapping(target = "createdAt", ignore = true) // createdAt 자동 설정
     Answer toEntity(AnswerDto answerDto);
 }

src/main/java/com/hyetaekon/hyetaekon/answer/repository/AnswerRepository.java

@@ -1,6 +1,7 @@
 package com.hyetaekon.hyetaekon.answer.repository;
 
 import com.hyetaekon.hyetaekon.answer.entity.Answer;
+import com.hyetaekon.hyetaekon.post.entity.Post;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -10,9 +11,20 @@
 
 @Repository
 public interface AnswerRepository extends JpaRepository<Answer, Long> {
-    // 페이지네이션 적용한 답변 목록 조회
-    Page<Answer> findByPostId(Long postId, Pageable pageable);
+    // 페이지네이션 적용한 답변 목록 조회 (post 객체 사용)
+    Page<Answer> findByPost(Post post, Pageable pageable);
 
     // 채택 여부 및 등록일 기준 정렬된 페이징 처리된 답변 목록 조회
-    Page<Answer> findByPostIdOrderBySelectedDescCreatedAtDesc(Long postId, Pageable pageable);
+    Page<Answer> findByPostOrderBySelectedDescCreatedAtDesc(Post post, Pageable pageable);
+
+    // 삭제된 답변만 조회 (관리자용)
+    Page<Answer> findByPostAndDeletedAtIsNotNull(Post post, Pageable pageable);
+
+    // 정지된 답변만 조회 (관리자용)
+    Page<Answer> findByPostAndSuspendAtIsNotNull(Post post, Pageable pageable);
+
+    // 통계용 카운팅 메서드들
+    long countByPost(Post post);
+    long countByPostAndDeletedAtIsNotNull(Post post);
+    long countByPostAndSuspendAtIsNotNull(Post post);
 }

src/main/java/com/hyetaekon/hyetaekon/answer/service/AnswerService.java

@@ -9,6 +9,8 @@
 import com.hyetaekon.hyetaekon.post.entity.Post;
 import com.hyetaekon.hyetaekon.post.repository.PostRepository;
 import com.hyetaekon.hyetaekon.user.entity.PointActionType;
+import com.hyetaekon.hyetaekon.user.entity.User;
+import com.hyetaekon.hyetaekon.user.repository.UserRepository;
 import com.hyetaekon.hyetaekon.user.service.UserPointService;
 import jakarta.persistence.EntityNotFoundException;
 import jakarta.transaction.Transactional;
@@ -28,29 +30,31 @@ public class AnswerService {
     private final AnswerRepository answerRepository;
     private final AnswerMapper answerMapper;
     private final PostRepository postRepository;
+    private final UserRepository userRepository;
     private final UserPointService userPointService;
 
     // 게시글에 답변 목록 조회
     public Page<AnswerDto> getAnswersByPostId(Long postId, Pageable pageable) {
         // 게시글 존재 여부 확인
-        postRepository.findByIdAndDeletedAtIsNull(postId)
+        Post post = postRepository.findByIdAndDeletedAtIsNull(postId)
             .orElseThrow(() -> new GlobalException(ErrorCode.POST_NOT_FOUND_BY_ID));
 
         // 채택된 답변이 먼저 나오고, 그 다음 최신순으로 정렬
-        Page<Answer> answersPage = answerRepository.findByPostIdOrderBySelectedDescCreatedAtDesc(postId, pageable);
+        Page<Answer> answersPage = answerRepository.findByPostOrderBySelectedDescCreatedAtDesc(post, pageable);
 
         return answersPage.map(answerMapper::toDto);
     }
 
     public AnswerDto createAnswer(Long postId, AnswerDto answerDto, Long userId) {
-        // 게시글 존재 여부 확인
-        postRepository.findByIdAndDeletedAtIsNull(postId)
+        // 게시글과 사용자 객체 조회
+        Post post = postRepository.findByIdAndDeletedAtIsNull(postId)
             .orElseThrow(() -> new GlobalException(ErrorCode.POST_NOT_FOUND_BY_ID));
+        User user = userRepository.findById(userId)
+            .orElseThrow(() -> new GlobalException(ErrorCode.USER_NOT_FOUND_BY_ID));
 
         Answer answer = answerMapper.toEntity(answerDto);
-        answer.setPostId(postId);
-        answer.setUserId(userId);
-        answer.setCreatedAt(LocalDateTime.now());
+        answer.setPost(post);
+        answer.setUser(user);
         answer = answerRepository.save(answer);
 
         userPointService.addPointForAction(userId, PointActionType.ANSWER_CREATION);
@@ -73,7 +77,7 @@ public void selectAnswer(Long postId, Long answerId, Long userId) {
             .orElseThrow(() -> new GlobalException(ErrorCode.ANSWER_NOT_FOUND));
 
         // 답변이 해당 게시글에 속하는지 확인
-        if (!answer.getPostId().equals(postId)) {
+        if (!answer.getPost().getId().equals(postId)) {  // post 객체 사용
             throw new GlobalException(ErrorCode.ANSWER_NOT_MATCHED_POST);
         }
 
@@ -82,23 +86,28 @@ public void selectAnswer(Long postId, Long answerId, Long userId) {
         answerRepository.save(answer);
 
         // 답변 작성자에게 포인트 부여
-        userPointService.addPointForAction(answer.getUserId(), PointActionType.ANSWER_ACCEPTED);
+        userPointService.addPointForAction(answer.getUser().getId(), PointActionType.ANSWER_ACCEPTED);  // user 객체 사용
     }
 
     @Transactional
-    public void deleteAnswer(Long postId, Long answerId, Long userId, boolean isAdmin) {
+    public void deleteAnswer(Long postId, Long answerId, Long userId, String role) {
         Answer answer = answerRepository.findById(answerId)
-                .orElseThrow(() -> new GlobalException(ErrorCode.ANSWER_NOT_FOUND));
+            .orElseThrow(() -> new GlobalException(ErrorCode.ANSWER_NOT_FOUND));
 
-        if (!answer.getPostId().equals(postId)) {
+        if (!answer.getPost().getId().equals(postId)) {  // post 객체 사용
             throw new GlobalException(ErrorCode.ANSWER_NOT_MATCHED_POST);
         }
 
-        if (!answer.getUserId().equals(userId) && !isAdmin) {
-            throw new AccessDeniedException("답변 삭제 권한이 없습니다.");
+        // 작성자 또는 관리자 확인
+        boolean isOwner = answer.getUser().getId().equals(userId);  // user 객체 사용
+        boolean isAdmin = "ROLE_ADMIN".equals(role);
+
+        if (!isOwner && !isAdmin) {
+            throw new AccessDeniedException("답변 삭제 권한이 없습니다");
         }
 
-        answerRepository.delete(answer);
+        answer.delete();  // soft delete 사용
+        answerRepository.save(answer);
     }
 
 }

src/main/java/com/hyetaekon/hyetaekon/comment/controller/CommentController.java

@@ -1,6 +1,8 @@
 package com.hyetaekon.hyetaekon.comment.controller;
 
+import com.hyetaekon.hyetaekon.comment.dto.CommentCreateRequestDto;
 import com.hyetaekon.hyetaekon.comment.dto.CommentDto;
+import com.hyetaekon.hyetaekon.comment.dto.CommentListResponseDto;
 import com.hyetaekon.hyetaekon.comment.service.CommentService;
 import com.hyetaekon.hyetaekon.common.jwt.CustomUserDetails;
 import lombok.RequiredArgsConstructor;
@@ -20,54 +22,58 @@ public class CommentController {
 
     // 게시글 댓글 목록 조회 (페이징 지원)
     @GetMapping
-    @PreAuthorize("hasRole('USER')")
-    public ResponseEntity<Page<CommentDto>> getComments(@PathVariable Long postId,
-                                                        @RequestParam(defaultValue = "0") int page,
-                                                        @RequestParam(defaultValue = "10") int size) {
-        Page<CommentDto> comments = commentService.getComments(postId, page, size);
+    public ResponseEntity<Page<CommentListResponseDto>> getComments(
+        @PathVariable("postId") Long postId,
+        @RequestParam(defaultValue = "0") int page,
+        @RequestParam(defaultValue = "10") int size) {
+        Page<CommentListResponseDto> comments = commentService.getComments(postId, page, size);
         return ResponseEntity.ok(comments);
     }
 
     // 게시글에 댓글 작성
     @PostMapping
-    @PreAuthorize("hasRole('USER')")
-    public ResponseEntity<CommentDto> createComment(@PathVariable Long postId, @RequestBody CommentDto commentDto) {
-        CommentDto createdComment = commentService.createComment(postId, commentDto);
+    public ResponseEntity<CommentListResponseDto> createComment(
+        @PathVariable("postId") Long postId,
+        @RequestBody CommentCreateRequestDto commentDto,
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
+
+        CommentListResponseDto createdComment = commentService.createComment(postId, userDetails.getId(), commentDto);
         return ResponseEntity.status(HttpStatus.CREATED).body(createdComment);
     }
 
     // 대댓글 목록 조회
     @GetMapping("/{commentId}/replies")
-    @PreAuthorize("hasRole('USER')")
-    public ResponseEntity<Page<CommentDto>> getReplies(@PathVariable Long postId,
-                                                       @PathVariable Long commentId,
-                                                       @RequestParam(defaultValue = "0") int page,
-                                                       @RequestParam(defaultValue = "5") int size) {
-        Page<CommentDto> replies = commentService.getReplies(postId, commentId, page, size);
+    public ResponseEntity<Page<CommentListResponseDto>> getReplies(
+        @PathVariable("postId") Long postId,
+        @PathVariable("commentId") Long commentId,
+        @RequestParam(defaultValue = "0") int page,
+        @RequestParam(defaultValue = "5") int size) {
+        Page<CommentListResponseDto> replies = commentService.getReplies(postId, commentId, page, size);
         return ResponseEntity.ok(replies);
     }
 
-    // 대댓글 작성
+    //대댓글 작성
     @PostMapping("/{commentId}/replies")
-    @PreAuthorize("hasRole('USER')")
-    public ResponseEntity<CommentDto> createReply(@PathVariable Long postId,
-                                                  @PathVariable Long commentId,
-                                                  @RequestBody CommentDto commentDto) {
-        CommentDto createdReply = commentService.createReply(postId, commentId, commentDto);
+    public ResponseEntity<CommentListResponseDto> createReply(
+        @PathVariable("postId") Long postId,
+        @PathVariable("commentId") Long commentId,
+        @RequestBody CommentCreateRequestDto commentDto,
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
+
+        // 대댓글의 부모 댓글 ID 설정
+        commentDto.setParentId(commentId);
+
+        CommentListResponseDto createdReply = commentService.createComment(postId, userDetails.getId(), commentDto);
         return ResponseEntity.status(HttpStatus.CREATED).body(createdReply);
     }
 
-    // 댓글 삭제 (관리자만 가능)
-    @DeleteMapping("/admin/comments/{commentId}")
-    @PreAuthorize("hasAnyRole('USER', 'ADMIN')")
+    // 댓글 삭제 (관리자나 댓글 작성자만 가능)
+    @DeleteMapping("/{commentId}")
     public ResponseEntity<Void> deleteComment(
-            @PathVariable Long commentId,
-            @AuthenticationPrincipal CustomUserDetails userDetails, @PathVariable String postId) {
-
-        Long currentUserId = userDetails.getId();
-        boolean isAdmin = "ROLE_ADMIN".equals(userDetails.getRole());
+        @PathVariable("commentId") Long commentId,
+        @AuthenticationPrincipal CustomUserDetails userDetails) {
 
-        commentService.deleteComment(commentId, currentUserId, isAdmin);
+        commentService.deleteComment(commentId, userDetails.getId(), userDetails.getRole());
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/com/hyetaekon/hyetaekon/comment/dto/CommentCreateRequestDto.java

@@ -0,0 +1,15 @@
+package com.hyetaekon.hyetaekon.comment.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CommentCreateRequestDto {
+    private Long parentId;
+    private String content;
+}

src/main/java/com/hyetaekon/hyetaekon/comment/dto/CommentListResponseDto.java

@@ -0,0 +1,19 @@
+package com.hyetaekon.hyetaekon.comment.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CommentListResponseDto {
+    private Long id;
+    private Long postId;
+    private Long parentId;  // 대댓글일 경우 부모 댓글 ID
+    private String content;
+    private String nickname;
+    private LocalDateTime createdAt;
+}