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

build.gradle

@@ -15,17 +15,19 @@ repositories {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-hateoas'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-    implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'com.h2database:h2'
+    implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect'
     implementation 'org.projectlombok:lombok:1.18.8'
+    implementation 'com.h2database:h2'
 
     annotationProcessor 'org.projectlombok:lombok:1.18.8'
 
     runtimeOnly 'net.rakugakibox.spring.boot:logback-access-spring-boot-starter:2.7.1'
     runtimeOnly 'org.springframework.boot:spring-boot-devtools'
 
+    testImplementation 'org.mockito:mockito-junit-jupiter'
     testImplementation "org.junit.jupiter:junit-jupiter-params:5.4.2"
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

deploy.sh

@@ -0,0 +1,26 @@
+REPOSITORY="/home/ubuntu/"
+cd $REPOSITORY/jwp-blog
+
+BRANCH="step4"
+echo ">>> GIT PULL ..."
+git pull origin $BRANCH
+
+echo ">>> BUILD START ..."
+./gradlew clean build
+echo ">>> BUILD COMPLETE"
+
+echo ">>> 현재 구동중인 애플리케이션 pid 확인"
+CURRENT_PID=$(pgrep -f myblog)
+echo "$CURRENT_PID"
+
+if [ -z $CURRENT_PID ]; then
+	echo ">>> 현재 구동중인 애플리케이션이 없으므로 종료하지 않습니다."
+else
+	echo ">>> KILL PROCESS $CURRENT_PID"
+	kill -9 $CURRENT_PID
+fi
+
+echo ">>> START NEW APPLICATION..."
+JAR_NAME=$(ls $REPOSITORY/jwp-blog/build/libs/ | grep 'myblog' | tail -n 1)
+echo ">>> JAR NAME: $JAR_NAME"
+nohup java -jar build/libs/$JAR_NAME &

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

@@ -1,12 +1,10 @@
-package techcourse.myblog.articles;
+package techcourse.myblog.domain;
 
 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 techcourse.myblog.service.exception.AuthException;
 
 import javax.persistence.*;
 import java.util.ArrayList;
@@ -47,13 +45,13 @@ public List<Comment> getComments() {
         return Collections.unmodifiableList(comments);
     }
 
-    void update(Article other) {
+    public void update(Article other) {
         this.title = other.title;
         this.coverUrl = other.coverUrl;
         this.contents = other.contents;
     }
 
-    boolean isWrittenBy(final Long other) {
+    public boolean isWrittenBy(final Long other) {
         if (author.getId().equals(other)) {
             return true;
         }

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

@@ -1,4 +1,4 @@
-package techcourse.myblog.articles;
+package techcourse.myblog.domain;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;

src/main/java/techcourse/myblog/articles/comments/Comment.java → src/main/java/techcourse/myblog/domain/Comment.java

@@ -1,13 +1,10 @@
-package techcourse.myblog.articles.comments;
+package techcourse.myblog.domain;
 
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
-import techcourse.myblog.articles.Article;
-import techcourse.myblog.articles.BaseEntity;
-import techcourse.myblog.exception.AuthException;
-import techcourse.myblog.users.User;
+import techcourse.myblog.service.exception.AuthException;
 
 import javax.persistence.*;
 

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

@@ -1,7 +1,8 @@
-package techcourse.myblog.users;
+package techcourse.myblog.domain;
 
-import lombok.*;
-import techcourse.myblog.articles.BaseEntity;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
 
@@ -24,7 +25,7 @@ public class User extends BaseEntity {
     private String password;
 
     @Builder
-    private User(final Long id, final String email, final String name, final String password) {
+    public User(final Long id, final String email, final String name, final String password) {
         if (id == null) {
             UserValidator.validateEmail(email);
             UserValidator.validatePassword(password);
@@ -36,11 +37,11 @@ private User(final Long id, final String email, final String name, final String
         this.password = password;
     }
 
-    boolean authenticate(final String password) {
+    public boolean authenticate(final String password) {
         return this.password.equals(password);
     }
 
-    void update(final User other) {
+    public void update(final User other) {
         this.name = other.name;
     }
 

src/main/java/techcourse/myblog/users/UserValidator.java → src/main/java/techcourse/myblog/domain/UserValidator.java

@@ -1,15 +1,15 @@
-package techcourse.myblog.users;
+package techcourse.myblog.domain;
 
 import java.util.regex.Pattern;
 
 public class UserValidator {
     static final String EMAIL_REGEX = "^[_a-z0-9-]+(.[_a-z0-9-]+)*@(?:\\w+\\.)+\\w+$";
-    static final String PASSWORD_REGEX = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@$!%*?&])[A-Za-z\\d$@$!%*?&]{8,}";
-    static final String NAME_REGEX = "[가-힣ㄱ-ㅎㅏ-ㅣa-zA-Z]{2,10}";
+    public static final String PASSWORD_REGEX = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@$!%*?&])[A-Za-z\\d$@$!%*?&]{8,}";
+    public static final String NAME_REGEX = "[가-힣ㄱ-ㅎㅏ-ㅣa-zA-Z]{2,10}";
 
-    static final String EMAIL_NOT_MATCH_MESSAGE = "메일의 양식을 지켜주세요.";
-    static final String NAME_NOT_MATCH_MESSAGE = "이름은 2자이상 10자이하이며, 숫자나 특수문자가 포함될 수 없습니다.";
-    static final String PASSWORD_NOT_MATCH_MESSAGE = "비밀번호는 8자 이상의 소문자,대문자,숫자,특수문자의 조합이여야 합니다.";
+    public static final String EMAIL_NOT_MATCH_MESSAGE = "메일의 양식을 지켜주세요.";
+    public static final String NAME_NOT_MATCH_MESSAGE = "이름은 2자이상 10자이하이며, 숫자나 특수문자가 포함될 수 없습니다.";
+    public static final String PASSWORD_NOT_MATCH_MESSAGE = "비밀번호는 8자 이상의 소문자,대문자,숫자,특수문자의 조합이여야 합니다.";
 
     private static final Pattern EMAIL_PATTERN = Pattern.compile(EMAIL_REGEX);
     private static final Pattern PASSWORD_PATTERN = Pattern.compile(PASSWORD_REGEX);

src/main/java/techcourse/myblog/articles/ArticleRepository.java → src/main/java/techcourse/myblog/repository/ArticleRepository.java

@@ -1,9 +1,14 @@
-package techcourse.myblog.articles;
+package techcourse.myblog.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+import techcourse.myblog.domain.Article;
+import techcourse.myblog.domain.User;
+
+import java.util.List;
 
 @Repository
 public interface ArticleRepository extends JpaRepository<Article, Long> {
 
+    List<Article> findAllByAuthor(User user);
 }

src/main/java/techcourse/myblog/articles/comments/CommentRepository.java → src/main/java/techcourse/myblog/repository/CommentRepository.java

@@ -1,8 +1,9 @@
-package techcourse.myblog.articles.comments;
+package techcourse.myblog.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import techcourse.myblog.articles.Article;
+import techcourse.myblog.domain.Article;
+import techcourse.myblog.domain.Comment;
 
 import java.util.List;
 

src/main/java/techcourse/myblog/users/UserRepository.java → src/main/java/techcourse/myblog/repository/UserRepository.java

@@ -1,7 +1,8 @@
-package techcourse.myblog.users;
+package techcourse.myblog.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+import techcourse.myblog.domain.User;
 
 import java.util.Optional;
 

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

@@ -1,23 +1,30 @@
-package techcourse.myblog.articles;
+package techcourse.myblog.service;
 
-import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 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;
+import techcourse.myblog.domain.Article;
+import techcourse.myblog.domain.User;
+import techcourse.myblog.repository.ArticleRepository;
+import techcourse.myblog.service.dto.ArticleDto;
+
+import java.util.List;
 
 @Service
 @Transactional
-@RequiredArgsConstructor
 public class ArticleService {
+    private final UserService userService;
+
     private final ArticleRepository articleRepository;
-    private final UserRepository userRepository;
+
+    public ArticleService(final UserService userService, final ArticleRepository articleRepository) {
+        this.userService = userService;
+        this.articleRepository = articleRepository;
+    }
 
     public Long save(final Long userId, final ArticleDto.Request articleDto) {
-        User author = userRepository.findById(userId)
-                .orElseThrow(() -> new IllegalArgumentException("등록된 유저가 아닙니다."));
+        User author = userService.findById(userId);
 
         Article article = articleDto.toArticle(author);
 
@@ -50,7 +57,6 @@ public ArticleDto.Response getOne(Long id) {
         final Article article = findById(id);
 
         ArticleDto.Response articleDto = ArticleDto.Response.createBy(article);
-        articleDto.setComments(article.getComments());
         return articleDto;
     }
 
@@ -60,12 +66,21 @@ public ArticleDto.Response getOne(final Long userId, final Long articleId) {
 
         article.isWrittenBy(userId);
         ArticleDto.Response articleDto = ArticleDto.Response.createBy(article);
-        articleDto.setComments(article.getComments());
         return articleDto;
     }
 
-    private Article findById(Long id) {
+    @Transactional(readOnly = true)
+    public Article findById(Long id) {
         return articleRepository.findById(id)
                 .orElseThrow(() -> new IllegalArgumentException("없는 글입니다." + id));
     }
+
+    @Transactional(readOnly = true)
+    public List<Article> findAllByAuthor(String author) {
+        if (author != null) {
+            User user = userService.findByEmail(author);
+            return articleRepository.findAllByAuthor(user);
+        }
+        return articleRepository.findAll();
+    }
 }