[댓글 기능] 제이 미션 제출합니다.

src/main/java/techcourse/myblog/domain/Article.java

@@ -2,19 +2,22 @@
 
 import techcourse.myblog.domain.common.ContentsAudit;
 
-import javax.persistence.Entity;
-import javax.persistence.ForeignKey;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 
 @Entity
 public class Article extends ContentsAudit {
+    @Column(nullable = false)
     private String title;
+
+    @Column(nullable = false)
     private String coverUrl;
+
+    @Column(nullable = false)
+    @Lob
     private String contents;
 
     @ManyToOne
-    @JoinColumn(name = "author", foreignKey = @ForeignKey(name = "fk_article_to_user"))
+    @JoinColumn(foreignKey = @ForeignKey(name = "FK_article_to_user"))
     private User author;
 
     private Article() {

src/main/java/techcourse/myblog/domain/Comment.java

@@ -1,20 +1,25 @@
 package techcourse.myblog.domain;
 
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
 import techcourse.myblog.domain.common.ContentsAudit;
 
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
+import javax.persistence.*;
 
 @Entity
 public class Comment extends ContentsAudit {
     @Lob
+    @Column(nullable = false)
     private String contents;
 
     @ManyToOne
+    @JoinColumn(foreignKey = @ForeignKey(name = "FK_comment_to_user"), nullable = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
     private User commenter;
 
     @ManyToOne
+    @JoinColumn(foreignKey = @ForeignKey(name = "FK_comment_to_article"), nullable = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
     private Article article;
 
     private Comment() {

src/main/java/techcourse/myblog/domain/User.java

@@ -1,9 +1,6 @@
 package techcourse.myblog.domain;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -17,8 +14,13 @@ public class User {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
+    @Column(nullable = false, length = 50)
     private String name;
+
+    @Column(nullable = false)
     private String email;
+
+    @Column(nullable = false)
     private String password;
 
     private User() {

src/main/java/techcourse/myblog/domain/common/ContentsAudit.java

@@ -24,10 +24,6 @@ public abstract class ContentsAudit {
     @LastModifiedDate
     private LocalDateTime lastModifiedDate;
 
-    @CreatedBy
-    @OneToOne
-    private User createdBy;
-
     @LastModifiedBy
     @OneToOne
     private User lastModifiedBy;
@@ -44,10 +40,6 @@ public LocalDateTime getLastModifiedDate() {
         return lastModifiedDate;
     }
 
-    public User getCreatedBy() {
-        return createdBy;
-    }
-
     public User getLastModifiedBy() {
         return lastModifiedBy;
     }
@@ -64,10 +56,6 @@ public void setLastModifiedDate(LocalDateTime lastModifiedDate) {
         this.lastModifiedDate = lastModifiedDate;
     }
 
-    public void setCreatedBy(User createdBy) {
-        this.createdBy = createdBy;
-    }
-
     public void setLastModifiedBy(User lastModifiedBy) {
         this.lastModifiedBy = lastModifiedBy;
     }

src/main/java/techcourse/myblog/support/auth/UserAuthentication.java

@@ -0,0 +1,13 @@
+package techcourse.myblog.support.auth;
+
+public class UserAuthentication {
+    private String sessionId;
+
+    public String getSessionId() {
+        return sessionId;
+    }
+
+    public void setSessionId(String sessionId) {
+        this.sessionId = sessionId;
+    }
+}

src/main/java/techcourse/myblog/support/auth/UserSessionContextHolder.java

@@ -0,0 +1,22 @@
+package techcourse.myblog.support.auth;
+
+import techcourse.myblog.domain.User;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class UserSessionContextHolder {
+    private static Map<UserAuthentication, User> context = new ConcurrentHashMap<>();
+
+    public static void bindContext(UserAuthentication authentication, User user) {
+        context.put(authentication, user);
+    }
+
+    public static User getUserAuthentication(UserAuthentication authentication) {
+        return context.get(authentication);
+    }
+
+    public static void removeAuthentication(UserAuthentication authentication) {
+        context.remove(authentication);
+    }
+}

src/main/java/techcourse/myblog/support/config/WebConfig.java

@@ -3,12 +3,18 @@
 import org.modelmapper.ModelMapper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import techcourse.myblog.support.auth.UserAuthentication;
 import techcourse.myblog.support.config.mapper.CommentResponseMapper;
 import techcourse.myblog.support.encryptor.EncryptHelper;
 import techcourse.myblog.support.encryptor.SaltEncrypt;
 import techcourse.myblog.web.interceptor.AuthInterceptor;
+import techcourse.myblog.web.interceptor.SessionContextInterceptor;
+import techcourse.myblog.web.resolver.SessionResolver;
+
+import java.util.List;
 
 @Configuration
 public class WebConfig {
@@ -17,13 +23,22 @@ public WebMvcConfigurer interceptorConfigure() {
         return new WebMvcConfigurer() {
             @Override
             public void addInterceptors(InterceptorRegistry registry) {
-                registry.addInterceptor(new AuthInterceptor())
+                registry.addInterceptor(new AuthInterceptor(userAuthentication()))
                         .addPathPatterns("/users")
                         .addPathPatterns("/mypage-edit")
                         .addPathPatterns("/mypage")
                         .addPathPatterns("/mypage/*")
                         .addPathPatterns("/writing")
                         .addPathPatterns("/articles");
+
+                registry.addInterceptor(new SessionContextInterceptor(userAuthentication()))
+                        .addPathPatterns("/logout")
+                        .addPathPatterns("/users/*");
+            }
+
+            @Override
+            public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+                resolvers.add(new SessionResolver());
             }
         };
     }
@@ -39,4 +54,9 @@ public ModelMapper modelMapper() {
         modelMapper.addMappings(new CommentResponseMapper());
         return modelMapper;
     }
+
+    @Bean
+    public UserAuthentication userAuthentication() {
+        return new UserAuthentication();
+    }
 }

src/main/java/techcourse/myblog/support/config/jpa/JpaAuditingConfig.java

@@ -5,15 +5,22 @@
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import techcourse.myblog.domain.User;
-import techcourse.myblog.support.config.UserSessionContext;
+import techcourse.myblog.support.auth.UserAuthentication;
+import techcourse.myblog.support.auth.UserSessionContextHolder;
 
 import java.util.Optional;
 
 @Configuration
 @EnableJpaAuditing(auditorAwareRef = "blogAuditorAware")
 public class JpaAuditingConfig {
+    private UserAuthentication userAuthentication;
+
+    public JpaAuditingConfig(UserAuthentication userAuthentication) {
+        this.userAuthentication = userAuthentication;
+    }
+
     @Bean
     public AuditorAware<User> blogAuditorAware() {
-        return () -> Optional.of(UserSessionContext.getUser());
+        return () -> Optional.of(UserSessionContextHolder.getUserAuthentication(userAuthentication));
     }
 }

src/main/java/techcourse/myblog/web/ArticleController.java

@@ -9,7 +9,6 @@
 import techcourse.myblog.service.CommentService;
 import techcourse.myblog.service.dto.ArticleRequest;
 
-import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
 
 @Controller
@@ -23,21 +22,14 @@ public ArticleController(ArticleService articleService, CommentService commentSe
         this.commentService = commentService;
     }
 
-//    @GetMapping("/")
-//    public String index(@RequestParam(defaultValue = "1") int page, Model model) {
-//        model.addAttribute("articles", articleService.findAll(page));
-//        return "index";
-//    }
-
     @GetMapping()
     public String formArticle(Model model) {
         model.addAttribute("article", null);
         return "article-edit";
     }
 
     @PostMapping()
-    public String saveArticle(@Valid ArticleRequest articleRequest, Model model, HttpSession httpSession) {
-        User user = (User) httpSession.getAttribute("user");
+    public String saveArticle(@Valid ArticleRequest articleRequest, Model model, User user) {
         Article article = articleService.save(articleRequest, user);
         model.addAttribute("article", article);
         return "redirect:/articles/" + article.getId();
@@ -52,22 +44,22 @@ public String selectArticle(@PathVariable("articleId") long articleId, Model mod
     }
 
     @GetMapping("/{articleId}/edit")
-    public String edit(@PathVariable("articleId") long articleId, Model model, HttpSession httpSession) {
-        Article article = articleService.findByIdWithUser(articleId, (User) httpSession.getAttribute("user"));
+    public String edit(@PathVariable("articleId") long articleId, Model model, User user) {
+        Article article = articleService.findByIdWithUser(articleId, user);
         model.addAttribute("article", article);
         return "article-edit";
     }
 
     @PutMapping("/{articleId}")
-    public String editArticle(@PathVariable("articleId") long articleId, @ModelAttribute ArticleRequest articleRequest, HttpSession httpSession, Model model) {
-        Article article = articleService.editArticle(articleRequest, articleId, (User) httpSession.getAttribute("user"));
+    public String editArticle(@PathVariable("articleId") long articleId, @ModelAttribute ArticleRequest articleRequest, User user, Model model) {
+        Article article = articleService.editArticle(articleRequest, articleId, user);
         model.addAttribute("article", article);
         return "redirect:/articles/" + articleId;
     }
 
     @DeleteMapping("/{articleId}")
-    public String deleteArticle(@PathVariable("articleId") long articleId, HttpSession httpSession) {
-        articleService.deleteById(articleId, (User) httpSession.getAttribute("user"));
+    public String deleteArticle(@PathVariable("articleId") long articleId, User user) {
+        articleService.deleteById(articleId, user);
         return "redirect:/";
     }
 }

src/main/java/techcourse/myblog/web/CommentController.java

@@ -24,9 +24,9 @@ public CommentController(CommentService commentService, ArticleService articleSe
     }
 
     @PostMapping
-    public String saveComment(@Valid CommentRequest commentRequest, HttpSession httpSession) {
+    public String saveComment(@Valid CommentRequest commentRequest, User user) {
         Article article = articleService.findById(commentRequest.getArticleId());
-        commentService.save(commentRequest, article, (User) httpSession.getAttribute("user"));
+        commentService.save(commentRequest, article, user);
         return "redirect:/articles/" + commentRequest.getArticleId();
     }
 
@@ -38,14 +38,14 @@ public String editCommentPage(HttpSession httpSession, @PathVariable("commentId"
     }
 
     @PutMapping("/{commentId}")
-    public String editComment(@Valid CommentRequest commentRequest, @PathVariable("commentId") Long commentId, HttpSession httpSession) {
-        commentService.update(commentRequest, (User) httpSession.getAttribute("user"), commentId);
+    public String editComment(@Valid CommentRequest commentRequest, @PathVariable("commentId") Long commentId, User user) {
+        commentService.update(commentRequest, user, commentId);
         return "redirect:/articles/" + commentRequest.getArticleId();
     }
 
     @DeleteMapping("/{commentId}")
-    public String deleteComment(@PathVariable("commentId") Long commentId, HttpSession httpSession) {
-        commentService.deleteById(commentId, (User) httpSession.getAttribute("user"));
+    public String deleteComment(@PathVariable("commentId") Long commentId, User user) {
+        commentService.deleteById(commentId, user);
         return "redirect:/";
     }
 }

src/main/java/techcourse/myblog/web/UserController.java

@@ -9,7 +9,6 @@
 import techcourse.myblog.service.dto.UserEditRequest;
 import techcourse.myblog.service.dto.UserLoginRequest;
 import techcourse.myblog.service.dto.UserRequest;
-import techcourse.myblog.support.config.UserSessionContext;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
@@ -29,7 +28,6 @@ public String createLoginForm(HttpServletRequest request, UserLoginRequest userL
         if (request.getSession().getAttribute(USER) == null) {
             return "login";
         }
-
         return "redirect:/";
     }
 
@@ -54,8 +52,8 @@ public String showUsers(Model model) {
     }
 
     @GetMapping("/mypage")
-    public String myPageForm(Model model, HttpServletRequest request) {
-        model.addAttribute(USER, request.getSession().getAttribute(USER));
+    public String myPageForm(Model model, User user) {
+        model.addAttribute(USER, user);
         return "mypage";
     }
 
@@ -68,14 +66,12 @@ public String myPageEditForm(UserEditRequest userEditRequest) {
     public String login(UserLoginRequest userLoginRequest, HttpServletRequest request) {
         User user = userService.findUserByEmail(userLoginRequest);
         request.getSession().setAttribute(USER, user);
-        UserSessionContext.set(user);
         return "redirect:/";
     }
 
     @GetMapping("/logout")
     public String logout(HttpServletRequest request) {
         request.getSession().removeAttribute(USER);
-        UserSessionContext.remove();
         return "redirect:/";
     }
 
@@ -93,7 +89,6 @@ public String editUser(@PathVariable("userId") Long userId, HttpServletRequest r
     public String deleteUser(@PathVariable("userId") Long userId, HttpServletRequest request) {
         userService.deleteById(userId);
         request.getSession().removeAttribute(USER);
-        UserSessionContext.remove();
         return "redirect:/";
     }
 }