Merge pull request #674 from bounswe/main

Deploying the comment feature

app/backend/src/main/java/com/app/gamereview/controller/CommentController.java

@@ -0,0 +1,61 @@
+package com.app.gamereview.controller;
+
+import com.app.gamereview.dto.request.comment.CreateCommentRequestDto;
+import com.app.gamereview.dto.request.comment.EditCommentRequestDto;
+import com.app.gamereview.dto.request.comment.ReplyCommentRequestDto;
+import com.app.gamereview.model.Comment;
+import com.app.gamereview.model.User;
+import com.app.gamereview.service.CommentService;
+import com.app.gamereview.util.validation.annotation.AuthorizationRequired;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/comment")
+@Validated
+public class CommentController {
+
+    private final CommentService commentService;
+
+    @Autowired
+    public CommentController(CommentService commentService) {
+        this.commentService = commentService;
+    }
+
+
+    @AuthorizationRequired
+    @PostMapping("/create")
+    public ResponseEntity<Comment> createComment(@Valid @RequestBody CreateCommentRequestDto comment, @RequestHeader String Authorization, HttpServletRequest request) {
+        User user = (User) request.getAttribute("authenticatedUser");
+        Comment commentToCreate = commentService.createComment(comment, user);
+        return ResponseEntity.ok(commentToCreate);
+    }
+
+    @AuthorizationRequired
+    @PostMapping("/reply")
+    public ResponseEntity<Comment> createReply(@Valid @RequestBody ReplyCommentRequestDto reply, @RequestHeader String Authorization, HttpServletRequest request) {
+        User user = (User) request.getAttribute("authenticatedUser");
+        Comment commentToCreate = commentService.replyComment(reply, user);
+        return ResponseEntity.ok(commentToCreate);
+    }
+
+    @AuthorizationRequired
+    @PostMapping("/edit")
+    public ResponseEntity<Comment> editComment(@RequestParam String id, @Valid @RequestBody EditCommentRequestDto comment, @RequestHeader String Authorization, HttpServletRequest request) {
+        User user = (User) request.getAttribute("authenticatedUser");
+        Comment editedComment = commentService.editComment(id, comment, user);
+        return ResponseEntity.ok(editedComment);
+    }
+
+    @AuthorizationRequired
+    @DeleteMapping("/delete")
+    public ResponseEntity<Comment> deleteComment(@RequestParam String id, @RequestHeader String Authorization, HttpServletRequest request) {
+        User user = (User) request.getAttribute("authenticatedUser");
+        Comment deletedComment = commentService.deleteComment(id, user);
+        return ResponseEntity.ok(deletedComment);
+    }
+}

app/backend/src/main/java/com/app/gamereview/controller/PostController.java

@@ -3,6 +3,7 @@
 import java.util.List;
 
 import com.app.gamereview.dto.request.post.EditPostRequestDto;
+import com.app.gamereview.dto.response.comment.GetPostCommentsResponseDto;
 import com.app.gamereview.model.User;
 import com.app.gamereview.util.validation.annotation.AuthorizationRequired;
 import jakarta.servlet.http.HttpServletRequest;
@@ -25,48 +26,56 @@
 @Validated
 public class PostController {
 
-  private final PostService postService;
+    private final PostService postService;
 
-  @Autowired
-  public PostController(PostService postService) {
-    this.postService = postService;
-  }
+    @Autowired
+    public PostController(PostService postService) {
+        this.postService = postService;
+    }
 
-  @GetMapping("/get-post-list")
-  public ResponseEntity<List<GetPostListResponseDto>> getPostList(@Valid @ParameterObject GetPostListFilterRequestDto filter) {
-    List<GetPostListResponseDto> posts = postService.getPostList(filter);
-    return ResponseEntity.ok(posts);
-  }
+    @GetMapping("/get-post-list")
+    public ResponseEntity<List<GetPostListResponseDto>> getPostList(@Valid @ParameterObject GetPostListFilterRequestDto filter) {
+        List<GetPostListResponseDto> posts = postService.getPostList(filter);
+        return ResponseEntity.ok(posts);
+    }
 
-  @AuthorizationRequired
-  @GetMapping("/get-post-detail")
-  public ResponseEntity<Post> getPostDetail(@RequestParam String id, @RequestHeader String Authorization, HttpServletRequest request) {
-    User user = (User) request.getAttribute("authenticatedUser");
-    Post post = postService.getPostById(id, user);
-    return ResponseEntity.ok(post);
-  }
+    @AuthorizationRequired
+    @GetMapping("/get-post-detail")
+    public ResponseEntity<Post> getPostDetail(@RequestParam String id, @RequestHeader String Authorization, HttpServletRequest request) {
+        User user = (User) request.getAttribute("authenticatedUser");
+        Post post = postService.getPostById(id, user);
+        return ResponseEntity.ok(post);
+    }
 
-  @AuthorizationRequired
-  @PostMapping("/create")
-  public ResponseEntity<Post> createPost(@Valid @RequestBody CreatePostRequestDto post, @RequestHeader String Authorization, HttpServletRequest request) {
-    User user = (User) request.getAttribute("authenticatedUser");
-    Post postToCreate = postService.createPost(post, user);
-    return ResponseEntity.ok(postToCreate);
-  }
+    @AuthorizationRequired
+    @GetMapping("/get-post-comments")
+    public ResponseEntity<List<GetPostCommentsResponseDto>> getPostComments(@RequestParam String id, @RequestHeader String Authorization, HttpServletRequest request) {
+        User user = (User) request.getAttribute("authenticatedUser");
+        List<GetPostCommentsResponseDto> comments = postService.getCommentList(id, user);
+        return ResponseEntity.ok(comments);
+    }
 
-  @AuthorizationRequired
-  @PostMapping("/edit")
-  public ResponseEntity<Post> editPost(@RequestParam String id, @Valid @RequestBody EditPostRequestDto post, @RequestHeader String Authorization, HttpServletRequest request) {
-    User user = (User) request.getAttribute("authenticatedUser");
-    Post editedPost = postService.editPost(id, post, user);
-    return ResponseEntity.ok(editedPost);
-  }
+    @AuthorizationRequired
+    @PostMapping("/create")
+    public ResponseEntity<Post> createPost(@Valid @RequestBody CreatePostRequestDto post, @RequestHeader String Authorization, HttpServletRequest request) {
+        User user = (User) request.getAttribute("authenticatedUser");
+        Post postToCreate = postService.createPost(post, user);
+        return ResponseEntity.ok(postToCreate);
+    }
 
-  @AuthorizationRequired
-  @DeleteMapping("/delete")
-  public ResponseEntity<Post> deletePost(@RequestParam String id, @RequestHeader String Authorization, HttpServletRequest request) {
-    User user = (User) request.getAttribute("authenticatedUser");
-    Post deletedPost = postService.deletePost(id, user);
-    return ResponseEntity.ok(deletedPost);
-  }
+    @AuthorizationRequired
+    @PostMapping("/edit")
+    public ResponseEntity<Post> editPost(@RequestParam String id, @Valid @RequestBody EditPostRequestDto post, @RequestHeader String Authorization, HttpServletRequest request) {
+        User user = (User) request.getAttribute("authenticatedUser");
+        Post editedPost = postService.editPost(id, post, user);
+        return ResponseEntity.ok(editedPost);
+    }
+
+    @AuthorizationRequired
+    @DeleteMapping("/delete")
+    public ResponseEntity<Post> deletePost(@RequestParam String id, @RequestHeader String Authorization, HttpServletRequest request) {
+        User user = (User) request.getAttribute("authenticatedUser");
+        Post deletedPost = postService.deletePost(id, user);
+        return ResponseEntity.ok(deletedPost);
+    }
 }

app/backend/src/main/java/com/app/gamereview/dto/request/comment/CreateCommentRequestDto.java

@@ -0,0 +1,25 @@
+package com.app.gamereview.dto.request.comment;
+
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CreateCommentRequestDto {
+
+    private String commentContent;
+
+    @NotNull(message = "Post Id cannot be null or empty.")
+    @Pattern(regexp = "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+            message = "Post has invalid Id (UUID) format")
+    private String post;
+
+
+    // TODO annotations
+    // TODO achievements
+}

app/backend/src/main/java/com/app/gamereview/dto/request/comment/EditCommentRequestDto.java

@@ -0,0 +1,14 @@
+package com.app.gamereview.dto.request.comment;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EditCommentRequestDto {
+
+  private String commentContent;
+
+}

app/backend/src/main/java/com/app/gamereview/dto/request/comment/ReplyCommentRequestDto.java

@@ -0,0 +1,25 @@
+package com.app.gamereview.dto.request.comment;
+
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReplyCommentRequestDto {
+
+    private String commentContent;
+
+
+    @NotNull(message = "Parent Comment Id cannot be null or empty.")
+    @Pattern(regexp = "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
+            message = "Comment has invalid Id (UUID) format")
+    private String parentComment;
+
+    // TODO annotations
+    // TODO achievements
+}

app/backend/src/main/java/com/app/gamereview/dto/response/comment/CommentReplyResponseDto.java

@@ -0,0 +1,35 @@
+package com.app.gamereview.dto.response.comment;
+
+import com.app.gamereview.model.User;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CommentReplyResponseDto {
+
+    private String id;
+
+    private String commentContent;
+
+    private User commenter;
+
+    private String post;
+
+    private LocalDateTime lastEditedAt;
+
+    private LocalDateTime createdAt;
+
+    private Boolean isEdited;
+
+    private int overallVote; // overallVote = # of upvote - # of downvote
+
+    private int voteCount;  // voteCount = # of upvote + # of downvote
+
+    // TODO reports
+    // TODO annotations
+}

app/backend/src/main/java/com/app/gamereview/dto/response/comment/GetPostCommentsResponseDto.java

@@ -0,0 +1,38 @@
+package com.app.gamereview.dto.response.comment;
+
+import com.app.gamereview.model.User;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetPostCommentsResponseDto {
+
+    private String id;
+
+    private String commentContent;
+
+    private User commenter;
+
+    private String post;
+
+    private LocalDateTime lastEditedAt;
+
+    private LocalDateTime createdAt;
+
+    private Boolean isEdited;
+
+    private int overallVote; // overallVote = # of upvote - # of downvote
+
+    private int voteCount;  // voteCount = # of upvote + # of downvote
+
+    private ArrayList<CommentReplyResponseDto> replies;
+
+    // TODO reports
+    // TODO annotations
+}

app/backend/src/main/java/com/app/gamereview/dto/response/post/GetPostListResponseDto.java

@@ -37,6 +37,8 @@ public class GetPostListResponseDto {
 
   private int voteCount;  // voteCount = # of upvote + # of downvote
 
+  private int commentCount;
+
   // TODO reports
   // TODO comments
   // TODO annotations

app/backend/src/main/java/com/app/gamereview/model/Comment.java

@@ -0,0 +1,58 @@
+package com.app.gamereview.model;
+
+import com.app.gamereview.enums.VoteChoice;
+import com.app.gamereview.model.common.BaseModel;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.time.LocalDateTime;
+
+@Document(collection = "Comment")
+@Getter
+@Setter
+@AllArgsConstructor
+@NoArgsConstructor
+public class Comment extends BaseModel {
+
+    private String commentContent;
+
+    private String commenter;
+
+    @NotNull
+    private String post;
+
+    private String parentComment;
+
+    private LocalDateTime lastEditedAt;
+
+    private int overallVote; // overallVote = # of upvote - # of downvote
+
+    private int voteCount;  // voteCount = # of upvote + # of downvote
+
+    // TODO reports
+    // TODO annotations
+
+    public void addVote(VoteChoice choice) {
+        voteCount += 1;
+        if (choice.name().equals("UPVOTE")) {
+            overallVote += 1;
+        } else if (choice.name().equals("DOWNVOTE")) {
+            overallVote -= 1;
+        }
+    }
+
+    public void deleteVote(VoteChoice choice) {
+        voteCount -= 1;
+        if (choice.name().equals("UPVOTE")) {
+            overallVote -= 1;
+        } else if (choice.name().equals("DOWNVOTE")) {
+            overallVote += 1;
+        }
+    }
+
+
+}

app/backend/src/main/java/com/app/gamereview/model/Post.java

@@ -47,7 +47,6 @@ public class Post extends BaseModel {
   private int voteCount;  // voteCount = # of upvote + # of downvote
 
   // TODO reports
-  // TODO comments
   // TODO annotations
   // TODO achievements
 

app/backend/src/main/java/com/app/gamereview/repository/CommentRepository.java

@@ -0,0 +1,12 @@
+package com.app.gamereview.repository;
+
+import com.app.gamereview.model.Comment;
+import org.springframework.data.mongodb.repository.MongoRepository;
+
+import java.util.List;
+
+public interface CommentRepository extends MongoRepository<Comment, String> {
+    List<Comment> findByPost(String postId);
+
+    int countByPost(String postId);
+}