Merge pull request #680 from bounswe/main

Deploying get-post-endpoint change
bounswe · Nov 14, 2023 · df03ad3 · df03ad3
2 parents d5f8989 + fd76b7e
commit df03ad3
Show file tree

Hide file tree

Showing 44 changed files with 2,632 additions and 1,945 deletions.
diff --git a/...ackend/src/main/java/com/app/gamereview/dto/response/comment/CommentReplyResponseDto.java b/...ackend/src/main/java/com/app/gamereview/dto/response/comment/CommentReplyResponseDto.java
@@ -26,6 +26,8 @@ public class CommentReplyResponseDto {
 
     private Boolean isEdited;
 
+    private Boolean isDeleted;
+
     private int overallVote; // overallVote = # of upvote - # of downvote
 
     private int voteCount;  // voteCount = # of upvote + # of downvote

diff --git a/...end/src/main/java/com/app/gamereview/dto/response/comment/GetPostCommentsResponseDto.java b/...end/src/main/java/com/app/gamereview/dto/response/comment/GetPostCommentsResponseDto.java
@@ -27,6 +27,8 @@ public class GetPostCommentsResponseDto {
 
     private Boolean isEdited;
 
+    private Boolean isDeleted;
+
     private int overallVote; // overallVote = # of upvote - # of downvote
 
     private int voteCount;  // voteCount = # of upvote + # of downvote

diff --git a/app/backend/src/main/java/com/app/gamereview/service/PostService.java b/app/backend/src/main/java/com/app/gamereview/service/PostService.java
@@ -171,7 +171,7 @@ private GetPostCommentsResponseDto convertToCommentDto(Comment comment) {
 
         User commenterObject = commenter.orElse(null);
         return new GetPostCommentsResponseDto(comment.getId(), comment.getCommentContent(), commenterObject,
-                comment.getPost(), comment.getLastEditedAt(), comment.getCreatedAt(), isEdited, comment.getOverallVote(),
+                comment.getPost(), comment.getLastEditedAt(), comment.getCreatedAt(), isEdited, comment.getIsDeleted(), comment.getOverallVote(),
                 comment.getVoteCount(), new ArrayList<>());
     }
 
@@ -182,7 +182,7 @@ private CommentReplyResponseDto convertToReplyDto(Comment comment) {
 
         User commenterObject = commenter.orElse(null);
         return new CommentReplyResponseDto(comment.getId(), comment.getCommentContent(), commenterObject,
-                comment.getPost(), comment.getLastEditedAt(), comment.getCreatedAt(), isEdited, comment.getOverallVote(),
+                comment.getPost(), comment.getLastEditedAt(), comment.getCreatedAt(), isEdited, comment.getIsDeleted(), comment.getOverallVote(),
                 comment.getVoteCount());
     }
 

diff --git a/app/frontend/package.json b/app/frontend/package.json
@@ -13,11 +13,13 @@
     "@ant-design/icons": "^5.2.6",
     "@types/js-cookie": "^3.0.5",
     "antd": "^5.10.2",
-    "clsx": "^2.0.0",
     "axios": "^1.6.0",
+    "clsx": "^2.0.0",
     "js-cookie": "^3.0.5",
     "modern-normalize": "^2.0.0",
     "react": "^18.2.0",
+    "react-color": "^2.19.3",
+    "react-datepicker": "^4.21.0",
     "react-dom": "^18.2.0",
     "react-query": "^3.39.3",
     "react-router-dom": "^6.17.0",
@@ -26,6 +28,8 @@
   },
   "devDependencies": {
     "@types/react": "^18.2.15",
+    "@types/react-color": "^3.0.10",
+    "@types/react-datepicker": "^4.19.3",
     "@types/react-dom": "^18.2.7",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",