Remove PostStatus삭제
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,9 +8,8 @@ import com.example.springsecuritystudy.user.User;
|
||||
|
||||
public interface PostRepository extends JpaRepository<Post, Long> {
|
||||
|
||||
List<Post> findByUserAndStatusOrderByIdDesc(User user, PostStatus status);
|
||||
List<Post> findByUserOrderByIdDesc(User user);
|
||||
|
||||
Post findByIdAndUser(Long id, User user);
|
||||
|
||||
List<Post> findByStatusOrderByIdDesc(PostStatus status);
|
||||
}
|
||||
|
||||
@@ -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<Post> 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) {
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
package com.example.springsecuritystudy.post;
|
||||
|
||||
public enum PostStatus {
|
||||
Y,
|
||||
N
|
||||
}
|
||||
Reference in New Issue
Block a user