From 297dafc34f37b8b67c60ac1a4ade08f218723279 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Tue, 30 Apr 2019 10:21:14 +0800
Subject: [PATCH] Remove @SQLDelete and @Where.

---
 src/main/java/run/halo/app/model/entity/Attachment.java   | 2 --
 src/main/java/run/halo/app/model/entity/BaseComment.java  | 4 +---
 src/main/java/run/halo/app/model/entity/BasePost.java     | 4 +---
 src/main/java/run/halo/app/model/entity/Category.java     | 4 +---
 src/main/java/run/halo/app/model/entity/Journal.java      | 4 +---
 src/main/java/run/halo/app/model/entity/Link.java         | 2 --
 src/main/java/run/halo/app/model/entity/Log.java          | 4 +---
 src/main/java/run/halo/app/model/entity/Menu.java         | 2 --
 src/main/java/run/halo/app/model/entity/Option.java       | 4 +---
 src/main/java/run/halo/app/model/entity/Photo.java        | 2 --
 src/main/java/run/halo/app/model/entity/PostCategory.java | 2 --
 src/main/java/run/halo/app/model/entity/PostTag.java      | 2 --
 src/main/java/run/halo/app/model/entity/Tag.java          | 2 --
 src/main/java/run/halo/app/model/entity/ThemeSetting.java | 4 +---
 src/main/java/run/halo/app/model/entity/User.java         | 2 --
 15 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/src/main/java/run/halo/app/model/entity/Attachment.java b/src/main/java/run/halo/app/model/entity/Attachment.java
index 46a21c55e..e74dd5e91 100644
--- a/src/main/java/run/halo/app/model/entity/Attachment.java
+++ b/src/main/java/run/halo/app/model/entity/Attachment.java
@@ -18,8 +18,6 @@ import javax.persistence.*;
 @Data
 @Entity
 @Table(name = "attachments")
-@SQLDelete(sql = "update attachments set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class Attachment extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/BaseComment.java b/src/main/java/run/halo/app/model/entity/BaseComment.java
index 11287907f..6dae167d6 100644
--- a/src/main/java/run/halo/app/model/entity/BaseComment.java
+++ b/src/main/java/run/halo/app/model/entity/BaseComment.java
@@ -14,12 +14,10 @@ import javax.persistence.*;
  *
  * @author johnniang
  */
+@Data
 @Entity(name = "BaseComment")
 @Table(name = "comments")
-@SQLDelete(sql = "update comments set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.INTEGER, columnDefinition = "int default 0")
-@Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class BaseComment extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/BasePost.java b/src/main/java/run/halo/app/model/entity/BasePost.java
index 905d2f9d5..0448b722b 100644
--- a/src/main/java/run/halo/app/model/entity/BasePost.java
+++ b/src/main/java/run/halo/app/model/entity/BasePost.java
@@ -17,12 +17,10 @@ import java.util.Date;
  *
  * @author johnniang
  */
+@Data
 @Entity(name = "BasePost")
 @Table(name = "posts", indexes = @Index(columnList = "url"))
-@SQLDelete(sql = "update posts set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.INTEGER, columnDefinition = "int default 0")
-@Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class BasePost extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/Category.java b/src/main/java/run/halo/app/model/entity/Category.java
index f00e85243..01e2b41ed 100644
--- a/src/main/java/run/halo/app/model/entity/Category.java
+++ b/src/main/java/run/halo/app/model/entity/Category.java
@@ -14,11 +14,9 @@ import javax.persistence.*;
  *
  * @author johnniang
  */
+@Data
 @Entity
 @Table(name = "categories")
-@SQLDelete(sql = "update categories set deleted = true where id = ?")
-@Where(clause = "deleted = false")
-@Data
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class Category extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/Journal.java b/src/main/java/run/halo/app/model/entity/Journal.java
index 47f944d46..e16ee8e29 100644
--- a/src/main/java/run/halo/app/model/entity/Journal.java
+++ b/src/main/java/run/halo/app/model/entity/Journal.java
@@ -14,11 +14,9 @@ import javax.persistence.*;
  * @author johnniang
  * @date 3/22/19
  */
+@Data
 @Entity
 @Table(name = "journals")
-@SQLDelete(sql = "update journals set deleted = true where id = ?")
-@Where(clause = "deleted = false")
-@Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class Journal extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/Link.java b/src/main/java/run/halo/app/model/entity/Link.java
index d75195021..b6556bd89 100644
--- a/src/main/java/run/halo/app/model/entity/Link.java
+++ b/src/main/java/run/halo/app/model/entity/Link.java
@@ -17,8 +17,6 @@ import javax.persistence.*;
 @Data
 @Entity
 @Table(name = "links")
-@SQLDelete(sql = "update links set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class Link extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/Log.java b/src/main/java/run/halo/app/model/entity/Log.java
index 05a6973d4..286007116 100644
--- a/src/main/java/run/halo/app/model/entity/Log.java
+++ b/src/main/java/run/halo/app/model/entity/Log.java
@@ -16,11 +16,9 @@ import javax.persistence.*;
  *
  * @author johnniang
  */
+@Data
 @Entity
 @Table(name = "logs")
-@SQLDelete(sql = "update logs set deleted = true where id = ?")
-@Where(clause = "deleted = false")
-@Data
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class Log extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/Menu.java b/src/main/java/run/halo/app/model/entity/Menu.java
index 4a4d9e4b0..4987b5f65 100644
--- a/src/main/java/run/halo/app/model/entity/Menu.java
+++ b/src/main/java/run/halo/app/model/entity/Menu.java
@@ -17,8 +17,6 @@ import javax.persistence.*;
 @Data
 @Entity
 @Table(name = "menus")
-@SQLDelete(sql = "update menus set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class Menu extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/Option.java b/src/main/java/run/halo/app/model/entity/Option.java
index 792e84e4a..d303de52f 100644
--- a/src/main/java/run/halo/app/model/entity/Option.java
+++ b/src/main/java/run/halo/app/model/entity/Option.java
@@ -14,11 +14,9 @@ import javax.persistence.*;
  *
  * @author johnniang
  */
+@Data
 @Entity
 @Table(name = "options")
-@SQLDelete(sql = "update options set deleted = true where id = ?")
-@Where(clause = "deleted = false")
-@Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
diff --git a/src/main/java/run/halo/app/model/entity/Photo.java b/src/main/java/run/halo/app/model/entity/Photo.java
index 40db592d9..45ba56a8a 100644
--- a/src/main/java/run/halo/app/model/entity/Photo.java
+++ b/src/main/java/run/halo/app/model/entity/Photo.java
@@ -18,8 +18,6 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name = "photos")
-@SQLDelete(sql = "update photos set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class Photo extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/PostCategory.java b/src/main/java/run/halo/app/model/entity/PostCategory.java
index 650804ce8..5bf1582ef 100644
--- a/src/main/java/run/halo/app/model/entity/PostCategory.java
+++ b/src/main/java/run/halo/app/model/entity/PostCategory.java
@@ -15,8 +15,6 @@ import java.util.Objects;
  */
 @Entity
 @Table(name = "post_categories")
-@SQLDelete(sql = "update post_categories set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @Data
 @ToString(callSuper = true)
 public class PostCategory extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/PostTag.java b/src/main/java/run/halo/app/model/entity/PostTag.java
index bb1126068..4a3d197a5 100644
--- a/src/main/java/run/halo/app/model/entity/PostTag.java
+++ b/src/main/java/run/halo/app/model/entity/PostTag.java
@@ -17,8 +17,6 @@ import java.util.Objects;
 @Data
 @Entity
 @Table(name = "post_tags")
-@SQLDelete(sql = "update post_tags set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @ToString(callSuper = true)
 public class PostTag extends BaseEntity {
 
diff --git a/src/main/java/run/halo/app/model/entity/Tag.java b/src/main/java/run/halo/app/model/entity/Tag.java
index 7c8f4677a..2d8e09db7 100644
--- a/src/main/java/run/halo/app/model/entity/Tag.java
+++ b/src/main/java/run/halo/app/model/entity/Tag.java
@@ -17,8 +17,6 @@ import javax.persistence.*;
 @Data
 @Entity
 @Table(name = "tags", indexes = @Index(columnList = "slug_name"))
-@SQLDelete(sql = "update tags set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @ToString
 @EqualsAndHashCode(callSuper = true)
 public class Tag extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/ThemeSetting.java b/src/main/java/run/halo/app/model/entity/ThemeSetting.java
index 95856380b..0492b7376 100644
--- a/src/main/java/run/halo/app/model/entity/ThemeSetting.java
+++ b/src/main/java/run/halo/app/model/entity/ThemeSetting.java
@@ -14,11 +14,9 @@ import javax.persistence.*;
  * @author johnniang
  * @date 4/8/19
  */
+@Data
 @Entity
 @Table(name = "theme_settings", indexes = {@Index(columnList = "setting_key")})
-@SQLDelete(sql = "update theme_settings set deleted = true where id = ?")
-@Where(clause = "deleted = false")
-@Data
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class ThemeSetting extends BaseEntity {
diff --git a/src/main/java/run/halo/app/model/entity/User.java b/src/main/java/run/halo/app/model/entity/User.java
index e7669da10..e7c592643 100644
--- a/src/main/java/run/halo/app/model/entity/User.java
+++ b/src/main/java/run/halo/app/model/entity/User.java
@@ -20,8 +20,6 @@ import java.util.Date;
 @Data
 @Entity
 @Table(name = "users")
-@SQLDelete(sql = "update users set deleted = true where id = ?")
-@Where(clause = "deleted = false")
 @ToString(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 public class User extends BaseEntity {