From 93eb1250f7050fd6262c70b71cfc3d90d8056e9c Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Wed, 24 Apr 2019 23:30:27 +0800
Subject: [PATCH] Fixed sheet update error.

---
 .../app/controller/admin/api/PostController.java   | 14 ++++++++++++++
 .../app/controller/admin/api/SheetController.java  |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/run/halo/app/controller/admin/api/PostController.java b/src/main/java/run/halo/app/controller/admin/api/PostController.java
index c66df56f2..a0eca127c 100644
--- a/src/main/java/run/halo/app/controller/admin/api/PostController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/PostController.java
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
 import run.halo.app.model.dto.post.PostMinimalDTO;
 import run.halo.app.model.dto.post.PostSimpleDTO;
 import run.halo.app.model.entity.Post;
+import run.halo.app.model.entity.Sheet;
 import run.halo.app.model.enums.PostStatus;
 import run.halo.app.model.params.PostParam;
 import run.halo.app.model.params.PostQuery;
@@ -107,6 +108,19 @@ public class PostController {
         return postService.updateBy(postToUpdate, postParam.getTagIds(), postParam.getCategoryIds());
     }
 
+    @PutMapping("{postId:\\d+}/{status}")
+    public void updateStatusBy(
+            @PathVariable("postId") Integer postId,
+            @PathVariable("status") PostStatus status) {
+        Post post = postService.getById(postId);
+
+        // Set status
+        post.setStatus(status);
+
+        // Update
+        postService.update(post);
+    }
+
     @DeleteMapping("{postId:\\d+}")
     public void deletePermanently(@PathVariable("postId") Integer postId) {
         // Remove it
diff --git a/src/main/java/run/halo/app/controller/admin/api/SheetController.java b/src/main/java/run/halo/app/controller/admin/api/SheetController.java
index 4bd45c34b..ddf35e627 100644
--- a/src/main/java/run/halo/app/controller/admin/api/SheetController.java
+++ b/src/main/java/run/halo/app/controller/admin/api/SheetController.java
@@ -58,7 +58,12 @@ public class SheetController {
     public SheetDetailDTO updateBy(
             @PathVariable("sheetId") Integer sheetId,
             @RequestBody @Valid SheetParam sheetParam) {
-        Sheet sheet = sheetService.updateBy(sheetParam.convertTo());
+        Sheet sheetToUpdate = sheetService.getById(sheetId);
+
+        sheetParam.update(sheetToUpdate);
+
+        Sheet sheet = sheetService.updateBy(sheetToUpdate);
+
         return sheetService.convertToDetailDto(sheet);
     }