[#39] 게시판 테스트

src/main/java/com/esquad/esquadbe/qnaboard/controller/CommentController.java

@@ -1,64 +1,60 @@
 package com.esquad.esquadbe.qnaboard.controller;
 
-import com.esquad.esquadbe.qnaboard.dto.CommentDTO;
+import com.esquad.esquadbe.qnaboard.dto.CommentRequestDTO;
+import com.esquad.esquadbe.qnaboard.dto.CommentResponseDTO;
 import com.esquad.esquadbe.qnaboard.service.CommentService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.security.Principal;
 import java.util.List;
 
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/api/comments")
+@RequestMapping("/api/questions/{boardId}/comments")
 public class CommentController {
 
     private final CommentService commentService;
 
-    // 댓글 생성
     @PostMapping
-    public ResponseEntity<CommentDTO> createComment(
-            @RequestParam("boardId") Long boardId,
-            @RequestParam("writerId") Long writerId,
-            @RequestParam("content") String content,
-            @RequestParam("replyFlag") boolean replyFlag) {
-        CommentDTO createdComment = commentService.createComment(boardId, writerId, content, replyFlag);
-        return ResponseEntity.ok(createdComment);
-    }
+    public ResponseEntity<String> createComment(@PathVariable Long boardId,
+                                                @RequestBody CommentRequestDTO requestDTO,
+                                                Principal principal) {
 
-    // 댓글 수정
-    @PutMapping("/{commentId}")
-    public ResponseEntity<CommentDTO> updateComment(
-            @PathVariable Long commentId,
-            @RequestParam("writerId") Long writerId,
-            @RequestParam("content") String content) {
-        CommentDTO updatedComment = commentService.updateComment(commentId, writerId, content);
-        return ResponseEntity.ok(updatedComment);
-    }
+        CommentResponseDTO createdComment = commentService.createComment(boardId, requestDTO, principal.getName());
 
-    // 댓글 삭제
-    @DeleteMapping("/{commentId}")
-    public ResponseEntity<Void> deleteComment(
-            @PathVariable Long commentId,
-            @RequestParam("writerId") Long writerId) {
-        commentService.deleteComment(commentId, writerId);
-        return ResponseEntity.noContent().build();
+        String responseMessage = String.format("게시글 %d에 댓글 %d이(가) 생성되었습니다.", boardId, createdComment.getId());
+        return ResponseEntity.ok(responseMessage);
     }
 
-    // 댓글 조회
     @GetMapping
-    public ResponseEntity<List<CommentDTO>> getCommentsByBoardId(@RequestParam("boardId") Long boardId) {
-        List<CommentDTO> comments = commentService.getCommentsByBoardId(boardId);
+    public ResponseEntity<List<CommentResponseDTO>> getCommentsByBoard(@PathVariable Long boardId) {
+        List<CommentResponseDTO> comments = commentService.getCommentsByBoardId(boardId);
         return ResponseEntity.ok(comments);
     }
 
 
-    // 댓글 좋아요 추가/취소
-    @PostMapping("/like/{commentId}")
-    public ResponseEntity<String> likeComment(
-            @PathVariable Long commentId,
-            @RequestParam("userId") Long userId) {
-        String result = commentService.likeComment(commentId, userId);
-        return ResponseEntity.ok(result);
+    @PutMapping("/{commentId}")
+    public ResponseEntity<String> updateComment(@PathVariable Long boardId,
+                                                @PathVariable Long commentId,
+                                                @RequestBody CommentRequestDTO requestDTO,
+                                                Principal principal) {
+
+        CommentResponseDTO updatedComment = commentService.updateComment(commentId, requestDTO, principal.getName());
+
+        String responseMessage = String.format("게시글 %d의 댓글 %d이(가) 수정되었습니다.", boardId, updatedComment.getId());
+        return ResponseEntity.ok(responseMessage);
+    }
+
+
+    @DeleteMapping("/{commentId}")
+    public ResponseEntity<String> deleteComment(@PathVariable Long boardId,
+                                                @PathVariable Long commentId,
+                                                Principal principal) {
+        commentService.deleteComment(commentId, principal.getName());
+
+        String responseMessage = String.format("게시글 %d의 댓글 %d이(가) 삭제되었습니다.", boardId, commentId);
+        return ResponseEntity.ok(responseMessage);
     }
 }

src/main/java/com/esquad/esquadbe/qnaboard/controller/QnaBoardController.java

@@ -3,14 +3,15 @@
 import com.esquad.esquadbe.qnaboard.dto.QnaBoardResponseDTO;
 import com.esquad.esquadbe.qnaboard.dto.QnaRequestDTO;
 import com.esquad.esquadbe.qnaboard.service.QuestionService;
-import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.security.Principal;
+
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/api/questions")
@@ -19,69 +20,57 @@ public class QnaBoardController {
 
     private final QuestionService questionService;
 
-    // 전체 게시글 조회
+
     @GetMapping
     public Page<QnaBoardResponseDTO> getAllQuestions(
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size) {
         return questionService.getAllQuestions(page, size);
     }
 
-    // 특정 ID의 게시글 조회 (게시글번호)
+
     @GetMapping("/{id}")
     public QnaBoardResponseDTO getQuestionById(@PathVariable Long id) {
         return questionService.getQuestionById(id);
     }
 
-    // 새로운 질문 생성
+
     @PostMapping
     public QnaBoardResponseDTO createQuestion(
-            @RequestBody QnaRequestDTO qnaForm,
+            @ModelAttribute QnaRequestDTO qnaForm,
             @RequestParam(required = false) MultipartFile file) {
         return questionService.createQuestion(qnaForm, file);
     }
 
 
-    // 특정 제목의 게시글 조회
     @GetMapping("/search")
     public Page<QnaBoardResponseDTO> getQuestionsByTitle(
             @RequestParam("title") String title,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size) {
-        log.info("Searching for questions with title: " + title);
         return questionService.getQuestionsByTitle(title, page, size);
     }
 
-    // 특정 작성자의 게시글 조회
+
     @GetMapping("/by-writer")
     public Page<QnaBoardResponseDTO> getQuestionsByWriter(
-            @RequestParam("userId") Long userId,
+            Principal principal,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size) {
-        log.info("Searching for questions by writer: " + userId);
-        return questionService.getQuestionsByWriter(userId, page, size);
+        return questionService.getQuestionsByWriter(principal.getName(), page, size);
     }
 
-    // 게시글 수정
+
     @PutMapping("/{id}")
     public QnaBoardResponseDTO updateQuestion(@PathVariable Long id, @RequestBody QnaRequestDTO updateForm) {
         return questionService.updateQuestion(id, updateForm);
     }
 
 
-    // 게시글 삭제
     @DeleteMapping("/{id}")
-    public ResponseEntity<String> deleteQuestion(@PathVariable Long id) {
-        questionService.deleteQuestion(id);
+    public ResponseEntity<String> deleteQuestion(@PathVariable Long id, Principal principal) {
+        questionService.deleteQuestion(id, principal.getName());
         return ResponseEntity.ok("게시글이 삭제되었습니다");
     }
 
-    // 좋아요 추가/취소
-    @PostMapping("/like/{boardId}")
-    public ResponseEntity<String> boardLike(@PathVariable Long boardId, @RequestParam Long userId) {
-        String result = questionService.boardLike(boardId, userId);
-        return ResponseEntity.ok(result);
-    }
-
 }
-

src/main/java/com/esquad/esquadbe/qnaboard/dto/CommentRequestDTO.java

@@ -0,0 +1,27 @@
+package com.esquad.esquadbe.qnaboard.dto;
+
+import com.esquad.esquadbe.qnaboard.entity.BookQnaBoard;
+import com.esquad.esquadbe.qnaboard.entity.BookQnaReply;
+import com.esquad.esquadbe.user.entity.User;
+import lombok.Builder;
+
+@Builder
+public record CommentRequestDTO(
+        Long id,
+        String content,
+        boolean replyFlag
+) {
+
+    public BookQnaReply toEntity(User writer, BookQnaBoard board) {
+        return BookQnaReply.builder()
+                .content(content)
+                .writer(writer)
+                .board(board)
+                .replyFlag(replyFlag)
+                .likes(0)
+                .depth(0)
+                .orderNo(0)
+                .deletedFlag(false)
+                .build();
+    }
+}

src/main/java/com/esquad/esquadbe/qnaboard/dto/CommentDTO.java → src/main/java/com/esquad/esquadbe/qnaboard/dto/CommentResponseDTO.java

@@ -1,42 +1,37 @@
 package com.esquad.esquadbe.qnaboard.dto;
 
-
 import com.esquad.esquadbe.qnaboard.entity.BookQnaReply;
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
-
-import java.time.format.DateTimeFormatter;
 
+import java.time.LocalDateTime;
 
-@Getter
-@Setter
 @Builder
-public class CommentDTO {
+@Getter
+public class CommentResponseDTO {
     private Long id;
     private Long boardId;
     private Long writerId;
     private String writerName;
     private String content;
     private Integer likes;
-    private String createdAt;
-    private String modifiedAt;
-    private boolean replyFlag;  // 대댓글 여부
+    private LocalDateTime createdAt;
+    private LocalDateTime modifiedAt;
+    private boolean replyFlag;
+    private boolean deletedFlag;
 
-    // 엔티티에서 DTO로 변환하는 메서드
-    public static CommentDTO from(BookQnaReply reply) {
-        return CommentDTO.builder()
+    public static CommentResponseDTO from(BookQnaReply reply) {
+        return CommentResponseDTO.builder()
                 .id(reply.getId())
                 .boardId(reply.getBoard().getId())
                 .writerId(reply.getWriter().getId())
                 .writerName(reply.getWriter().getNickname())
                 .content(reply.getContent())
                 .likes(reply.getLikes())
-                .createdAt(reply.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
-                .modifiedAt(reply.getModifiedAt() != null
-                        ? reply.getModifiedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
-                        : null)
+                .createdAt(reply.getCreatedAt())
+                .modifiedAt(reply.getModifiedAt())
                 .replyFlag(reply.isReplyFlag())
+                .deletedFlag(reply.isDeletedFlag())
                 .build();
     }
 }

src/main/java/com/esquad/esquadbe/qnaboard/dto/PagingInfoDTO.java

@@ -2,10 +2,8 @@
 
 import lombok.Builder;
 import lombok.Getter;
-import lombok.Setter;
 
 @Getter
-@Setter
 @Builder
 public class PagingInfoDTO {
     private int totalPosts;      // 모든 글 개수

src/main/java/com/esquad/esquadbe/qnaboard/dto/QnaBoardResponseDTO.java

@@ -4,11 +4,9 @@
 import lombok.Builder;
 import lombok.Getter;
 
-import java.time.format.DateTimeFormatter;
-
 @Builder
 @Getter
-public class QnaBoardResponseDTO  {
+public class QnaBoardResponseDTO {
     private Long id;
     private String title;
     private Long userId;
@@ -18,8 +16,6 @@ public class QnaBoardResponseDTO  {
     private Long teamSpaceId;
     private String teamSpaceName;
     private String content;
-    private String createdAt;
-    private String modifiedAt;
     private Integer likes;
 
     // 정적 팩토리 메서드
@@ -34,14 +30,8 @@ public static QnaBoardResponseDTO from(BookQnaBoard bookQnaBoard) {
                 .teamSpaceId(bookQnaBoard.getTeamSpace().getId())
                 .teamSpaceName(bookQnaBoard.getTeamSpace().getTeamName())
                 .content(bookQnaBoard.getContent())
-                .createdAt(bookQnaBoard.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
-                .modifiedAt(bookQnaBoard.getModifiedAt() != null
-                        ? bookQnaBoard.getModifiedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
-                        : null)
                 .likes(bookQnaBoard.getLikes())
                 .build();
     }
 
-
-
 }

src/main/java/com/esquad/esquadbe/qnaboard/dto/QnaRequestDTO.java

@@ -12,7 +12,7 @@ public record QnaRequestDTO(
         Long id,
         String title,
         String content,
-        Long userId,
+        String username,
         Long bookId,
         Long teamSpaceId
 ) {

src/main/java/com/esquad/esquadbe/qnaboard/entity/BookQnaReply.java

@@ -49,7 +49,4 @@ public class BookQnaReply extends BasicEntity {
 
     @Column(name = "DELETED_FLAG", columnDefinition = "TINYINT(1) DEFAULT 0")
     private boolean deletedFlag;
-
-//    @OneToMany(mappedBy = "parentReply", orphanRemoval = true)
-//    private List<BookQnaReply> childReplies;
 }