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

README.md

@@ -34,4 +34,9 @@
 
 ## 회원조회
 * GET /users 로 요청하여 회원목록페이지(user-list.html) 이동
-* DB에 저장된 회원 정보 노출
+* DB에 저장된 회원 정보 노출
+
+## 댓글
+* 댓글 작성 시 작성자와 게시글 정보가 같이 저장
+* 댓글 생성/조회/수정/삭제조회 기능 구현
+    * 수정/삭제는 댓글 작성자만 가능

build.gradle

@@ -21,6 +21,7 @@ dependencies {
 	implementation 'com.h2database:h2'
 	implementation 'mysql:mysql-connector-java:8.0.16'
 	implementation group: 'org.mindrot', name: 'jbcrypt', version: '0.3m'
+	implementation 'org.modelmapper:modelmapper:0.7.8'
 	runtimeOnly 'net.rakugakibox.spring.boot:logback-access-spring-boot-starter:2.7.1'
 	testImplementation 'org.junit.jupiter:junit-jupiter-api'
 	testCompile("org.junit.jupiter:junit-jupiter-params:5.4.2")

src/main/java/techcourse/myblog/AppRunner.java → src/main/java/techcourse/myblog/Runner.java

@@ -7,21 +7,20 @@
 import techcourse.myblog.service.dto.UserRequest;
 
 @Component
-public class AppRunner implements ApplicationRunner {
+public class Runner implements ApplicationRunner {
     private UserService userService;
 
-    public AppRunner(UserService userService) {
+    public Runner(UserService userService) {
         this.userService = userService;
     }
 
     @Override
-    public void run(ApplicationArguments args) {
+    public void run(ApplicationArguments args) throws Exception {
         UserRequest userRequest = new UserRequest();
         userRequest.setName("CU");
         userRequest.setEmail("[email protected]");
-        userRequest.setPassword("PassWord!1");
-        userRequest.setReconfirmPassword("PassWord!1");
-
+        userRequest.setPassword("Password!1");
+        userRequest.setReconfirmPassword("Password!1");
         userService.saveUser(userRequest);
     }
 }

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

@@ -1,29 +1,53 @@
 package techcourse.myblog.domain;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import techcourse.myblog.domain.common.ContentsAudit;
+import techcourse.myblog.service.exception.ResourceNotFoundException;
 
-@Entity
-public class Article {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+import javax.persistence.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
 
+@Entity
+@EntityListeners(value = AuditingEntityListener.class)
+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(foreignKey = @ForeignKey(name = "FK_article_to_user"))
+    private User author;
+
     private Article() {
     }
 
     public Article(String title, String coverUrl, String contents) {
+        checkCoverImageResource(coverUrl);
         this.title = title;
         this.coverUrl = coverUrl;
         this.contents = contents;
     }
 
+    private void checkCoverImageResource(String coverUrl) {
+        try {
+            HttpURLConnection.setFollowRedirects(false);
+            HttpURLConnection con = (HttpURLConnection) new URL(coverUrl).openConnection();
+            con.setRequestMethod("HEAD");
+            if (con.getResponseCode() != HttpURLConnection.HTTP_OK) {
+                throw new ResourceNotFoundException("리소스가 존재하지 않습니다");
+            }
+        } catch (Exception e) {
+            throw new ResourceNotFoundException("리소스 경로가 올바르지 않습니다");
+        }
+    }
+
     public Long getId() {
         return id;
     }
@@ -45,4 +69,12 @@ public void updateArticle(Article article) {
         this.coverUrl = article.coverUrl;
         this.contents = article.contents;
     }
+
+    public void setAuthor(User user) {
+        this.author = user;
+    }
+
+    public boolean isAuthor(User author) {
+        return this.author.equals(author);
+    }
 }

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

@@ -0,0 +1,67 @@
+package techcourse.myblog.domain;
+
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import techcourse.myblog.domain.common.ContentsAudit;
+
+import javax.persistence.*;
+
+@Entity
+@EntityListeners(value = AuditingEntityListener.class)
+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() {
+    }
+
+    public Comment(String contents, Article article, User user) {
+        checkContents(contents);
+        this.contents = contents;
+        this.article = article;
+        this.commenter = user;
+    }
+
+    private void checkContents(String contents) {
+        if (contents == null) {
+            throw new IllegalArgumentException("본문이 없습니다");
+        }
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getContents() {
+        return contents;
+    }
+
+    public User getCommenter() {
+        return commenter;
+    }
+
+    public Article getArticle() {
+        return article;
+    }
+
+    public Comment updateContents(String contents) {
+        this.contents = contents;
+        return this;
+    }
+
+    public boolean isCommentor(User commenter) {
+        return this.commenter.equals(commenter);
+    }
+}

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

@@ -0,0 +1,12 @@
+package techcourse.myblog.domain;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface CommentRepository extends JpaRepository<Comment, Long> {
+    List<Comment> findByArticle(Article article);
+
+    Optional<Comment> findByCommenterAndId(User commenter, Long id);
+}

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

@@ -1,9 +1,7 @@
 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;
 
@@ -16,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() {
@@ -46,8 +49,8 @@ public void changeName(String name) {
         this.name = name;
     }
 
-    public boolean matchPassword(String password) {
-        return this.password.equals(password);
+    public boolean matchEmail(User user) {
+        return this.email.equals(user.email);
     }
 
     public Long getId() {
@@ -65,4 +68,17 @@ public String getEmail() {
     public String getPassword() {
         return password;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return Objects.equals(id, user.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }

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

@@ -0,0 +1,46 @@
+package techcourse.myblog.domain.common;
+
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+
+@MappedSuperclass
+@EntityListeners(value = AuditingEntityListener.class)
+public abstract class ContentsAudit {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    protected Long id;
+
+    @CreatedDate
+    private LocalDateTime createdDate;
+
+    @LastModifiedDate
+    private LocalDateTime lastModifiedDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public LocalDateTime getCreatedDate() {
+        return createdDate;
+    }
+
+    public LocalDateTime getLastModifiedDate() {
+        return lastModifiedDate;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public void setCreatedDate(LocalDateTime createdDate) {
+        this.createdDate = createdDate;
+    }
+
+    public void setLastModifiedDate(LocalDateTime lastModifiedDate) {
+        this.lastModifiedDate = lastModifiedDate;
+    }
+}

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

@@ -1,13 +1,18 @@
 package techcourse.myblog.service;
 
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import techcourse.myblog.domain.Article;
 import techcourse.myblog.domain.ArticleRepository;
+import techcourse.myblog.domain.User;
 import techcourse.myblog.service.dto.ArticleRequest;
+import techcourse.myblog.service.exception.InvalidAuthorException;
 import techcourse.myblog.service.exception.NoArticleException;
+import techcourse.myblog.service.exception.ResourceNotFoundException;
 
 import javax.transaction.Transactional;
-import java.util.List;
 
 @Service
 public class ArticleService {
@@ -17,29 +22,54 @@ public ArticleService(ArticleRepository articleRepository) {
         this.articleRepository = articleRepository;
     }
 
-    public List<Article> findAll() {
-        return articleRepository.findAll();
+    public Page<Article> findAll(int page) {
+        return articleRepository.findAll(
+                PageRequest.of(page - 1, 10, Sort.by("id").descending()));
     }
 
-    public Article save(ArticleRequest articleRequest) {
-        Article article = new Article(articleRequest.getTitle(),
-                articleRequest.getCoverUrl(), articleRequest.getContents());
+    public Article save(ArticleRequest articleRequest, User user) {
+        Article article = createArticle(articleRequest);
+        article.setAuthor(user);
         return articleRepository.save(article);
     }
 
+    private Article createArticle(ArticleRequest articleRequest) {
+        try {
+            return new Article(articleRequest.getTitle(), articleRequest.getCoverUrl(), articleRequest.getContents());
+        } catch (Exception e) {
+            throw new ResourceNotFoundException(e.getMessage());
+        }
+    }
+
     public Article findById(long articleId) {
         return articleRepository.findById(articleId)
                 .orElseThrow(() -> new NoArticleException("게시글이 존재하지 않습니다"));
     }
 
+    public Article findByIdWithUser(long articleId, User user) {
+        Article article = articleRepository.findById(articleId)
+                .orElseThrow(() -> new NoArticleException("게시글이 존재하지 않습니다"));
+        checkAuthor(user, article);
+        return article;
+    }
+
     @Transactional
-    public Article editArticle(ArticleRequest articleRequest, long articleId) {
+    public Article editArticle(ArticleRequest articleRequest, long articleId, User user) {
         Article article = articleRepository.findById(articleId).orElseThrow(IllegalArgumentException::new);
+        checkAuthor(user, article);
         article.updateArticle(new Article(articleRequest.getTitle(), articleRequest.getCoverUrl(), articleRequest.getContents()));
         return article;
     }
 
-    public void deleteById(long articleId) {
+    private void checkAuthor(User user, Article article) {
+        if (!article.isAuthor(user)) {
+            throw new InvalidAuthorException("작성자가 아닙니다");
+        }
+    }
+
+    public void deleteById(long articleId, User user) {
+        Article article = articleRepository.findById(articleId).orElseThrow(IllegalArgumentException::new);
+        checkAuthor(user, article);
         articleRepository.deleteById(articleId);
     }
 }