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

Readme.md

@@ -1,13 +1,13 @@
 ## TODO
 
-- 게시글 생성
-- 게시글 조회
-- 게시글 수정
-- 게시글 삭제 
-- HTML 중복제거
-- 정적 파일 수정 시 재시작 하지 않고 변경사항 반영하기
-- class 파일 수정 시 자동으로 재시작 하기
-
+- 작성자 아닌 경우 예외처리용 ControllerAdvice
+- 작성자 확인 로직 중복 처리
+- 댓글
+
+- Service에 userId 대신에 UserSession을 직접 넘기는게 좋을까? 
+    - userId와 articleId가 헷갈린다.
+    - 하지만 UserSession은 DTO가 아니다.
+    - 좋은 해결책은?
 
 
 # 게시글 생성/조회기능 구현하기

src/main/java/techcourse/myblog/advice/ExceptionAdvice.java

@@ -0,0 +1,39 @@
+package techcourse.myblog.advice;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import techcourse.myblog.exception.AuthException;
+
+@ControllerAdvice
+public class ExceptionAdvice {
+    private static final Logger log = LoggerFactory.getLogger(ExceptionAdvice.class);
+
+    @ResponseStatus(HttpStatus.FORBIDDEN)
+    @ExceptionHandler(AuthException.class)
+    public String handleAuthException(Exception e, Model model) {
+
+        log.error(e.toString());
+
+        model.addAttribute("errorMessage", e.getMessage());
+        model.addAttribute("path", "/");
+        return "error";
+    }
+
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(IllegalArgumentException.class)
+    public String handleRuntimeException(Exception e, Model model) {
+
+        log.error(e.toString());
+
+        model.addAttribute("errorMessage", e.getMessage());
+        model.addAttribute("path", "/");
+        return "error";
+    }
+
+
+}

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

@@ -1,54 +1,64 @@
 package techcourse.myblog.articles;
 
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import techcourse.myblog.articles.comments.Comment;
+import techcourse.myblog.exception.AuthException;
+import techcourse.myblog.users.User;
 
 import javax.persistence.*;
-import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 @Entity
 @Getter
 @Setter
-@ToString
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-@EqualsAndHashCode(of = "id")
-public class Article {
+@NoArgsConstructor
+public class Article extends BaseEntity {
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @Column
+    @Column(nullable = false, length = 100)
     private String title;
 
-    @Column
+    @Lob
     private String contents;
 
-    @Column
+    @Column(nullable = false)
     private String coverUrl;
 
-    @CreatedDate
-    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", updatable = false)
-    private LocalDateTime regDate;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "user_id", foreignKey = @ForeignKey(name = "fk_article_to_user"), nullable = false)
+    private User author;
 
-    @LastModifiedDate
-    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
-    private LocalDateTime updateDate;
+    @OneToMany(mappedBy = "article", orphanRemoval = true)
+    private List<Comment> comments = new ArrayList<>();
 
     @Builder
-    private Article(final String title, final String contents, final String coverUrl) {
+    public Article(final String title, final String contents, final String coverUrl, final User author) {
         this.title = title;
         this.contents = contents;
         this.coverUrl = coverUrl;
+        this.author = author;
+    }
+
+    public List<Comment> getComments() {
+        return Collections.unmodifiableList(comments);
     }
 
-    public void update(Article other) {
-        this.updateDate = LocalDateTime.now();
+    void update(Article other) {
         this.title = other.title;
         this.coverUrl = other.coverUrl;
         this.contents = other.contents;
     }
+
+    boolean isWrittenBy(final Long other) {
+        if (author.getId().equals(other)) {
+            return true;
+        }
+        throw new AuthException("작성자가 아닙니다.");
+    }
 }
 
 

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

@@ -5,6 +5,11 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
+import techcourse.myblog.articles.comments.Comment;
+import techcourse.myblog.users.UserSession;
+
+import javax.servlet.http.HttpSession;
+import java.util.List;
 
 @Controller
 @RequestMapping("/articles")
@@ -18,34 +23,45 @@ public String writeForm() {
     }
 
     @PostMapping
-    public String write(Article article) {
-        Article savedArticle = articleService.save(article);
-        return "redirect:/articles/" + savedArticle.getId();
+    public String write(UserSession userSession, ArticleDto.Request articleDto) {
+        Long userId = userSession.getId();
+        Long articleId = articleService.save(userId, articleDto);
+
+        return "redirect:/articles/" + articleId;
     }
 
     @GetMapping("/{id}")
     public String show(@PathVariable Long id, Model model) {
-        Article article = articleService.findById(id);
-        model.addAttribute(article);
+        final ArticleDto.Response articleDto = articleService.getOne(id);
+        final List<Comment> comments = articleDto.getComments();
+
+        model.addAttribute("article", articleDto);
+        model.addAttribute("comments", comments);
         return "article";
     }
 
     @GetMapping("/{id}/edit")
-    public String editForm(@PathVariable Long id, Model model) {
-        Article article = articleService.findById(id);
-        model.addAttribute(article);
+    public String editForm(@PathVariable Long id, UserSession userSession, Model model) {
+        Long userId = userSession.getId();
+        ArticleDto.Response articleDto = articleService.getOne(userId, id);
+
+        model.addAttribute("article", articleDto);
         return "article-edit";
     }
 
     @PutMapping("/{id}")
-    public String edit(Article editedArticle) {
-        Article article = articleService.edit(editedArticle);
-        return "redirect:/articles/" + article.getId();
+    public String edit(UserSession userSession, ArticleDto.Request editedArticle) {
+        Long userId = userSession.getId();
+        Long articleId = articleService.edit(userId, editedArticle);
+
+        return "redirect:/articles/" + articleId;
     }
 
     @DeleteMapping("/{id}")
-    public String delete(@PathVariable Long id) {
-        articleService.deleteById(id);
+    public String delete(@PathVariable Long id, UserSession userSession) {
+        Long userId = userSession.getId();
+        articleService.deleteById(userId, id);
+
         return "redirect:/";
     }
 }

src/main/java/techcourse/myblog/articles/ArticleDto.java

@@ -0,0 +1,65 @@
+package techcourse.myblog.articles;
+
+
+import lombok.*;
+import techcourse.myblog.articles.comments.Comment;
+import techcourse.myblog.users.User;
+
+import java.util.List;
+
+public class ArticleDto {
+
+    @Setter
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Request {
+        private Long id;
+        private String contents;
+        private String title;
+        private String coverUrl;
+
+        public Article toArticle(final User author) {
+            return Article.builder()
+                    .contents(contents)
+                    .coverUrl(coverUrl)
+                    .title(title)
+                    .author(author)
+                    .build();
+        }
+
+        public Article toArticle() {
+            return Article.builder()
+                    .contents(contents)
+                    .coverUrl(coverUrl)
+                    .title(title)
+                    .build();
+        }
+    }
+
+    @Getter
+    @NoArgsConstructor
+    public static class Response {
+        private Long id;
+        private String contents;
+        private String title;
+        private String coverUrl;
+        private List<Comment> comments;
+
+        Response(Article article) {
+            id = article.getId();
+            contents = article.getContents();
+            title = article.getTitle();
+            coverUrl = article.getCoverUrl();
+        }
+
+        public static Response createBy(Article article) {
+            return new ArticleDto.Response(article);
+        }
+
+        public void setComments(List<Comment> comments) {
+            this.comments = comments;
+        }
+    }
+}

src/main/java/techcourse/myblog/articles/ArticleService.java

@@ -5,37 +5,67 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import techcourse.myblog.users.User;
+import techcourse.myblog.users.UserRepository;
 
 @Service
 @Transactional
 @RequiredArgsConstructor
 public class ArticleService {
     private final ArticleRepository articleRepository;
+    private final UserRepository userRepository;
 
-    public Article save(Article article) {
-        return articleRepository.save(article);
-    }
+    public Long save(final Long userId, final ArticleDto.Request articleDto) {
+        User author = userRepository.findById(userId)
+                .orElseThrow(() -> new IllegalArgumentException("등록된 유저가 아닙니다."));
 
-    @Transactional(readOnly = true)
-    public Article findById(Long id) {
-        return articleRepository.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException("Can't find Article : " + id));
+        Article article = articleDto.toArticle(author);
+
+        return articleRepository.save(article).getId();
     }
 
-    public Article edit(Article editedArticle) {
-        Article article = findById(editedArticle.getId());
+    public Long edit(final Long userId, final ArticleDto.Request articleDto) {
+        Article article = findById(articleDto.getId());
 
-        article.update(editedArticle);
+        article.isWrittenBy(userId);
+        article.update(articleDto.toArticle());
 
-        return article;
+        return article.getId();
     }
 
-    public void deleteById(Long id) {
-        articleRepository.deleteById(id);
+    public void deleteById(Long userId, Long articleId) {
+        Article article = findById(articleId);
+
+        article.isWrittenBy(userId);
+        articleRepository.deleteById(articleId);
     }
 
     @Transactional(readOnly = true)
     public Page<Article> findAll(Pageable pageable) {
         return articleRepository.findAll(pageable);
     }
+
+    @Transactional(readOnly = true)
+    public ArticleDto.Response getOne(Long id) {
+        final Article article = findById(id);
+
+        ArticleDto.Response articleDto = ArticleDto.Response.createBy(article);
+        articleDto.setComments(article.getComments());
+        return articleDto;
+    }
+
+    @Transactional(readOnly = true)
+    public ArticleDto.Response getOne(final Long userId, final Long articleId) {
+        Article article = findById(articleId);
+
+        article.isWrittenBy(userId);
+        ArticleDto.Response articleDto = ArticleDto.Response.createBy(article);
+        articleDto.setComments(article.getComments());
+        return articleDto;
+    }
+
+    private Article findById(Long id) {
+        return articleRepository.findById(id)
+                .orElseThrow(() -> new IllegalArgumentException("없는 글입니다." + id));
+    }
 }

src/main/java/techcourse/myblog/articles/BaseEntity.java

@@ -0,0 +1,26 @@
+package techcourse.myblog.articles;
+
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@Getter
+@MappedSuperclass
+@EqualsAndHashCode(of = "id")
+public abstract class BaseEntity {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @CreationTimestamp
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP", updatable = false)
+    private LocalDateTime regDate;
+
+    @UpdateTimestamp
+    @Column(columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    private LocalDateTime modifiedDate;
+}