From ad108284835a564c89c83f8623a8f0beae776d66 Mon Sep 17 00:00:00 2001 From: Daeil Choi Date: Mon, 6 Feb 2023 10:38:07 +0900 Subject: [PATCH] =?UTF-8?q?Remove=20PostStatus=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/example/springsecuritystudy/notice/Notice.java | 6 ------ .../java/com/example/springsecuritystudy/post/Post.java | 5 ----- .../example/springsecuritystudy/post/PostRepository.java | 3 +-- .../com/example/springsecuritystudy/post/PostService.java | 5 +++-- .../com/example/springsecuritystudy/post/PostStatus.java | 6 ------ 5 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 src/main/java/com/example/springsecuritystudy/post/PostStatus.java diff --git a/src/main/java/com/example/springsecuritystudy/notice/Notice.java b/src/main/java/com/example/springsecuritystudy/notice/Notice.java index 68c40bb..502ec4f 100644 --- a/src/main/java/com/example/springsecuritystudy/notice/Notice.java +++ b/src/main/java/com/example/springsecuritystudy/notice/Notice.java @@ -1,14 +1,11 @@ package com.example.springsecuritystudy.notice; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.GeneratedValue; import javax.persistence.Id; import javax.persistence.Lob; import com.example.springsecuritystudy.model.BaseTimeEntity; -import com.example.springsecuritystudy.post.PostStatus; import lombok.AccessLevel; import lombok.Getter; @@ -25,12 +22,9 @@ public class Notice extends BaseTimeEntity { private String title; @Lob private String content; - @Enumerated(EnumType.STRING) - private PostStatus status; public Notice(String title, String content) { this.title = title; this.content = content; - this.status = PostStatus.Y; } } diff --git a/src/main/java/com/example/springsecuritystudy/post/Post.java b/src/main/java/com/example/springsecuritystudy/post/Post.java index b7ce2f8..47f4029 100644 --- a/src/main/java/com/example/springsecuritystudy/post/Post.java +++ b/src/main/java/com/example/springsecuritystudy/post/Post.java @@ -1,8 +1,6 @@ package com.example.springsecuritystudy.post; import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; import javax.persistence.FetchType; import javax.persistence.GeneratedValue; import javax.persistence.Id; @@ -30,8 +28,6 @@ public class Post extends BaseTimeEntity { private String title; @Lob private String content; - @Enumerated(EnumType.STRING) - private PostStatus status; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "USER_ID") @@ -40,7 +36,6 @@ public class Post extends BaseTimeEntity { public Post(String title, String content, User user) { this.title = title; this.content = content; - this.status = PostStatus.Y; this.user = user; } diff --git a/src/main/java/com/example/springsecuritystudy/post/PostRepository.java b/src/main/java/com/example/springsecuritystudy/post/PostRepository.java index 59ed973..5e121e0 100644 --- a/src/main/java/com/example/springsecuritystudy/post/PostRepository.java +++ b/src/main/java/com/example/springsecuritystudy/post/PostRepository.java @@ -8,9 +8,8 @@ import com.example.springsecuritystudy.user.User; public interface PostRepository extends JpaRepository { - List findByUserAndStatusOrderByIdDesc(User user, PostStatus status); + List findByUserOrderByIdDesc(User user); Post findByIdAndUser(Long id, User user); - List findByStatusOrderByIdDesc(PostStatus status); } diff --git a/src/main/java/com/example/springsecuritystudy/post/PostService.java b/src/main/java/com/example/springsecuritystudy/post/PostService.java index 03231bd..14e8661 100644 --- a/src/main/java/com/example/springsecuritystudy/post/PostService.java +++ b/src/main/java/com/example/springsecuritystudy/post/PostService.java @@ -2,6 +2,7 @@ package com.example.springsecuritystudy.post; import java.util.List; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,9 +22,9 @@ public class PostService { public List findByUser(User user) { userNullCheck(user); if (Boolean.TRUE.equals(user.isAdmin())) { - return postRepository.findByStatusOrderByIdDesc(PostStatus.Y); + return postRepository.findAll(Sort.by(Sort.Direction.DESC, "id")); } - return postRepository.findByUserAndStatusOrderByIdDesc(user, PostStatus.Y); + return postRepository.findByUserOrderByIdDesc(user); } private static void userNullCheck(User user) { diff --git a/src/main/java/com/example/springsecuritystudy/post/PostStatus.java b/src/main/java/com/example/springsecuritystudy/post/PostStatus.java deleted file mode 100644 index 840c154..0000000 --- a/src/main/java/com/example/springsecuritystudy/post/PostStatus.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.springsecuritystudy.post; - -public enum PostStatus { - Y, - N -}