diff --git a/src/main/java/com/example/springsecuritystudy/config/InitializeConfig.java b/src/main/java/com/example/springsecuritystudy/config/InitializeConfig.java index 70785cf..7678c70 100644 --- a/src/main/java/com/example/springsecuritystudy/config/InitializeConfig.java +++ b/src/main/java/com/example/springsecuritystudy/config/InitializeConfig.java @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; import com.example.springsecuritystudy.notice.NoticeService; -import com.example.springsecuritystudy.post.PostService; +import com.example.springsecuritystudy.note.NoteService; import com.example.springsecuritystudy.user.User; import com.example.springsecuritystudy.user.UserService; @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; public class InitializeConfig { private final UserService userService; - private final PostService postService; + private final NoteService noteService; private final NoticeService noticeService; /** @@ -34,10 +34,10 @@ public class InitializeConfig { public void adminAccount() { User user = userService.signup("user", "user"); userService.signupAdmin("admin", "admin"); - postService.savePost(user, "테스트", "테스트입니다."); - postService.savePost(user, "테스트2", "테스트2입니다."); - postService.savePost(user, "테스트3", "테스트3입니다."); - postService.savePost(user, "여름 여행계획", "여름 여행계획 작성중..."); + noteService.saveNote(user, "테스트", "테스트입니다."); + noteService.saveNote(user, "테스트2", "테스트2입니다."); + noteService.saveNote(user, "테스트3", "테스트3입니다."); + noteService.saveNote(user, "여름 여행계획", "여름 여행계획 작성중..."); noticeService.saveNotice("환영합니다", "환영합니다 여러분"); noticeService.saveNotice("게시글 작성 방법 공지", "1. 회원가입\n2. 로그인\n3. 게시글 작성\n4. 저장\n* 본인 외에는 게시글을 볼 수 없습니다."); } diff --git a/src/main/java/com/example/springsecuritystudy/config/SecurityConfig.java b/src/main/java/com/example/springsecuritystudy/config/SecurityConfig.java index 2ec08fa..9b6e3a1 100644 --- a/src/main/java/com/example/springsecuritystudy/config/SecurityConfig.java +++ b/src/main/java/com/example/springsecuritystudy/config/SecurityConfig.java @@ -27,7 +27,7 @@ public class SecurityConfig { .authorizeHttpRequests(auth -> auth .antMatchers("/", "/home", "/signup", "/example", "/css/**", "/h2-console/**").permitAll() - .antMatchers("/post").hasRole("USER") + .antMatchers("/note").hasRole("USER") .antMatchers("/admin").hasRole("ADMIN") .antMatchers(HttpMethod.POST, "/notice").hasRole("ADMIN") .antMatchers(HttpMethod.DELETE, "/notice").hasRole("ADMIN") diff --git a/src/main/java/com/example/springsecuritystudy/post/AdminController.java b/src/main/java/com/example/springsecuritystudy/note/AdminController.java similarity index 80% rename from src/main/java/com/example/springsecuritystudy/post/AdminController.java rename to src/main/java/com/example/springsecuritystudy/note/AdminController.java index d236576..1a85e80 100644 --- a/src/main/java/com/example/springsecuritystudy/post/AdminController.java +++ b/src/main/java/com/example/springsecuritystudy/note/AdminController.java @@ -1,4 +1,4 @@ -package com.example.springsecuritystudy.post; +package com.example.springsecuritystudy.note; import java.util.List; @@ -17,7 +17,7 @@ import lombok.RequiredArgsConstructor; @RequestMapping("/admin") public class AdminController { - private final PostService postService; + private final NoteService noteService; /** * 어드민인 경우 게시글 조회 @@ -26,8 +26,8 @@ public class AdminController { @GetMapping public String getPostForAdmin(Authentication authentication, Model model) { User user = (User) authentication.getPrincipal(); - List posts = postService.findByUser(user); - model.addAttribute("posts", posts); + List notes = noteService.findByUser(user); + model.addAttribute("notes", notes); return "admin/index"; } } diff --git a/src/main/java/com/example/springsecuritystudy/post/Post.java b/src/main/java/com/example/springsecuritystudy/note/Note.java similarity index 86% rename from src/main/java/com/example/springsecuritystudy/post/Post.java rename to src/main/java/com/example/springsecuritystudy/note/Note.java index 1aef9f4..3a375f6 100644 --- a/src/main/java/com/example/springsecuritystudy/post/Post.java +++ b/src/main/java/com/example/springsecuritystudy/note/Note.java @@ -1,4 +1,4 @@ -package com.example.springsecuritystudy.post; +package com.example.springsecuritystudy.note; import javax.persistence.Entity; import javax.persistence.FetchType; @@ -21,7 +21,7 @@ import lombok.NoArgsConstructor; @Table @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Post extends BaseTimeEntity { +public class Note extends BaseTimeEntity { @Id @GeneratedValue @@ -35,7 +35,7 @@ public class Post extends BaseTimeEntity { private User user; @Builder - public Post(String title, String content, User user) { + public Note(String title, String content, User user) { this.title = title; this.content = content; this.user = user; diff --git a/src/main/java/com/example/springsecuritystudy/post/PostController.java b/src/main/java/com/example/springsecuritystudy/note/NoteController.java similarity index 69% rename from src/main/java/com/example/springsecuritystudy/post/PostController.java rename to src/main/java/com/example/springsecuritystudy/note/NoteController.java index eae9569..5dc68df 100644 --- a/src/main/java/com/example/springsecuritystudy/post/PostController.java +++ b/src/main/java/com/example/springsecuritystudy/note/NoteController.java @@ -1,4 +1,4 @@ -package com.example.springsecuritystudy.post; +package com.example.springsecuritystudy.note; import java.util.List; @@ -18,30 +18,30 @@ import lombok.RequiredArgsConstructor; @Controller @RequiredArgsConstructor -@RequestMapping("/post") -public class PostController { +@RequestMapping("/note") +public class NoteController { - private final PostService postService; + private final NoteService noteService; @GetMapping public String getPost(Authentication authentication, Model model) { User user = (User) authentication.getPrincipal(); - List posts = postService.findByUser(user); - model.addAttribute("posts", posts); - return "post/index"; + List notes = noteService.findByUser(user); + model.addAttribute("notes", notes); + return "note/index"; } @PostMapping - public String savePost(@ModelAttribute PostDto postDto, Authentication authentication) { + public String savePost(@ModelAttribute NoteDto noteDto, Authentication authentication) { User user = (User) authentication.getPrincipal(); - postService.savePost(user, postDto.getTitle(), postDto.getContent()); - return "redirect:post"; + noteService.saveNote(user, noteDto.getTitle(), noteDto.getContent()); + return "redirect:note"; } @DeleteMapping public String deletePost(@RequestParam Long id, Authentication authentication) { User user = (User) authentication.getPrincipal(); - postService.deletePost(user, id); - return "redirect:post"; + noteService.deleteNote(user, id); + return "redirect:note"; } } diff --git a/src/main/java/com/example/springsecuritystudy/post/PostDto.java b/src/main/java/com/example/springsecuritystudy/note/NoteDto.java similarity index 62% rename from src/main/java/com/example/springsecuritystudy/post/PostDto.java rename to src/main/java/com/example/springsecuritystudy/note/NoteDto.java index 2863535..6502825 100644 --- a/src/main/java/com/example/springsecuritystudy/post/PostDto.java +++ b/src/main/java/com/example/springsecuritystudy/note/NoteDto.java @@ -1,11 +1,11 @@ -package com.example.springsecuritystudy.post; +package com.example.springsecuritystudy.note; import lombok.Getter; import lombok.Setter; @Getter @Setter -public class PostDto { +public class NoteDto { private String title; private String content; diff --git a/src/main/java/com/example/springsecuritystudy/note/NoteRepository.java b/src/main/java/com/example/springsecuritystudy/note/NoteRepository.java new file mode 100644 index 0000000..d8368a7 --- /dev/null +++ b/src/main/java/com/example/springsecuritystudy/note/NoteRepository.java @@ -0,0 +1,15 @@ +package com.example.springsecuritystudy.note; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; + +import com.example.springsecuritystudy.user.User; + +public interface NoteRepository extends JpaRepository { + + List findByUserOrderByIdDesc(User user); + + Note findByIdAndUser(Long id, User user); + +} diff --git a/src/main/java/com/example/springsecuritystudy/post/PostService.java b/src/main/java/com/example/springsecuritystudy/note/NoteService.java similarity index 55% rename from src/main/java/com/example/springsecuritystudy/post/PostService.java rename to src/main/java/com/example/springsecuritystudy/note/NoteService.java index 14e8661..6d04356 100644 --- a/src/main/java/com/example/springsecuritystudy/post/PostService.java +++ b/src/main/java/com/example/springsecuritystudy/note/NoteService.java @@ -1,4 +1,4 @@ -package com.example.springsecuritystudy.post; +package com.example.springsecuritystudy.note; import java.util.List; @@ -14,17 +14,17 @@ import lombok.RequiredArgsConstructor; @Service @RequiredArgsConstructor @Transactional -public class PostService { +public class NoteService { - private final PostRepository postRepository; + private final NoteRepository noteRepository; @Transactional(readOnly = true) - public List findByUser(User user) { + public List findByUser(User user) { userNullCheck(user); if (Boolean.TRUE.equals(user.isAdmin())) { - return postRepository.findAll(Sort.by(Sort.Direction.DESC, "id")); + return noteRepository.findAll(Sort.by(Sort.Direction.DESC, "id")); } - return postRepository.findByUserOrderByIdDesc(user); + return noteRepository.findByUserOrderByIdDesc(user); } private static void userNullCheck(User user) { @@ -33,15 +33,15 @@ public class PostService { } } - public Post savePost(User user, String title, String content) { + public Note saveNote(User user, String title, String content) { userNullCheck(user); - return postRepository.save(new Post(title, content, user)); + return noteRepository.save(new Note(title, content, user)); } - public void deletePost(User user, Long id) { + public void deleteNote(User user, Long id) { userNullCheck(user); - Post post = postRepository.findByIdAndUser(id, user); - postRepository.delete(post); + Note note = noteRepository.findByIdAndUser(id, user); + noteRepository.delete(note); } } diff --git a/src/main/java/com/example/springsecuritystudy/notice/NoticeController.java b/src/main/java/com/example/springsecuritystudy/notice/NoticeController.java index bb08a2d..9ce0d57 100644 --- a/src/main/java/com/example/springsecuritystudy/notice/NoticeController.java +++ b/src/main/java/com/example/springsecuritystudy/notice/NoticeController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import com.example.springsecuritystudy.post.PostDto; +import com.example.springsecuritystudy.note.NoteDto; import lombok.RequiredArgsConstructor; @@ -33,8 +33,8 @@ public class NoticeController { } @PostMapping - public String savePost(@ModelAttribute PostDto postDto) { - noticeService.saveNotice(postDto.getTitle(), postDto.getContent()); + public String savePost(@ModelAttribute NoteDto noteDto) { + noticeService.saveNotice(noteDto.getTitle(), noteDto.getContent()); return "redirect:notice"; } diff --git a/src/main/java/com/example/springsecuritystudy/post/PostRepository.java b/src/main/java/com/example/springsecuritystudy/post/PostRepository.java deleted file mode 100644 index 5e121e0..0000000 --- a/src/main/java/com/example/springsecuritystudy/post/PostRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.example.springsecuritystudy.post; - -import java.util.List; - -import org.springframework.data.jpa.repository.JpaRepository; - -import com.example.springsecuritystudy.user.User; - -public interface PostRepository extends JpaRepository { - - List findByUserOrderByIdDesc(User user); - - Post findByIdAndUser(Long id, User user); - -} diff --git a/src/main/resources/templates/admin/index.html b/src/main/resources/templates/admin/index.html index f078bf4..12ea206 100644 --- a/src/main/resources/templates/admin/index.html +++ b/src/main/resources/templates/admin/index.html @@ -11,12 +11,12 @@

게시글 내역

-
+

- + Posted by - on - + on +

diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html index c4d3997..8a8a624 100644 --- a/src/main/resources/templates/fragments.html +++ b/src/main/resources/templates/fragments.html @@ -66,9 +66,9 @@ - 게시글 + 개인노트