From 58ba7459733125493afffe9ee46781ef44a0c4a3 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Thu, 14 Mar 2019 16:38:55 +0800
Subject: [PATCH] Add status and url filed into Post entity

---
 ...itleDTO.java => PostMinimalOutputDTO.java} | 15 +++++++-
 .../model/dto/post/PostSimpleOutputDTO.java   |  2 +-
 .../java/cc/ryanc/halo/model/entity/Post.java | 13 +++++++
 .../cc/ryanc/halo/model/enums/PostStatus.java | 35 +++++++++++++++++++
 .../cc/ryanc/halo/model/vo/CommentVO.java     |  4 +--
 .../halo/service/impl/CommentServiceImpl.java |  4 +--
 6 files changed, 67 insertions(+), 6 deletions(-)
 rename src/main/java/cc/ryanc/halo/model/dto/post/{PostWithTitleDTO.java => PostMinimalOutputDTO.java} (57%)
 create mode 100644 src/main/java/cc/ryanc/halo/model/enums/PostStatus.java

diff --git a/src/main/java/cc/ryanc/halo/model/dto/post/PostWithTitleDTO.java b/src/main/java/cc/ryanc/halo/model/dto/post/PostMinimalOutputDTO.java
similarity index 57%
rename from src/main/java/cc/ryanc/halo/model/dto/post/PostWithTitleDTO.java
rename to src/main/java/cc/ryanc/halo/model/dto/post/PostMinimalOutputDTO.java
index 3842a76de..4588e7c5a 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/post/PostWithTitleDTO.java
+++ b/src/main/java/cc/ryanc/halo/model/dto/post/PostMinimalOutputDTO.java
@@ -2,6 +2,7 @@ package cc.ryanc.halo.model.dto.post;
 
 import cc.ryanc.halo.model.dto.base.OutputConverter;
 import cc.ryanc.halo.model.entity.Post;
+import cc.ryanc.halo.model.enums.PostStatus;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -14,8 +15,11 @@ import lombok.ToString;
 @Data
 @ToString
 @EqualsAndHashCode
-public class PostWithTitleDTO implements OutputConverter<PostWithTitleDTO, Post> {
+public class PostMinimalOutputDTO implements OutputConverter<PostMinimalOutputDTO, Post> {
 
+    /**
+     * Post id.
+     */
     private Integer id;
 
     /**
@@ -23,4 +27,13 @@ public class PostWithTitleDTO implements OutputConverter<PostWithTitleDTO, Post>
      */
     private String title;
 
+    /**
+     * Post status.
+     */
+    private PostStatus status;
+
+    /**
+     * Post url.
+     */
+    private String url;
 }
diff --git a/src/main/java/cc/ryanc/halo/model/dto/post/PostSimpleOutputDTO.java b/src/main/java/cc/ryanc/halo/model/dto/post/PostSimpleOutputDTO.java
index dd9a1de0c..f8758e478 100644
--- a/src/main/java/cc/ryanc/halo/model/dto/post/PostSimpleOutputDTO.java
+++ b/src/main/java/cc/ryanc/halo/model/dto/post/PostSimpleOutputDTO.java
@@ -16,7 +16,7 @@ import java.util.Date;
 @Data
 @ToString
 @EqualsAndHashCode(callSuper = true)
-public class PostSimpleOutputDTO extends PostWithTitleDTO {
+public class PostSimpleOutputDTO extends PostMinimalOutputDTO {
 
     /**
      * 文章类型
diff --git a/src/main/java/cc/ryanc/halo/model/entity/Post.java b/src/main/java/cc/ryanc/halo/model/entity/Post.java
index 7b45023f7..6d5323b5f 100644
--- a/src/main/java/cc/ryanc/halo/model/entity/Post.java
+++ b/src/main/java/cc/ryanc/halo/model/entity/Post.java
@@ -1,6 +1,7 @@
 package cc.ryanc.halo.model.entity;
 
 import cc.ryanc.halo.model.enums.PostCreateFrom;
+import cc.ryanc.halo.model.enums.PostStatus;
 import cc.ryanc.halo.model.enums.PostType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -44,6 +45,18 @@ public class Post {
     @Column(name = "type", columnDefinition = "int default 0")
     private PostType type;
 
+    /**
+     * Post status.
+     */
+    @Column(name = "status", columnDefinition = "int default 1")
+    private PostStatus status;
+
+    /**
+     * Post url.
+     */
+    @Column(name = "url", columnDefinition = "varchar(255) not null")
+    private String url;
+
     /**
      * 源内容
      */
diff --git a/src/main/java/cc/ryanc/halo/model/enums/PostStatus.java b/src/main/java/cc/ryanc/halo/model/enums/PostStatus.java
new file mode 100644
index 000000000..4ea35ee04
--- /dev/null
+++ b/src/main/java/cc/ryanc/halo/model/enums/PostStatus.java
@@ -0,0 +1,35 @@
+package cc.ryanc.halo.model.enums;
+
+/**
+ * Post status.
+ *
+ * @author johnniang
+ */
+public enum PostStatus implements ValueEnum<Integer> {
+
+    /**
+     * Published status.
+     */
+    PUBLISHED(0),
+
+    /**
+     * Draft status.
+     */
+    DRAFT(1),
+
+    /**
+     * Recycle status.
+     */
+    RECYCLE(2);
+
+    private final int value;
+
+    PostStatus(int value) {
+        this.value = value;
+    }
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+}
diff --git a/src/main/java/cc/ryanc/halo/model/vo/CommentVO.java b/src/main/java/cc/ryanc/halo/model/vo/CommentVO.java
index a02d1dc2b..7f012a1c2 100644
--- a/src/main/java/cc/ryanc/halo/model/vo/CommentVO.java
+++ b/src/main/java/cc/ryanc/halo/model/vo/CommentVO.java
@@ -1,7 +1,7 @@
 package cc.ryanc.halo.model.vo;
 
 import cc.ryanc.halo.model.dto.CommentOutputDTO;
-import cc.ryanc.halo.model.dto.post.PostWithTitleDTO;
+import cc.ryanc.halo.model.dto.post.PostMinimalOutputDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -16,5 +16,5 @@ import lombok.ToString;
 @EqualsAndHashCode(callSuper = true)
 public class CommentVO extends CommentOutputDTO {
 
-    private PostWithTitleDTO post;
+    private PostMinimalOutputDTO post;
 }
diff --git a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java
index 727cf05e3..64b20aa11 100644
--- a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java
+++ b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java
@@ -1,6 +1,6 @@
 package cc.ryanc.halo.service.impl;
 
-import cc.ryanc.halo.model.dto.post.PostWithTitleDTO;
+import cc.ryanc.halo.model.dto.post.PostMinimalOutputDTO;
 import cc.ryanc.halo.model.entity.Comment;
 import cc.ryanc.halo.model.entity.Post;
 import cc.ryanc.halo.model.vo.CommentVO;
@@ -59,7 +59,7 @@ public class CommentServiceImpl extends AbstractCrudService<Comment, Long> imple
             CommentVO commentVO = new CommentVO().convertFrom(comment);
 
             // Get post and set to the vo
-            commentVO.setPost(new PostWithTitleDTO().convertFrom(postMap.get(comment.getPostId())));
+            commentVO.setPost(new PostMinimalOutputDTO().convertFrom(postMap.get(comment.getPostId())));
 
             return commentVO;
         });