From c454acd4a9688daab21bff7cebe05d07072a973c Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Fri, 26 Apr 2019 00:13:59 +0800
Subject: [PATCH] Perfect sheet and journal comment controller

---
 .../admin/api/JournalCommentController.java     | 16 ++++++++++++++++
 .../admin/api/PostCommentController.java        |  2 --
 .../admin/api/SheetCommentController.java       | 17 +++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/run/halo/app/controller/admin/api/JournalCommentController.java b/src/main/java/run/halo/app/controller/admin/api/JournalCommentController.java
index 2bd22d11d..8224279d7 100644
--- a/src/main/java/run/halo/app/controller/admin/api/JournalCommentController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/JournalCommentController.java
@@ -7,6 +7,7 @@ import org.springframework.data.web.PageableDefault;
 import org.springframework.web.bind.annotation.*;
 import run.halo.app.model.dto.BaseCommentDTO;
 import run.halo.app.model.entity.JournalComment;
+import run.halo.app.model.enums.CommentStatus;
 import run.halo.app.model.params.CommentQuery;
 import run.halo.app.model.params.JournalCommentParam;
 import run.halo.app.model.vo.JournalCommentWithJournalVO;
@@ -53,4 +54,19 @@ public class JournalCommentController {
         return journalCommentService.convertTo(journalComment);
     }
 
+    @PutMapping("{commentId:\\d+}/status/{status}")
+    @ApiOperation("Updates comment status")
+    public BaseCommentDTO updateStatusBy(@PathVariable("commentId") Long commentId,
+                                         @PathVariable("status") CommentStatus status) {
+        // Update comment status
+        JournalComment updatedJournalComment = journalCommentService.updateStatus(commentId, status);
+        return journalCommentService.convertTo(updatedJournalComment);
+    }
+
+    @DeleteMapping("{commentId:\\d+}")
+    @ApiOperation("Deletes comment permanently and recursively")
+    public BaseCommentDTO deleteBy(@PathVariable("commentId") Long commentId) {
+        JournalComment deletedJournalComment = journalCommentService.removeById(commentId);
+        return journalCommentService.convertTo(deletedJournalComment);
+    }
 }
diff --git a/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java b/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java
index 7aa997ccc..607221433 100644
--- a/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/PostCommentController.java
@@ -61,7 +61,6 @@ public class PostCommentController {
                                          @PathVariable("status") CommentStatus status) {
         // Update comment status
         PostComment updatedPostComment = postCommentService.updateStatus(commentId, status);
-
         return postCommentService.convertTo(updatedPostComment);
     }
 
@@ -69,7 +68,6 @@ public class PostCommentController {
     @ApiOperation("Deletes comment permanently and recursively")
     public BaseCommentDTO deleteBy(@PathVariable("commentId") Long commentId) {
         PostComment deletedPostComment = postCommentService.removeById(commentId);
-
         return postCommentService.convertTo(deletedPostComment);
     }
 }
diff --git a/src/main/java/run/halo/app/controller/admin/api/SheetCommentController.java b/src/main/java/run/halo/app/controller/admin/api/SheetCommentController.java
index 2ea038511..7ac48883b 100644
--- a/src/main/java/run/halo/app/controller/admin/api/SheetCommentController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/SheetCommentController.java
@@ -7,6 +7,7 @@ import org.springframework.data.web.PageableDefault;
 import org.springframework.web.bind.annotation.*;
 import run.halo.app.model.dto.BaseCommentDTO;
 import run.halo.app.model.entity.SheetComment;
+import run.halo.app.model.enums.CommentStatus;
 import run.halo.app.model.params.CommentQuery;
 import run.halo.app.model.params.SheetCommentParam;
 import run.halo.app.model.vo.SheetCommentWithSheetVO;
@@ -51,4 +52,20 @@ public class SheetCommentController {
         SheetComment createdComment = sheetCommentService.createBy(commentParam);
         return sheetCommentService.convertTo(createdComment);
     }
+
+    @PutMapping("{commentId:\\d+}/status/{status}")
+    @ApiOperation("Updates comment status")
+    public BaseCommentDTO updateStatusBy(@PathVariable("commentId") Long commentId,
+                                         @PathVariable("status") CommentStatus status) {
+        // Update comment status
+        SheetComment updatedSheetComment = sheetCommentService.updateStatus(commentId, status);
+        return sheetCommentService.convertTo(updatedSheetComment);
+    }
+
+    @DeleteMapping("{commentId:\\d+}")
+    @ApiOperation("Deletes comment permanently and recursively")
+    public BaseCommentDTO deleteBy(@PathVariable("commentId") Long commentId) {
+        SheetComment deletedSheetComment = sheetCommentService.removeById(commentId);
+        return sheetCommentService.convertTo(deletedSheetComment);
+    }
 }