From 65c759da3c59d987c6d02fa69c2c432a8621f750 Mon Sep 17 00:00:00 2001 From: weonest Date: Fri, 28 Jul 2023 16:57:11 +0900 Subject: [PATCH 01/59] =?UTF-8?q?Spring=20Boot=20JPA=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=ED=8C=90=20=EA=B5=AC=ED=98=84=20=EB=AF=B8=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 37 +++ build.gradle | 38 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63375 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle | 1 + .../com/jpaboard/JpaBoardApplication.java | 13 + .../java/com/jpaboard/common/BaseEntity.java | 23 ++ .../java/com/jpaboard/domain/post/Post.java | 42 +++ .../jpaboard/domain/post/PostConverter.java | 29 ++ .../domain/post/application/PostService.java | 26 ++ .../post/application/PostServiceImpl.java | 70 +++++ .../domain/post/dto/PostCreateRequest.java | 17 ++ .../domain/post/dto/PostResponse.java | 23 ++ .../domain/post/dto/PostUpdateRequest.java | 13 + .../post/infrastructure/PostRepository.java | 18 ++ .../java/com/jpaboard/domain/user/User.java | 35 +++ .../jpaboard/domain/user/UserConverter.java | 27 ++ .../domain/user/application/UserService.java | 15 ++ .../user/application/UserServiceImpl.java | 42 +++ .../domain/user/dto/UserCreationRequest.java | 13 + .../domain/user/dto/UserResponse.java | 12 + .../domain/user/dto/UserUpdateRequest.java | 13 + .../user/infrastructure/UserRepository.java | 7 + src/main/resources/application.properties | 1 + .../jpaboard/JpaBoardApplicationTests.java | 13 + 27 files changed, 875 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/jpaboard/JpaBoardApplication.java create mode 100644 src/main/java/com/jpaboard/common/BaseEntity.java create mode 100644 src/main/java/com/jpaboard/domain/post/Post.java create mode 100644 src/main/java/com/jpaboard/domain/post/PostConverter.java create mode 100644 src/main/java/com/jpaboard/domain/post/application/PostService.java create mode 100644 src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java create mode 100644 src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java create mode 100644 src/main/java/com/jpaboard/domain/post/dto/PostResponse.java create mode 100644 src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java create mode 100644 src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java create mode 100644 src/main/java/com/jpaboard/domain/user/User.java create mode 100644 src/main/java/com/jpaboard/domain/user/UserConverter.java create mode 100644 src/main/java/com/jpaboard/domain/user/application/UserService.java create mode 100644 src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java create mode 100644 src/main/java/com/jpaboard/domain/user/dto/UserCreationRequest.java create mode 100644 src/main/java/com/jpaboard/domain/user/dto/UserResponse.java create mode 100644 src/main/java/com/jpaboard/domain/user/dto/UserUpdateRequest.java create mode 100644 src/main/java/com/jpaboard/domain/user/infrastructure/UserRepository.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/jpaboard/JpaBoardApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..c2065bc26 --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..cd8c2ccea --- /dev/null +++ b/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.0.9' + id 'io.spring.dependency-management' version '1.1.2' +} + +group = 'com' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..033e24c4cdf41af1ab109bc7f253b2b887023340 GIT binary patch literal 63375 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≫L+crb^Bz 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..93e3f59f1 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..d0c07a9d3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'jpa-board' diff --git a/src/main/java/com/jpaboard/JpaBoardApplication.java b/src/main/java/com/jpaboard/JpaBoardApplication.java new file mode 100644 index 000000000..2a9704846 --- /dev/null +++ b/src/main/java/com/jpaboard/JpaBoardApplication.java @@ -0,0 +1,13 @@ +package com.jpaboard; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class JpaBoardApplication { + + public static void main(String[] args) { + SpringApplication.run(JpaBoardApplication.class, args); + } + +} diff --git a/src/main/java/com/jpaboard/common/BaseEntity.java b/src/main/java/com/jpaboard/common/BaseEntity.java new file mode 100644 index 000000000..36809d28c --- /dev/null +++ b/src/main/java/com/jpaboard/common/BaseEntity.java @@ -0,0 +1,23 @@ +package com.jpaboard.common; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@Getter +@EntityListeners(AuditingEntityListener.class) +public class BaseEntity { + @Column(name = "create_at", nullable = false, updatable = false) + @CreatedDate + LocalDateTime createAt; + @Column(name = "update_at", nullable = false) + @LastModifiedDate + LocalDateTime updateAt; +} diff --git a/src/main/java/com/jpaboard/domain/post/Post.java b/src/main/java/com/jpaboard/domain/post/Post.java new file mode 100644 index 000000000..01507a80b --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/Post.java @@ -0,0 +1,42 @@ +package com.jpaboard.domain.post; + +import com.jpaboard.common.BaseEntity; +import com.jpaboard.domain.post.dto.PostUpdateRequest; +import com.jpaboard.domain.user.User; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Post extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String title; + + @Column(nullable = false) + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @Builder + public Post(String title, String content, User user) { + this.title = title; + this.content = content; + this.user = user; + } + + public void update(PostUpdateRequest request) { + this.title = request.title(); + this.content = request.content(); + } +} diff --git a/src/main/java/com/jpaboard/domain/post/PostConverter.java b/src/main/java/com/jpaboard/domain/post/PostConverter.java new file mode 100644 index 000000000..10d1c9d53 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/PostConverter.java @@ -0,0 +1,29 @@ +package com.jpaboard.domain.post; + +import com.jpaboard.domain.post.dto.PostCreateRequest; +import com.jpaboard.domain.post.dto.PostResponse; +import com.jpaboard.domain.user.User; + +public class PostConverter { + + private PostConverter() { + } + + public static Post convertRequestToEntity(PostCreateRequest request, User user) { + return Post.builder() + .title(request.title()) + .content(request.content()) + .user(user) + .build(); + } + + public static PostResponse convertEntityToResponse(Post post) { + return PostResponse.builder() + .id(post.getId()) + .title(post.getTitle()) + .content(post.getContent()) + .create_at(post.getCreateAt()) + .update_at(post.getUpdateAt()) + .build(); + } +} diff --git a/src/main/java/com/jpaboard/domain/post/application/PostService.java b/src/main/java/com/jpaboard/domain/post/application/PostService.java new file mode 100644 index 000000000..a0da45a0f --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/application/PostService.java @@ -0,0 +1,26 @@ +package com.jpaboard.domain.post.application; + +import com.jpaboard.domain.post.dto.PostCreateRequest; +import com.jpaboard.domain.post.dto.PostResponse; +import com.jpaboard.domain.post.dto.PostUpdateRequest; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface PostService { + + Long createPost(PostCreateRequest request); + + PostResponse findPostById(Long id); + + Page findPosts(Pageable pageable); + + Page findPostByTitle(String title, Pageable pageable); + + Page findPostByContent(String content, Pageable pageable); + + Page findByKeyword(String keyword, Pageable pageable); + + void updatePost(Long id, PostUpdateRequest request); + + void deletePostById(Long id); +} diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java new file mode 100644 index 000000000..266832b75 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -0,0 +1,70 @@ +package com.jpaboard.domain.post.application; + +import com.jpaboard.domain.post.Post; +import com.jpaboard.domain.post.PostConverter; +import com.jpaboard.domain.post.dto.PostCreateRequest; +import com.jpaboard.domain.post.dto.PostResponse; +import com.jpaboard.domain.post.dto.PostUpdateRequest; +import com.jpaboard.domain.post.infrastructure.PostRepository; +import com.jpaboard.domain.user.User; +import com.jpaboard.domain.user.infrastructure.UserRepository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional +@Service +public class PostServiceImpl implements PostService { + + private final PostRepository postRepository; + // Repository를 주입 받는 게 좋은지, Service를 주입 받는게 좋은지 + private final UserRepository userRepository; + + public PostServiceImpl(PostRepository postRepository, UserRepository userRepository) { + this.postRepository = postRepository; + this.userRepository = userRepository; + } + + public Long createPost(PostCreateRequest request) { + User user = userRepository.findById(request.userId()).orElseThrow(IllegalArgumentException::new); + Post post = PostConverter.convertRequestToEntity(request, user); + postRepository.save(post); + return post.getId(); + } + + public PostResponse findPostById(Long id) { + Post post = postRepository.findById(id).orElseThrow(IllegalArgumentException::new); + return PostConverter.convertEntityToResponse(post); + } + + public Page findPosts(Pageable pageable) { + return postRepository.findAll(pageable) + .map(PostConverter::convertEntityToResponse); + } + + public Page findPostByTitle(String title, Pageable pageable) { + return postRepository.findAllByTitleOrderByCreateAt(title, pageable) + .map(PostConverter::convertEntityToResponse); + } + + public Page findPostByContent(String content, Pageable pageable) { + return postRepository.findAllByTitleOrderByCreateAt(content, pageable) + .map(PostConverter::convertEntityToResponse); + } + + public Page findByKeyword(String keyword, Pageable pageable) { + return postRepository.findAllByTitleContainingOrContentContainingOrderByCreateAt(keyword, pageable) + .map(PostConverter::convertEntityToResponse); + } + + public void updatePost(Long id, PostUpdateRequest request) { + Post post = postRepository.findById(id).orElseThrow(IllegalArgumentException::new); + post.update(request); + } + + public void deletePostById(Long id) { + postRepository.deleteById(id); + } + +} diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java b/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java new file mode 100644 index 000000000..9da3df80e --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java @@ -0,0 +1,17 @@ +package com.jpaboard.domain.post.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record PostCreateRequest( + @NotBlank(message = "비회원은 게시글 작성 기능을 이용할 수 없습니다.") + Long userId, + + @Size(min = 1, message = "제목은 한 글자 이상입니다.") + String title, + + @NotNull + String content +) { +} diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostResponse.java b/src/main/java/com/jpaboard/domain/post/dto/PostResponse.java new file mode 100644 index 000000000..423d20e6a --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/dto/PostResponse.java @@ -0,0 +1,23 @@ +package com.jpaboard.domain.post.dto; + +import lombok.Builder; + +import java.time.LocalDateTime; + +public record PostResponse( + Long id, + String title, + String content, + LocalDateTime create_at, + LocalDateTime update_at +) { + + @Builder + public PostResponse(Long id, String title, String content, LocalDateTime create_at, LocalDateTime update_at) { + this.id = id; + this.title = title; + this.content = content; + this.create_at = create_at; + this.update_at = update_at; + } +} diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java b/src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java new file mode 100644 index 000000000..f70276a37 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java @@ -0,0 +1,13 @@ +package com.jpaboard.domain.post.dto; + +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record PostUpdateRequest( + @Size(min = 1, message = "제목은 한 글자 이상입니다.") + String title, + + @NotNull + String content +){ +} diff --git a/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java new file mode 100644 index 000000000..17ae7a71d --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java @@ -0,0 +1,18 @@ +package com.jpaboard.domain.post.infrastructure; + +import com.jpaboard.domain.post.Post; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +public interface PostRepository extends JpaRepository { + + Page findAll(Pageable pageable); + + Page findAllByTitleOrderByCreateAt(String title, Pageable pageable); + + Page findAllByContentContainingOrderByCreateAt(String content, Pageable pageable); + + Page findAllByTitleContainingOrContentContainingOrderByCreateAt(String keyword, Pageable pageable); +} diff --git a/src/main/java/com/jpaboard/domain/user/User.java b/src/main/java/com/jpaboard/domain/user/User.java new file mode 100644 index 000000000..3361504a6 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/user/User.java @@ -0,0 +1,35 @@ +package com.jpaboard.domain.user; + +import jakarta.persistence.*; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class User { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotBlank + @Size(min = 1, max = 10) + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "age") + private int age; + + @Column(name = "hobby") + private String hobby; + + @Builder + public User(String name, int age, String hobby) { + this.name = name; + this.age = age; + this.hobby = hobby; + } +} diff --git a/src/main/java/com/jpaboard/domain/user/UserConverter.java b/src/main/java/com/jpaboard/domain/user/UserConverter.java new file mode 100644 index 000000000..2a559419b --- /dev/null +++ b/src/main/java/com/jpaboard/domain/user/UserConverter.java @@ -0,0 +1,27 @@ +package com.jpaboard.domain.user; + +import com.jpaboard.domain.user.dto.UserCreationRequest; +import com.jpaboard.domain.user.dto.UserResponse; + +public final class UserConverter { + private UserConverter() { + + } + + public static UserResponse convertEntityToResponse(User user) { + return UserResponse.builder() + .id(user.getId()) + .name(user.getName()) + .age(user.getAge()) + .hobby(user.getHobby()) + .build(); + } + + public static User convertRequestToEntity(UserCreationRequest request) { + return User.builder() + .name(request.name()) + .age(request.age()) + .hobby(request.hobby()) + .build(); + } +} diff --git a/src/main/java/com/jpaboard/domain/user/application/UserService.java b/src/main/java/com/jpaboard/domain/user/application/UserService.java new file mode 100644 index 000000000..ac8aedb00 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/user/application/UserService.java @@ -0,0 +1,15 @@ +package com.jpaboard.domain.user.application; + +import com.jpaboard.domain.user.dto.UserCreationRequest; +import com.jpaboard.domain.user.dto.UserResponse; +import com.jpaboard.domain.user.dto.UserUpdateRequest; + +public interface UserService { + Long save(UserCreationRequest request); + + UserResponse findById(Long id); + + void updateById(Long id, UserUpdateRequest request); + + void deleteById(Long id); +} diff --git a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java new file mode 100644 index 000000000..182e40fc5 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java @@ -0,0 +1,42 @@ +package com.jpaboard.domain.user.application; + +import com.jpaboard.domain.user.User; +import com.jpaboard.domain.user.UserConverter; +import com.jpaboard.domain.user.dto.UserCreationRequest; +import com.jpaboard.domain.user.dto.UserUpdateRequest; +import com.jpaboard.domain.user.infrastructure.UserRepository; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public class UserServiceImpl implements UserService { + private final UserRepository userRepository; + + @Override + public Long save(UserCreationRequest request) { + User savedUser = UserConverter.convertRequestToEntity(request); + userRepository.save() + } + + @Override + public User findById(Long id) { + + return; + } + + @Override + public void updateById(Long id, UserUpdateRequest request) { + + } + + @Override + public void deleteById(Long id) { + + } +// void update(Long id, UserUpdateRequest request) { +// User found = findbyId(id) +// requestUser 생성 시점부터 id값을 증가시켜버려서 (mysql에 키를 생성) +// found.update(request); +//// or +//// found.update(requestUser);// controller -> service -> domain +// } +} diff --git a/src/main/java/com/jpaboard/domain/user/dto/UserCreationRequest.java b/src/main/java/com/jpaboard/domain/user/dto/UserCreationRequest.java new file mode 100644 index 000000000..8840c5c9d --- /dev/null +++ b/src/main/java/com/jpaboard/domain/user/dto/UserCreationRequest.java @@ -0,0 +1,13 @@ +package com.jpaboard.domain.user.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public record UserCreationRequest( + @NotBlank + @Size(min = 1, max = 10) + String name, + int age, + String hobby +) { +} diff --git a/src/main/java/com/jpaboard/domain/user/dto/UserResponse.java b/src/main/java/com/jpaboard/domain/user/dto/UserResponse.java new file mode 100644 index 000000000..7d0b29c1d --- /dev/null +++ b/src/main/java/com/jpaboard/domain/user/dto/UserResponse.java @@ -0,0 +1,12 @@ +package com.jpaboard.domain.user.dto; + +import lombok.Builder; + +@Builder +public record UserResponse ( + Long id, + String name, + int age, + String hobby +) { +} diff --git a/src/main/java/com/jpaboard/domain/user/dto/UserUpdateRequest.java b/src/main/java/com/jpaboard/domain/user/dto/UserUpdateRequest.java new file mode 100644 index 000000000..b6f0d67ed --- /dev/null +++ b/src/main/java/com/jpaboard/domain/user/dto/UserUpdateRequest.java @@ -0,0 +1,13 @@ +package com.jpaboard.domain.user.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public record UserUpdateRequest( + @NotBlank + @Size(min = 1, max = 10) + String name, + int age, + String hobby +) { +} diff --git a/src/main/java/com/jpaboard/domain/user/infrastructure/UserRepository.java b/src/main/java/com/jpaboard/domain/user/infrastructure/UserRepository.java new file mode 100644 index 000000000..098168443 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/user/infrastructure/UserRepository.java @@ -0,0 +1,7 @@ +package com.jpaboard.domain.user.infrastructure; + +import com.jpaboard.domain.user.User; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserRepository extends JpaRepository { +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/src/test/java/com/jpaboard/JpaBoardApplicationTests.java b/src/test/java/com/jpaboard/JpaBoardApplicationTests.java new file mode 100644 index 000000000..836f02595 --- /dev/null +++ b/src/test/java/com/jpaboard/JpaBoardApplicationTests.java @@ -0,0 +1,13 @@ +package com.jpaboard; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class JpaBoardApplicationTests { + + @Test + void contextLoads() { + } + +} From 7b551b39e90e20ca917ef51dd2806c6ac72138b9 Mon Sep 17 00:00:00 2001 From: sangminnim Date: Sat, 29 Jul 2023 22:28:57 +0900 Subject: [PATCH 02/59] =?UTF-8?q?User=20Service,=20Domain=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jpaboard/domain/user/User.java | 21 +++++++++- .../jpaboard/domain/user/UserConverter.java | 12 +++++- .../domain/user/application/UserService.java | 16 +++---- .../user/application/UserServiceImpl.java | 42 ++++++++++--------- .../{ => request}/UserCreationRequest.java | 2 +- .../dto/{ => request}/UserUpdateRequest.java | 2 +- .../user/dto/{ => response}/UserResponse.java | 2 +- 7 files changed, 65 insertions(+), 32 deletions(-) rename src/main/java/com/jpaboard/domain/user/dto/{ => request}/UserCreationRequest.java (83%) rename src/main/java/com/jpaboard/domain/user/dto/{ => request}/UserUpdateRequest.java (82%) rename src/main/java/com/jpaboard/domain/user/dto/{ => response}/UserResponse.java (75%) diff --git a/src/main/java/com/jpaboard/domain/user/User.java b/src/main/java/com/jpaboard/domain/user/User.java index 3361504a6..50a295d6f 100644 --- a/src/main/java/com/jpaboard/domain/user/User.java +++ b/src/main/java/com/jpaboard/domain/user/User.java @@ -12,7 +12,8 @@ @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) public class User { - @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; @NotBlank @@ -32,4 +33,22 @@ public User(String name, int age, String hobby) { this.age = age; this.hobby = hobby; } + + public void update(User user) { + changeName(user.getName()); + changeAge(user.getAge()); + changeHobby(user.getHobby()); + } + + private void changeName(String name) { + this.name = name; + } + + private void changeAge(int age) { + this.age = age; + } + + private void changeHobby(String hobby) { + this.hobby = hobby; + } } diff --git a/src/main/java/com/jpaboard/domain/user/UserConverter.java b/src/main/java/com/jpaboard/domain/user/UserConverter.java index 2a559419b..7d939eeca 100644 --- a/src/main/java/com/jpaboard/domain/user/UserConverter.java +++ b/src/main/java/com/jpaboard/domain/user/UserConverter.java @@ -1,7 +1,8 @@ package com.jpaboard.domain.user; -import com.jpaboard.domain.user.dto.UserCreationRequest; -import com.jpaboard.domain.user.dto.UserResponse; +import com.jpaboard.domain.user.dto.request.UserCreationRequest; +import com.jpaboard.domain.user.dto.request.UserUpdateRequest; +import com.jpaboard.domain.user.dto.response.UserResponse; public final class UserConverter { private UserConverter() { @@ -24,4 +25,11 @@ public static User convertRequestToEntity(UserCreationRequest request) { .hobby(request.hobby()) .build(); } + public static User convertRequestToEntity(UserUpdateRequest request) { + return User.builder() + .name(request.name()) + .age(request.age()) + .hobby(request.hobby()) + .build(); + } } diff --git a/src/main/java/com/jpaboard/domain/user/application/UserService.java b/src/main/java/com/jpaboard/domain/user/application/UserService.java index ac8aedb00..f5b4a27c4 100644 --- a/src/main/java/com/jpaboard/domain/user/application/UserService.java +++ b/src/main/java/com/jpaboard/domain/user/application/UserService.java @@ -1,15 +1,17 @@ package com.jpaboard.domain.user.application; -import com.jpaboard.domain.user.dto.UserCreationRequest; -import com.jpaboard.domain.user.dto.UserResponse; -import com.jpaboard.domain.user.dto.UserUpdateRequest; +import com.jpaboard.domain.user.dto.request.UserCreationRequest; +import com.jpaboard.domain.user.dto.response.UserResponse; +import com.jpaboard.domain.user.dto.request.UserUpdateRequest; +import jakarta.transaction.Transactional; public interface UserService { - Long save(UserCreationRequest request); - UserResponse findById(Long id); + Long createUser(UserCreationRequest request); - void updateById(Long id, UserUpdateRequest request); + UserResponse findCustomerById(Long id); - void deleteById(Long id); + void updateCustomer(Long id, UserUpdateRequest request); + + void deleteCustomer(Long id); } diff --git a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java index 182e40fc5..82fea3bcd 100644 --- a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java @@ -2,41 +2,45 @@ import com.jpaboard.domain.user.User; import com.jpaboard.domain.user.UserConverter; -import com.jpaboard.domain.user.dto.UserCreationRequest; -import com.jpaboard.domain.user.dto.UserUpdateRequest; +import com.jpaboard.domain.user.dto.request.UserCreationRequest; +import com.jpaboard.domain.user.dto.request.UserUpdateRequest; +import com.jpaboard.domain.user.dto.response.UserResponse; import com.jpaboard.domain.user.infrastructure.UserRepository; +import jakarta.persistence.EntityNotFoundException; +import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +@Service @RequiredArgsConstructor public class UserServiceImpl implements UserService { private final UserRepository userRepository; + @Transactional @Override - public Long save(UserCreationRequest request) { - User savedUser = UserConverter.convertRequestToEntity(request); - userRepository.save() + public Long createUser(UserCreationRequest request) { + User user = UserConverter.convertRequestToEntity(request); + return userRepository.save(user).getId(); } @Override - public User findById(Long id) { - - return; + public UserResponse findCustomerById(Long id) { + User user = userRepository.findById(id) + .orElseThrow(EntityNotFoundException::new); + return UserConverter.convertEntityToResponse(user); } + @Transactional @Override - public void updateById(Long id, UserUpdateRequest request) { - + public void updateCustomer(Long id, UserUpdateRequest request) { + User user = userRepository.findById(id) + .orElseThrow(EntityNotFoundException::new); + User forUpdate = UserConverter.convertRequestToEntity(request); + user.update(forUpdate); } @Override - public void deleteById(Long id) { - + public void deleteCustomer(Long id) { + userRepository.deleteById(id); } -// void update(Long id, UserUpdateRequest request) { -// User found = findbyId(id) -// requestUser 생성 시점부터 id값을 증가시켜버려서 (mysql에 키를 생성) -// found.update(request); -//// or -//// found.update(requestUser);// controller -> service -> domain -// } } diff --git a/src/main/java/com/jpaboard/domain/user/dto/UserCreationRequest.java b/src/main/java/com/jpaboard/domain/user/dto/request/UserCreationRequest.java similarity index 83% rename from src/main/java/com/jpaboard/domain/user/dto/UserCreationRequest.java rename to src/main/java/com/jpaboard/domain/user/dto/request/UserCreationRequest.java index 8840c5c9d..d4f71ee93 100644 --- a/src/main/java/com/jpaboard/domain/user/dto/UserCreationRequest.java +++ b/src/main/java/com/jpaboard/domain/user/dto/request/UserCreationRequest.java @@ -1,4 +1,4 @@ -package com.jpaboard.domain.user.dto; +package com.jpaboard.domain.user.dto.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/jpaboard/domain/user/dto/UserUpdateRequest.java b/src/main/java/com/jpaboard/domain/user/dto/request/UserUpdateRequest.java similarity index 82% rename from src/main/java/com/jpaboard/domain/user/dto/UserUpdateRequest.java rename to src/main/java/com/jpaboard/domain/user/dto/request/UserUpdateRequest.java index b6f0d67ed..2b9943d96 100644 --- a/src/main/java/com/jpaboard/domain/user/dto/UserUpdateRequest.java +++ b/src/main/java/com/jpaboard/domain/user/dto/request/UserUpdateRequest.java @@ -1,4 +1,4 @@ -package com.jpaboard.domain.user.dto; +package com.jpaboard.domain.user.dto.request; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/jpaboard/domain/user/dto/UserResponse.java b/src/main/java/com/jpaboard/domain/user/dto/response/UserResponse.java similarity index 75% rename from src/main/java/com/jpaboard/domain/user/dto/UserResponse.java rename to src/main/java/com/jpaboard/domain/user/dto/response/UserResponse.java index 7d0b29c1d..dbbd6d69d 100644 --- a/src/main/java/com/jpaboard/domain/user/dto/UserResponse.java +++ b/src/main/java/com/jpaboard/domain/user/dto/response/UserResponse.java @@ -1,4 +1,4 @@ -package com.jpaboard.domain.user.dto; +package com.jpaboard.domain.user.dto.response; import lombok.Builder; From 7b49b0997ecf78e95567ae4bafbeaca16d05fbb6 Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 18:16:28 +0900 Subject: [PATCH 03/59] =?UTF-8?q?feat:=20=EC=9C=A0=EC=A0=80=20&=20?= =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=BB=A8=ED=8A=B8=EB=A1=A4?= =?UTF-8?q?=EB=9F=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post/presentation/PostController.java | 74 +++++++++++++++++++ .../user/presentation/UserController.java | 39 ++++++++++ 2 files changed, 113 insertions(+) create mode 100644 src/main/java/com/jpaboard/domain/post/presentation/PostController.java create mode 100644 src/main/java/com/jpaboard/domain/user/presentation/UserController.java diff --git a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java new file mode 100644 index 000000000..b051e0792 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java @@ -0,0 +1,74 @@ +package com.jpaboard.domain.post.presentation; + +import com.jpaboard.domain.post.application.PostService; +import com.jpaboard.domain.post.dto.PostCreateRequest; +import com.jpaboard.domain.post.dto.PostResponse; +import com.jpaboard.domain.post.dto.PostUpdateRequest; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Optional; + +@RestController +@RequestMapping("/api/posts") +public class PostController { + + private final PostService postService; + + public PostController(PostService postService) { + this.postService = postService; + } + + @GetMapping("/new") + public ResponseEntity postCreate(@RequestBody PostCreateRequest request) { + Long postId = postService.createPost(request); + return new ResponseEntity<>(postId, HttpStatus.CREATED); + } + + @GetMapping("/{id}") + public ResponseEntity postDetail(@PathVariable Long id) { + PostResponse response = postService.findPostById(id); + return ResponseEntity.ok(response); + } + + @GetMapping + public ResponseEntity> findByCondition( + @RequestParam(name = "title", required = false) Optional title, + @RequestParam(name = "content", required = false) Optional content, + @RequestParam(name = "keyword", required = false) Optional keyword, + @PageableDefault Pageable pageable + ){ + if (title.isPresent()) { + Page response = postService.findPostByTitle(title.get(), pageable); + return ResponseEntity.ok(response); + } + if (content.isPresent()) { + Page response = postService.findPostByContent(content.get(), pageable); + return ResponseEntity.ok(response); + } + if (keyword.isPresent()) { + Page response = postService.findByKeyword(keyword.get(), pageable); + return ResponseEntity.ok(response); + } + + Page response = postService.findPosts(pageable); + return ResponseEntity.ok(response); + } + + @PostMapping("/{id}") + public ResponseEntity postUpdate(@PathVariable Long id, @RequestBody PostUpdateRequest request) { + postService.updatePost(id, request); + return ResponseEntity.ok().build(); + } + + @DeleteMapping("/{id}") + public ResponseEntity postDelete(@PathVariable Long id) { + postService.deletePostById(id); + return ResponseEntity.ok().build(); + } + +} diff --git a/src/main/java/com/jpaboard/domain/user/presentation/UserController.java b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java new file mode 100644 index 000000000..091bd6d20 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java @@ -0,0 +1,39 @@ +package com.jpaboard.domain.user.presentation; + +import com.jpaboard.domain.user.application.UserService; +import com.jpaboard.domain.user.dto.request.UserCreationRequest; +import com.jpaboard.domain.user.dto.request.UserUpdateRequest; +import com.jpaboard.domain.user.dto.response.UserResponse; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@RequestMapping("/api/users") +@RequiredArgsConstructor +public class UserController { + private final UserService userService; + + @PostMapping + public ResponseEntity userCreate(@RequestBody @Valid UserCreationRequest request) { + return ResponseEntity.status(HttpStatus.CREATED).body(userService.createUser(request)); + } + + @GetMapping("/{id}") + public ResponseEntity userFind(@PathVariable Long id) { + return ResponseEntity.ok(userService.findUserById(id)); + } + + @PutMapping("/{id}") + public ResponseEntity userUpdate(@PathVariable Long id, @RequestBody @Valid UserUpdateRequest request) { + userService.updateUser(id, request); + return ResponseEntity.ok().build(); + } + + @PutMapping("/{id}") + public ResponseEntity userDelete(@PathVariable Long id) { + userService.deleteUser(id); + return ResponseEntity.ok().build(); + } +} From 91c2ac42d5c45b1c86bd5d1d5312dc6cc2d03953 Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 18:16:54 +0900 Subject: [PATCH 04/59] =?UTF-8?q?chore:=20mockmvc=20=EC=9D=98=EC=A1=B4?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index cd8c2ccea..61381b088 100644 --- a/build.gradle +++ b/build.gradle @@ -31,6 +31,7 @@ dependencies { runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc' } tasks.named('test') { From 3e0a62bb9f465c02305dfc7fb6159990c27f2d60 Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 18:17:29 +0900 Subject: [PATCH 05/59] =?UTF-8?q?style:=20=EC=9C=A0=EC=A0=80=20=EC=84=9C?= =?UTF-8?q?=EB=B9=84=EC=8A=A4=20=EB=A9=94=EC=84=9C=EB=93=9C=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jpaboard/domain/user/application/UserService.java | 7 +++---- .../jpaboard/domain/user/application/UserServiceImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/user/application/UserService.java b/src/main/java/com/jpaboard/domain/user/application/UserService.java index f5b4a27c4..bc5bd43d0 100644 --- a/src/main/java/com/jpaboard/domain/user/application/UserService.java +++ b/src/main/java/com/jpaboard/domain/user/application/UserService.java @@ -3,15 +3,14 @@ import com.jpaboard.domain.user.dto.request.UserCreationRequest; import com.jpaboard.domain.user.dto.response.UserResponse; import com.jpaboard.domain.user.dto.request.UserUpdateRequest; -import jakarta.transaction.Transactional; public interface UserService { Long createUser(UserCreationRequest request); - UserResponse findCustomerById(Long id); + UserResponse findUserById(Long id); - void updateCustomer(Long id, UserUpdateRequest request); + void updateUser(Long id, UserUpdateRequest request); - void deleteCustomer(Long id); + void deleteUser(Long id); } diff --git a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java index 82fea3bcd..102e213e7 100644 --- a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java @@ -24,7 +24,7 @@ public Long createUser(UserCreationRequest request) { } @Override - public UserResponse findCustomerById(Long id) { + public UserResponse findUserById(Long id) { User user = userRepository.findById(id) .orElseThrow(EntityNotFoundException::new); return UserConverter.convertEntityToResponse(user); @@ -32,7 +32,7 @@ public UserResponse findCustomerById(Long id) { @Transactional @Override - public void updateCustomer(Long id, UserUpdateRequest request) { + public void updateUser(Long id, UserUpdateRequest request) { User user = userRepository.findById(id) .orElseThrow(EntityNotFoundException::new); User forUpdate = UserConverter.convertRequestToEntity(request); @@ -40,7 +40,7 @@ public void updateCustomer(Long id, UserUpdateRequest request) { } @Override - public void deleteCustomer(Long id) { + public void deleteUser(Long id) { userRepository.deleteById(id); } } From 122facb18bbc57b8a6af6899cef3bb8d016f109b Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 21:38:05 +0900 Subject: [PATCH 06/59] =?UTF-8?q?refactor:=20=EC=BF=BC=EB=A6=AC=20?= =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpaboard/domain/post/application/PostServiceImpl.java | 6 +++--- .../domain/post/infrastructure/PostRepository.java | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java index 266832b75..09c723305 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -44,17 +44,17 @@ public Page findPosts(Pageable pageable) { } public Page findPostByTitle(String title, Pageable pageable) { - return postRepository.findAllByTitleOrderByCreateAt(title, pageable) + return postRepository.findAllByTitleContaining(title, pageable) .map(PostConverter::convertEntityToResponse); } public Page findPostByContent(String content, Pageable pageable) { - return postRepository.findAllByTitleOrderByCreateAt(content, pageable) + return postRepository.findAllByContentContaining(content, pageable) .map(PostConverter::convertEntityToResponse); } public Page findByKeyword(String keyword, Pageable pageable) { - return postRepository.findAllByTitleContainingOrContentContainingOrderByCreateAt(keyword, pageable) + return postRepository.findAllByTitleContainingOrContentContaining(keyword, pageable) .map(PostConverter::convertEntityToResponse); } diff --git a/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java index 17ae7a71d..cbc448a7e 100644 --- a/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java +++ b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java @@ -4,15 +4,14 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; public interface PostRepository extends JpaRepository { Page findAll(Pageable pageable); - Page findAllByTitleOrderByCreateAt(String title, Pageable pageable); + Page findAllByTitleContaining(String title, Pageable pageable); - Page findAllByContentContainingOrderByCreateAt(String content, Pageable pageable); + Page findAllByContentContaining(String content, Pageable pageable); - Page findAllByTitleContainingOrContentContainingOrderByCreateAt(String keyword, Pageable pageable); + Page findAllByTitleContainingOrContentContaining(String keyword, Pageable pageable); } From 329e50488e1389e9c560c7d9571c3d1fd055f04d Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 22:40:27 +0900 Subject: [PATCH 07/59] =?UTF-8?q?feat:=20application.yml=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 1 - src/main/resources/application.yml | 20 ++++++++++++++++++++ src/test/resources/application.yml | 5 +++++ 3 files changed, 25 insertions(+), 1 deletion(-) delete mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml create mode 100644 src/test/resources/application.yml diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 8b1378917..000000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 000000000..1746ab684 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,20 @@ +spring: + datasource: + url: jdbc:h2:~/board + username: sa + password: + + h2: + console: + enabled: true + path: /h2-console + + jpa: + open-in-view: false + hibernate: + ddl-auto: create + properties: + hibernate: + format_sql: true + show_sql: true + diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml new file mode 100644 index 000000000..3e86de1b3 --- /dev/null +++ b/src/test/resources/application.yml @@ -0,0 +1,5 @@ +spring: + datasource: + url: jdbc:h2:mem:board + username: sa + password: From a9ccdb231bd771f63090bf2d1c6622cfb6150de1 Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 22:40:52 +0900 Subject: [PATCH 08/59] =?UTF-8?q?feat:=20BaseEntity=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20@EnableJpaAuditing=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/JpaBoardApplication.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/jpaboard/JpaBoardApplication.java b/src/main/java/com/jpaboard/JpaBoardApplication.java index 2a9704846..83d2a72c7 100644 --- a/src/main/java/com/jpaboard/JpaBoardApplication.java +++ b/src/main/java/com/jpaboard/JpaBoardApplication.java @@ -2,8 +2,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @SpringBootApplication +@EnableJpaAuditing public class JpaBoardApplication { public static void main(String[] args) { From 0d755bb7b0656feeddd85c17364bba2e90054927 Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 22:41:10 +0900 Subject: [PATCH 09/59] =?UTF-8?q?refactor:=20=ED=8C=8C=EB=9D=BC=EB=AF=B8?= =?UTF-8?q?=ED=84=B0=20=EA=B0=9C=EC=88=98=20=EB=A7=9E=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8D=98=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jpaboard/domain/post/application/PostServiceImpl.java | 2 +- .../com/jpaboard/domain/post/infrastructure/PostRepository.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java index 09c723305..244b19436 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -54,7 +54,7 @@ public Page findPostByContent(String content, Pageable pageable) { } public Page findByKeyword(String keyword, Pageable pageable) { - return postRepository.findAllByTitleContainingOrContentContaining(keyword, pageable) + return postRepository.findAllByTitleContainingOrContentContaining(keyword, keyword, pageable) .map(PostConverter::convertEntityToResponse); } diff --git a/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java index cbc448a7e..fc93ea1ca 100644 --- a/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java +++ b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java @@ -13,5 +13,5 @@ public interface PostRepository extends JpaRepository { Page findAllByContentContaining(String content, Pageable pageable); - Page findAllByTitleContainingOrContentContaining(String keyword, Pageable pageable); + Page findAllByTitleContainingOrContentContaining(String title, String content, Pageable pageable); } From 5adb4c00ce7952438f548a55fed40bb8017bf96d Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 22:41:49 +0900 Subject: [PATCH 10/59] =?UTF-8?q?refactor:=20User=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EB=84=A4=EC=9E=84=20=EB=B0=8F=20BaseEntity=20?= =?UTF-8?q?=EC=83=81=EC=86=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/user/User.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/jpaboard/domain/user/User.java b/src/main/java/com/jpaboard/domain/user/User.java index 50a295d6f..9252780f3 100644 --- a/src/main/java/com/jpaboard/domain/user/User.java +++ b/src/main/java/com/jpaboard/domain/user/User.java @@ -1,5 +1,6 @@ package com.jpaboard.domain.user; +import com.jpaboard.common.BaseEntity; import jakarta.persistence.*; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; @@ -10,8 +11,9 @@ @Entity @Getter +@Table(name = "users") @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class User { +public class User extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; From bab9da8db28ac99315b27838188f70955c9d5d80 Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 23:05:14 +0900 Subject: [PATCH 11/59] =?UTF-8?q?test:=20post=20CRUD=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post/application/PostServiceImplTest.java | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java diff --git a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java new file mode 100644 index 000000000..640945a7e --- /dev/null +++ b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java @@ -0,0 +1,121 @@ +package com.jpaboard.domain.post.application; + +import com.jpaboard.domain.post.dto.PostCreateRequest; +import com.jpaboard.domain.post.dto.PostResponse; +import com.jpaboard.domain.post.dto.PostUpdateRequest; +import com.jpaboard.domain.user.application.UserService; +import com.jpaboard.domain.user.dto.request.UserCreationRequest; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; + +import static org.assertj.core.api.Assertions.*; + +@SpringBootTest +class PostServiceImplTest { + + @Autowired + private PostService postService; + + @Autowired + private UserService userService; + + @Test + void create_post_test() { + Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + + Long postId = postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); + + assertThat(postId).isNotNull(); + } + + @Test + void find_post_by_id_test() { + Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + Long postId = postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); + + PostResponse storedPost = postService.findPostById(postId); + + assertThat(postId).isEqualTo(storedPost.id()); + } + + @Test + void find_all_posts_test() { + Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.2")); + + Pageable pageable = PageRequest.of(0, 10); + Page posts = postService.findPosts(pageable); + + assertThat(posts.getTotalElements()).isEqualTo(2); + } + + @Test + void find_post_by_title() { + String title = "타겟"; + Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + postService.createPost(new PostCreateRequest(userId, title, "본문은 없습니다.")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.2")); + + Pageable pageable = PageRequest.of(0, 10); + Page posts = postService.findPostByTitle(title, pageable); + + assertThat(posts.getTotalElements()).isEqualTo(1); + } + + @Test + void find_post_by_content() { + String content = "타겟"; + Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + postService.createPost(new PostCreateRequest(userId, "제목입니다", "본문은 없습니다.")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요2", content)); + + Pageable pageable = PageRequest.of(0, 10); + Page posts = postService.findPostByContent(content, pageable); + + assertThat(posts.getTotalElements()).isEqualTo(1); + } + + @Test + void find_post_by_keyword() { + String keyword = "타겟"; + Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + postService.createPost(new PostCreateRequest(userId, keyword, "본문은 없습니다.")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요2", keyword)); + + Pageable pageable = PageRequest.of(0, 10); + Page posts = postService.findByKeyword(keyword, pageable); + + assertThat(posts.getTotalElements()).isEqualTo(2); + } + + @Test + void update_post_test() { + Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + Long postId = postService.createPost(new PostCreateRequest(userId, "제목", "본문은 없습니다.")); + PostUpdateRequest request = new PostUpdateRequest("수정된 제목", "수정된 본문"); + + postService.updatePost(postId, request); + PostResponse updatedPost = postService.findPostById(postId); + + assertThat(updatedPost.title()).isEqualTo(request.title()); + assertThat(updatedPost.content()).isEqualTo(request.content()); + } + + @Test + void delete_post_test() { + Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + Long postId = postService.createPost(new PostCreateRequest(userId, "제목", "본문은 없습니다.")); + + postService.deletePostById(postId); + + assertThatThrownBy(() -> postService.findPostById(postId)) + .isInstanceOf(IllegalArgumentException.class); + } + +} From bf63073a732d11427bd6c37c3e2848f40ceae624 Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 23:09:31 +0900 Subject: [PATCH 12/59] =?UTF-8?q?refactor:=20@SpringBootTest=20->=20@DataJ?= =?UTF-8?q?paTest=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/post/application/PostServiceImplTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java index 640945a7e..e65fb8f65 100644 --- a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java +++ b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java @@ -7,17 +7,25 @@ import com.jpaboard.domain.user.dto.request.UserCreationRequest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import org.springframework.data.web.PageableDefault; import static org.assertj.core.api.Assertions.*; -@SpringBootTest +@DataJpaTest class PostServiceImplTest { + @TestConfiguration + @ComponentScan(basePackages = {"com.jpaboard.domain"}) + static class Config{ + } + @Autowired private PostService postService; From d80b82f153b2b5a94d93f29818120efa485b294c Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 23:18:32 +0900 Subject: [PATCH 13/59] =?UTF-8?q?refactor:=20=EA=B2=8C=EC=8B=9C=EA=B8=80?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20GetMapping=20->=20PostMapping=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jpaboard/domain/post/presentation/PostController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java index b051e0792..69a132c26 100644 --- a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java +++ b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java @@ -23,7 +23,7 @@ public PostController(PostService postService) { this.postService = postService; } - @GetMapping("/new") + @PostMapping("/new") public ResponseEntity postCreate(@RequestBody PostCreateRequest request) { Long postId = postService.createPost(request); return new ResponseEntity<>(postId, HttpStatus.CREATED); From 713a262b02c724165fbe031e0c6af3c7aeed75c9 Mon Sep 17 00:00:00 2001 From: weonest Date: Sun, 30 Jul 2023 23:51:13 +0900 Subject: [PATCH 14/59] =?UTF-8?q?test:=20PostController=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post/presentation/PostController.java | 2 +- .../post/presentation/PostControllerTest.java | 95 +++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java diff --git a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java index 69a132c26..2283a39ae 100644 --- a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java +++ b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java @@ -59,7 +59,7 @@ public ResponseEntity> findByCondition( return ResponseEntity.ok(response); } - @PostMapping("/{id}") + @PatchMapping("/{id}") public ResponseEntity postUpdate(@PathVariable Long id, @RequestBody PostUpdateRequest request) { postService.updatePost(id, request); return ResponseEntity.ok().build(); diff --git a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java new file mode 100644 index 000000000..4d4ecfef1 --- /dev/null +++ b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java @@ -0,0 +1,95 @@ +package com.jpaboard.domain.post.presentation; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.jpaboard.domain.post.application.PostService; +import com.jpaboard.domain.post.dto.PostCreateRequest; +import com.jpaboard.domain.post.dto.PostUpdateRequest; +import com.jpaboard.domain.user.application.UserService; +import com.jpaboard.domain.user.dto.request.UserCreationRequest; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.util.LinkedMultiValueMap; + +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@AutoConfigureMockMvc +@SpringBootTest +class PostControllerTest { + + @Autowired + private ObjectMapper objectMapper; + + @Autowired + private MockMvc mockMvc; + + @Autowired + private UserService userService; + + @Autowired + private PostService postService; + + Long userId; + + Long postId; + + @BeforeEach + void setUp() { + userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + postId = postService.createPost(new PostCreateRequest(userId, "테스트 제목1", "테스트 본문1")); + postService.createPost(new PostCreateRequest(userId, "테스트 제목2", "테스트 본문2")); + postService.createPost(new PostCreateRequest(userId, "테스트 제목3", "테스트 본문3")); + } + + @Test + void post_create_test() throws Exception { + PostCreateRequest request = new PostCreateRequest(userId, "게시글 생성 테스트", "테스트 본문"); + + mockMvc.perform(post("/api/posts/new") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isCreated()) + .andDo(print()); + } + + @ParameterizedTest + @CsvSource(value = {"제목1, null, null", "null, 본문2, null", "null, null, 테스트", "null, null, null"}, nullValues = "null") + void find_by_condition_test(String title, String content, String keyword) throws Exception { + LinkedMultiValueMap paramMap = new LinkedMultiValueMap<>(); + paramMap.add("title", title); + paramMap.add("content", content); + paramMap.add("keyword", keyword); + + mockMvc.perform(get("/api/posts") + .params(paramMap)) + .andExpect(status().isOk()) + .andDo(print()); + } + + @Test + void post_update_test() throws Exception { + PostUpdateRequest request = new PostUpdateRequest("수정된 제목", "수정된 본문"); + + mockMvc.perform(patch("/api/posts/{id}", postId) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isOk()) + .andDo(print()); + } + + @Test + void post_delete_test() throws Exception { + mockMvc.perform(delete("/api/posts/{id}", postId)) + .andExpect(status().isOk()) + .andDo(print()); + } + +} \ No newline at end of file From f159130c95727b667cc07c63fd7eebb0a7f56758 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 10:20:14 +0900 Subject: [PATCH 15/59] =?UTF-8?q?chore:=20restdocs=20=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EB=B9=8C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/build.gradle b/build.gradle index 61381b088..5974a8303 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,8 @@ plugins { id 'java' id 'org.springframework.boot' version '3.0.9' id 'io.spring.dependency-management' version '1.1.2' + // restdocs + id 'org.asciidoctor.jvm.convert' version '3.3.2' } group = 'com' @@ -37,3 +39,39 @@ dependencies { tasks.named('test') { useJUnitPlatform() } + +ext { + snippetsDir = file('build/generated-snippets') +} + +bootJar { + dependsOn asciidoctor + copy { + from "${asciidoctor.outputDir}" + into 'BOOT-INF/classes/static/docs' + } +} + +test { + useJUnitPlatform() + outputs.dir snippetsDir +} + +asciidoctor { + inputs.dir snippetsDir + dependsOn test +} + +asciidoctor.doFirst { + delete file('src/main/resources/static/docs') +} + +task copyDocument(type: Copy) { + dependsOn asciidoctor + from file("build/docs/asciidoc") + into file("src/main/resources/static/docs") +} + +build { + dependsOn copyDocument +} \ No newline at end of file From 14b1fc152963534d117c530346a99ee1249d048c Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 10:20:53 +0900 Subject: [PATCH 16/59] =?UTF-8?q?feat:=20restdocs=20=EB=AA=85=EC=84=B8=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(=EB=AF=B8=EC=99=84=EC=84=B1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/docs/asciidoc/index.adoc | 18 ++++++++ .../post/presentation/PostControllerTest.java | 46 ++++++++++++++++--- 2 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 src/docs/asciidoc/index.adoc diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc new file mode 100644 index 000000000..7ab6a74c2 --- /dev/null +++ b/src/docs/asciidoc/index.adoc @@ -0,0 +1,18 @@ += Spring REST Docs +:toc: left +:toclevels: 2 +:sectlinks: + +[[resources-post]] +== Post + +[[resources-post-create]] +=== Post 생성 + +==== HTTP request + +include::{snippets}/post-create/http-request.adoc[] +include::{snippets}/post-create/request-fields.adoc[] +==== HTTP response + +include::{snippets}/post-create/http-response.adoc[] diff --git a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java index 4d4ecfef1..523b9157d 100644 --- a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java +++ b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java @@ -11,16 +11,25 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.MediaType; +import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; +import org.springframework.restdocs.payload.JsonFieldType; import org.springframework.test.web.servlet.MockMvc; import org.springframework.util.LinkedMultiValueMap; +import java.util.Collections; + +import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.restdocs.request.RequestDocumentation.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +@AutoConfigureRestDocs @AutoConfigureMockMvc @SpringBootTest class PostControllerTest { @@ -57,7 +66,14 @@ void post_create_test() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(request))) .andExpect(status().isCreated()) - .andDo(print()); + .andDo(print()) + .andDo(document("post-create", + requestFields( + fieldWithPath("userId").type(JsonFieldType.NUMBER).description("유저 Id"), + fieldWithPath("title").type(JsonFieldType.STRING).description("제목"), + fieldWithPath("content").type(JsonFieldType.STRING).description("본문") + ), + responseBody(Collections.singletonMap("postId", "게시글 Id")))); } @ParameterizedTest @@ -68,10 +84,18 @@ void find_by_condition_test(String title, String content, String keyword) throws paramMap.add("content", content); paramMap.add("keyword", keyword); - mockMvc.perform(get("/api/posts") + mockMvc.perform(RestDocumentationRequestBuilders.get("/api/posts") .params(paramMap)) .andExpect(status().isOk()) - .andDo(print()); + .andDo(print()) + .andDo(document("post-find", pathParameters( + parameterWithName("title").description("제목"), + parameterWithName("content").description("본문"), + parameterWithName("keyword").description("제목 + 본문") + ), + responseFields( + fieldWithPath("[].id").type(JsonFieldType.NUMBER).description("게시글 Id") + ))); } @Test @@ -82,14 +106,22 @@ void post_update_test() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(request))) .andExpect(status().isOk()) - .andDo(print()); + .andDo(print()) + .andDo(document("post-update", + requestFields( + fieldWithPath("title").type(JsonFieldType.STRING).description("제목"), + fieldWithPath("content").type(JsonFieldType.STRING).description("본문") + ))); } @Test void post_delete_test() throws Exception { - mockMvc.perform(delete("/api/posts/{id}", postId)) + mockMvc.perform(RestDocumentationRequestBuilders.delete("/api/posts/{id}", postId)) .andExpect(status().isOk()) - .andDo(print()); + .andDo(print()) + .andDo(document("post-delete", pathParameters( + parameterWithName("id").description("게시글 Id") + ))); } -} \ No newline at end of file +} From ad48a0f8a72024d3c38fd57ed210054ed9c35922 Mon Sep 17 00:00:00 2001 From: sangminnim Date: Mon, 31 Jul 2023 15:56:23 +0900 Subject: [PATCH 17/59] =?UTF-8?q?test:=20Rest=20Docs=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/presentation/UserController.java | 3 +- .../user/presentation/UserControllerTest.java | 121 ++++++++++++++++++ 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java diff --git a/src/main/java/com/jpaboard/domain/user/presentation/UserController.java b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java index 091bd6d20..9965ce8fd 100644 --- a/src/main/java/com/jpaboard/domain/user/presentation/UserController.java +++ b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java @@ -10,6 +10,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +@RestController @RequestMapping("/api/users") @RequiredArgsConstructor public class UserController { @@ -31,7 +32,7 @@ public ResponseEntity userUpdate(@PathVariable Long id, @RequestBody @Vali return ResponseEntity.ok().build(); } - @PutMapping("/{id}") + @DeleteMapping("/{id}") public ResponseEntity userDelete(@PathVariable Long id) { userService.deleteUser(id); return ResponseEntity.ok().build(); diff --git a/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java new file mode 100644 index 000000000..05d7ee464 --- /dev/null +++ b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java @@ -0,0 +1,121 @@ +package com.jpaboard.domain.user.presentation; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.jpaboard.domain.user.application.UserService; +import com.jpaboard.domain.user.dto.request.UserCreationRequest; +import com.jpaboard.domain.user.dto.request.UserUpdateRequest; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.restdocs.payload.JsonFieldType; +import org.springframework.test.web.servlet.MockMvc; + +import java.util.Collections; + +import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; +import static org.springframework.restdocs.payload.PayloadDocumentation.*; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@AutoConfigureRestDocs +@AutoConfigureMockMvc +@SpringBootTest +class UserControllerTest { + @Autowired + private ObjectMapper objectMapper; + + @Autowired + private MockMvc mockMvc; + + @Autowired + private UserService userService; + + private Long userId; + + @BeforeEach + void setup() { + userId = userService.createUser(new UserCreationRequest("이름", 10, "취미")); + } + + @Test + @DisplayName("유저를 생성할 수 있다.") + void testUserSave() throws Exception { + UserCreationRequest request = new UserCreationRequest("홍길동", 100, "도둑질"); + + mockMvc.perform( + post("/api/users") + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request)) + ).andExpect(status().isCreated()) + .andDo(print()) + .andDo(document( + "user-create", + requestFields( + fieldWithPath("name").type(JsonFieldType.STRING).description("이름"), + fieldWithPath("age").type(JsonFieldType.NUMBER).description("나이"), + fieldWithPath("hobby").type(JsonFieldType.STRING).description("취미") + ), + responseBody(Collections.singletonMap("postId", "게시글 Id")) + )); + } + + @Test + @DisplayName("유저를 조회할 수 있다.") + void testUserFind() throws Exception { + mockMvc.perform(get("/api/users/{id}", userId) + .contentType(MediaType.APPLICATION_JSON) + ).andExpect(status().isOk()) + .andDo(print()) + .andDo(document( + "user-find", + requestBody(), + responseFields( + fieldWithPath("id").type(JsonFieldType.NUMBER).description("아이디"), + fieldWithPath("name").type(JsonFieldType.STRING).description("이름"), + fieldWithPath("age").type(JsonFieldType.NUMBER).description("나이"), + fieldWithPath("hobby").type(JsonFieldType.STRING).description("취미") + ) + )); + } + + @Test + @DisplayName("유저를 수정할 수 있다.") + void testUserUpdate() throws Exception { + UserUpdateRequest request = new UserUpdateRequest("수정된 이름", 100, "수정된 취미"); + + mockMvc.perform(put("/api/users/{id}", userId) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request)) + ).andExpect(status().isOk()) + .andDo(print()) + .andDo( + document( + "get-find", + requestFields( + fieldWithPath("name").type(JsonFieldType.STRING).description("수정할 이름"), + fieldWithPath("age").type(JsonFieldType.NUMBER).description("수정할 나이"), + fieldWithPath("hobby").type(JsonFieldType.STRING).description("수정할 취미") + ) + ) + ); + } + + @Test + @DisplayName("유저를 삭제할 수 있다.") + void testUserDelete() throws Exception { + mockMvc.perform(delete("/api/users/{id}", userId) + .contentType(MediaType.APPLICATION_JSON) + ).andExpect(status().isOk()) + .andDo(print()) + .andDo(document("user-delete" + , requestBody() + , responseBody() + )); + } +} From 9ad2c378eebaa6c0af2f28c877a7d0850934deea Mon Sep 17 00:00:00 2001 From: sangminnim Date: Mon, 31 Jul 2023 16:02:42 +0900 Subject: [PATCH 18/59] =?UTF-8?q?refactor:=20=EC=8B=9D=EB=B3=84=EC=9E=90?= =?UTF-8?q?=20=EC=9D=B4=EB=A6=84=20=EB=B3=80=EA=B2=BD,=20=EC=93=B8?= =?UTF-8?q?=EB=8D=B0=20=EC=97=86=EB=8A=94=20=ED=95=AD=EB=AA=A9=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/presentation/UserControllerTest.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java index 05d7ee464..3c9ec7649 100644 --- a/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java +++ b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java @@ -61,7 +61,9 @@ void testUserSave() throws Exception { fieldWithPath("age").type(JsonFieldType.NUMBER).description("나이"), fieldWithPath("hobby").type(JsonFieldType.STRING).description("취미") ), - responseBody(Collections.singletonMap("postId", "게시글 Id")) + responseFields( + fieldWithPath("id").type(JsonFieldType.NUMBER).description("아이디") + ) )); } @@ -74,7 +76,6 @@ void testUserFind() throws Exception { .andDo(print()) .andDo(document( "user-find", - requestBody(), responseFields( fieldWithPath("id").type(JsonFieldType.NUMBER).description("아이디"), fieldWithPath("name").type(JsonFieldType.STRING).description("이름"), @@ -96,7 +97,7 @@ void testUserUpdate() throws Exception { .andDo(print()) .andDo( document( - "get-find", + "user-update", requestFields( fieldWithPath("name").type(JsonFieldType.STRING).description("수정할 이름"), fieldWithPath("age").type(JsonFieldType.NUMBER).description("수정할 나이"), @@ -113,9 +114,6 @@ void testUserDelete() throws Exception { .contentType(MediaType.APPLICATION_JSON) ).andExpect(status().isOk()) .andDo(print()) - .andDo(document("user-delete" - , requestBody() - , responseBody() - )); + .andDo(document("user-delete")); } } From 3d35317343d300cd24e88c8bc79b763143b18c8e Mon Sep 17 00:00:00 2001 From: sangminnim Date: Mon, 31 Jul 2023 16:03:18 +0900 Subject: [PATCH 19/59] =?UTF-8?q?refactor:=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20import=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpaboard/domain/user/presentation/UserControllerTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java index 3c9ec7649..b8c3379ee 100644 --- a/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java +++ b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java @@ -15,8 +15,6 @@ import org.springframework.restdocs.payload.JsonFieldType; import org.springframework.test.web.servlet.MockMvc; -import java.util.Collections; - import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; import static org.springframework.restdocs.payload.PayloadDocumentation.*; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; From 701cf014fb0fe857265b86ec9d2a07836a932ab7 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 21:45:18 +0900 Subject: [PATCH 20/59] =?UTF-8?q?feat:=20Post=20restdocs=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/docs/asciidoc/index.adoc | 24 ++++++++-- .../post/presentation/PostControllerTest.java | 48 ++++++++++++++++--- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc index 7ab6a74c2..845cc3450 100644 --- a/src/docs/asciidoc/index.adoc +++ b/src/docs/asciidoc/index.adoc @@ -8,11 +8,29 @@ [[resources-post-create]] === Post 생성 - ==== HTTP request - include::{snippets}/post-create/http-request.adoc[] include::{snippets}/post-create/request-fields.adoc[] -==== HTTP response +==== HTTP response include::{snippets}/post-create/http-response.adoc[] + +=== Post 조회 +==== HTTP request +include::{snippets}/post-find/http-request.adoc[] +include::{snippets}/post-find/path-parameters.adoc[] + +==== HTTP response +include::{snippets}/post-find/http-response.adoc[] +include::{snippets}/post-find/response-fields.adoc[] + +=== Post 수정 +==== HTTP request +include::{snippets}/post-update/http-request.adoc[] +include::{snippets}/post-update/path-parameters.adoc[] +include::{snippets}/post-update/request-fields.adoc[] + +=== Post 삭제 +==== HTTP request +include::{snippets}/post-delete/httpie-request.adoc[] +include::{snippets}/post-delete/path-parameters.adoc[] \ No newline at end of file diff --git a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java index 523b9157d..50b67db22 100644 --- a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java +++ b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java @@ -72,7 +72,12 @@ void post_create_test() throws Exception { fieldWithPath("userId").type(JsonFieldType.NUMBER).description("유저 Id"), fieldWithPath("title").type(JsonFieldType.STRING).description("제목"), fieldWithPath("content").type(JsonFieldType.STRING).description("본문") - ), + ) +// 반환 타입이 한 개인경우 아래 주석과 같이 입력하면 에러가 발생하는데 이유를 모르겠습니다. +// responseFields( +// fieldWithPath("id").type(JsonFieldType.NUMBER).description("아이디") +// ) + , responseBody(Collections.singletonMap("postId", "게시글 Id")))); } @@ -89,12 +94,39 @@ void find_by_condition_test(String title, String content, String keyword) throws .andExpect(status().isOk()) .andDo(print()) .andDo(document("post-find", pathParameters( - parameterWithName("title").description("제목"), - parameterWithName("content").description("본문"), - parameterWithName("keyword").description("제목 + 본문") + parameterWithName("title").description("제목").optional(), + parameterWithName("content").description("본문").optional(), + parameterWithName("keyword").description("제목 + 본문").optional() ), responseFields( - fieldWithPath("[].id").type(JsonFieldType.NUMBER).description("게시글 Id") + fieldWithPath("content.[].id").type(JsonFieldType.NUMBER).description("게시글 Id"), + fieldWithPath("content.[].title").type(JsonFieldType.STRING).description("제목"), + fieldWithPath("content.[].content").type(JsonFieldType.STRING).description("본문"), + fieldWithPath("content.[].create_at").type(JsonFieldType.STRING).description("생성일"), + fieldWithPath("content.[].update_at").type(JsonFieldType.STRING).description("수정일"), + + fieldWithPath("pageable.sort.empty").type(JsonFieldType.BOOLEAN).description("정렬 데이터 비었는지 여부"), + fieldWithPath("pageable.sort.unsorted").type(JsonFieldType.BOOLEAN).description("비정렬 여부"), + fieldWithPath("pageable.sort.sorted").type(JsonFieldType.BOOLEAN).description("정렬 여부"), + + fieldWithPath("pageable.offset").type(JsonFieldType.NUMBER).description("몇 번째 데이터 인지 (0부터 시작)"), + fieldWithPath("pageable.pageSize").type(JsonFieldType.NUMBER).description("한 페이지당 조회할 데이터 개수"), + fieldWithPath("pageable.pageNumber").type(JsonFieldType.NUMBER).description("현재 페이지 번호"), + fieldWithPath("pageable.unpaged").type(JsonFieldType.BOOLEAN).description("페이징 정보를 포함하지 않는지 여부"), + fieldWithPath("pageable.paged").type(JsonFieldType.BOOLEAN).description("페이징 정보를 포함하는지 여부"), + + fieldWithPath("last").type(JsonFieldType.BOOLEAN).description("마지막 페이지인지 여부"), + fieldWithPath("totalElements").type(JsonFieldType.NUMBER).description("전체 요소 개수"), + fieldWithPath("totalPages").type(JsonFieldType.NUMBER).description("전체 페이지 개수"), + fieldWithPath("size").type(JsonFieldType.NUMBER).description("한 페이지당 조회할 데이터 개수"), + fieldWithPath("number").type(JsonFieldType.NUMBER).description("현재 페이지 번호"), + + fieldWithPath("sort.empty").type(JsonFieldType.BOOLEAN).description("정렬 데이터가 비었는지 여부"), + fieldWithPath("sort.unsorted").type(JsonFieldType.BOOLEAN).description("비정렬 여부"), + fieldWithPath("sort.sorted").type(JsonFieldType.BOOLEAN).description("정렬 여부"), + fieldWithPath("first").type(JsonFieldType.BOOLEAN).description("첫 번째 페이지인지 여부"), + fieldWithPath("numberOfElements").type(JsonFieldType.NUMBER).description("전체 데이터 개수"), + fieldWithPath("empty").type(JsonFieldType.BOOLEAN).description("데이터가 비었는지 여부") ))); } @@ -102,12 +134,14 @@ void find_by_condition_test(String title, String content, String keyword) throws void post_update_test() throws Exception { PostUpdateRequest request = new PostUpdateRequest("수정된 제목", "수정된 본문"); - mockMvc.perform(patch("/api/posts/{id}", postId) + mockMvc.perform(RestDocumentationRequestBuilders.patch("/api/posts/{id}", postId) .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(request))) .andExpect(status().isOk()) .andDo(print()) - .andDo(document("post-update", + .andDo(document("post-update", pathParameters( + parameterWithName("id").description("게시글 Id") + ), requestFields( fieldWithPath("title").type(JsonFieldType.STRING).description("제목"), fieldWithPath("content").type(JsonFieldType.STRING).description("본문") From bca215a235d2fd634f73ce96b12cc6fab6959298 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 21:47:51 +0900 Subject: [PATCH 21/59] =?UTF-8?q?refactor:=20Post=20=EB=B9=8C=EB=8D=94=20?= =?UTF-8?q?=ED=8C=A8=ED=84=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/post/Post.java | 2 +- .../com/jpaboard/domain/post/dto/PostResponse.java | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/Post.java b/src/main/java/com/jpaboard/domain/post/Post.java index 01507a80b..8430241a8 100644 --- a/src/main/java/com/jpaboard/domain/post/Post.java +++ b/src/main/java/com/jpaboard/domain/post/Post.java @@ -29,7 +29,7 @@ public class Post extends BaseEntity { private User user; @Builder - public Post(String title, String content, User user) { + private Post(String title, String content, User user) { this.title = title; this.content = content; this.user = user; diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostResponse.java b/src/main/java/com/jpaboard/domain/post/dto/PostResponse.java index 423d20e6a..ff06d4e79 100644 --- a/src/main/java/com/jpaboard/domain/post/dto/PostResponse.java +++ b/src/main/java/com/jpaboard/domain/post/dto/PostResponse.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; +@Builder public record PostResponse( Long id, String title, @@ -11,13 +12,4 @@ public record PostResponse( LocalDateTime create_at, LocalDateTime update_at ) { - - @Builder - public PostResponse(Long id, String title, String content, LocalDateTime create_at, LocalDateTime update_at) { - this.id = id; - this.title = title; - this.content = content; - this.create_at = create_at; - this.update_at = update_at; - } } From f7ce43955a9e13795fc4c45d1799b65287e36899 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 21:49:22 +0900 Subject: [PATCH 22/59] =?UTF-8?q?refactor:=20PostConverter=20=EB=A1=AC?= =?UTF-8?q?=EB=B3=B5=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/post/PostConverter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/PostConverter.java b/src/main/java/com/jpaboard/domain/post/PostConverter.java index 10d1c9d53..700d51eb0 100644 --- a/src/main/java/com/jpaboard/domain/post/PostConverter.java +++ b/src/main/java/com/jpaboard/domain/post/PostConverter.java @@ -3,12 +3,12 @@ import com.jpaboard.domain.post.dto.PostCreateRequest; import com.jpaboard.domain.post.dto.PostResponse; import com.jpaboard.domain.user.User; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +@NoArgsConstructor(access = AccessLevel.PRIVATE) public class PostConverter { - private PostConverter() { - } - public static Post convertRequestToEntity(PostCreateRequest request, User user) { return Post.builder() .title(request.title()) From e79a91e59e7f11fea85fc5bace90a7409cb875dc Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 21:57:50 +0900 Subject: [PATCH 23/59] =?UTF-8?q?refactor:=20PostServiceImpl=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81=20(=EC=83=9D=EC=84=B1=EC=9E=90=20?= =?UTF-8?q?=EB=B0=8F=20=ED=8A=B8=EB=9E=9C=EC=9E=AD=EC=85=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/post/application/PostServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java index 244b19436..e48843f6a 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -8,24 +8,22 @@ import com.jpaboard.domain.post.infrastructure.PostRepository; import com.jpaboard.domain.user.User; import com.jpaboard.domain.user.infrastructure.UserRepository; +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; -@Transactional +@Transactional(readOnly = true) @Service +@RequiredArgsConstructor public class PostServiceImpl implements PostService { private final PostRepository postRepository; // Repository를 주입 받는 게 좋은지, Service를 주입 받는게 좋은지 private final UserRepository userRepository; - public PostServiceImpl(PostRepository postRepository, UserRepository userRepository) { - this.postRepository = postRepository; - this.userRepository = userRepository; - } - + @Transactional public Long createPost(PostCreateRequest request) { User user = userRepository.findById(request.userId()).orElseThrow(IllegalArgumentException::new); Post post = PostConverter.convertRequestToEntity(request, user); @@ -58,11 +56,13 @@ public Page findByKeyword(String keyword, Pageable pageable) { .map(PostConverter::convertEntityToResponse); } + @Transactional public void updatePost(Long id, PostUpdateRequest request) { Post post = postRepository.findById(id).orElseThrow(IllegalArgumentException::new); post.update(request); } + @Transactional public void deletePostById(Long id) { postRepository.deleteById(id); } From 1ef517bce4129b832ce33a7b3d8b51e8bdbf47f4 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 22:09:51 +0900 Subject: [PATCH 24/59] =?UTF-8?q?refactor:=20PostServiceImplTest=20?= =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/post/application/PostServiceImplTest.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java index e65fb8f65..99d304263 100644 --- a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java +++ b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java @@ -8,15 +8,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; @DataJpaTest class PostServiceImplTest { From 0b693443db2b506f5ca4ff66099412b342d39742 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 22:16:03 +0900 Subject: [PATCH 25/59] =?UTF-8?q?refactor:=20PostController=20=EB=A6=AC?= =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpaboard/domain/post/presentation/PostController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java index 2283a39ae..6c6014920 100644 --- a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java +++ b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java @@ -4,6 +4,7 @@ import com.jpaboard.domain.post.dto.PostCreateRequest; import com.jpaboard.domain.post.dto.PostResponse; import com.jpaboard.domain.post.dto.PostUpdateRequest; +import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; @@ -15,14 +16,11 @@ @RestController @RequestMapping("/api/posts") +@RequiredArgsConstructor public class PostController { private final PostService postService; - public PostController(PostService postService) { - this.postService = postService; - } - @PostMapping("/new") public ResponseEntity postCreate(@RequestBody PostCreateRequest request) { Long postId = postService.createPost(request); From cfc1d44e0b97fd1011b58021eca600472911a5a8 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 22:22:53 +0900 Subject: [PATCH 26/59] =?UTF-8?q?refactor:=20@Valid=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpaboard/domain/post/presentation/PostController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java index 6c6014920..2971c99e1 100644 --- a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java +++ b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java @@ -4,6 +4,7 @@ import com.jpaboard.domain.post.dto.PostCreateRequest; import com.jpaboard.domain.post.dto.PostResponse; import com.jpaboard.domain.post.dto.PostUpdateRequest; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -22,7 +23,7 @@ public class PostController { private final PostService postService; @PostMapping("/new") - public ResponseEntity postCreate(@RequestBody PostCreateRequest request) { + public ResponseEntity postCreate(@RequestBody @Valid PostCreateRequest request) { Long postId = postService.createPost(request); return new ResponseEntity<>(postId, HttpStatus.CREATED); } @@ -58,7 +59,7 @@ public ResponseEntity> findByCondition( } @PatchMapping("/{id}") - public ResponseEntity postUpdate(@PathVariable Long id, @RequestBody PostUpdateRequest request) { + public ResponseEntity postUpdate(@PathVariable Long id, @RequestBody @Valid PostUpdateRequest request) { postService.updatePost(id, request); return ResponseEntity.ok().build(); } From 50f0b39da9bb499a1ce1fd45e8f3776d7b290eca Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 22:49:21 +0900 Subject: [PATCH 27/59] =?UTF-8?q?refactor:=20Long=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20Valid=20=EC=96=B4=EB=85=B8?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jpaboard/domain/post/dto/PostCreateRequest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java b/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java index 9da3df80e..187bf68a8 100644 --- a/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java +++ b/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java @@ -1,11 +1,10 @@ package com.jpaboard.domain.post.dto; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; public record PostCreateRequest( - @NotBlank(message = "비회원은 게시글 작성 기능을 이용할 수 없습니다.") + @NotNull(message = "비회원은 게시글 작성 기능을 이용할 수 없습니다.") Long userId, @Size(min = 1, message = "제목은 한 글자 이상입니다.") From 562fe517087f1c611130c5ecd04a4d78d1434212 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 31 Jul 2023 22:49:39 +0900 Subject: [PATCH 28/59] =?UTF-8?q?refactor:=20restdocs=20=EC=A0=81=EC=9A=A9?= =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/docs/asciidoc/index.adoc | 1 + .../domain/post/presentation/PostController.java | 6 +++--- .../post/presentation/PostControllerTest.java | 15 ++++++++------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc index 845cc3450..10de680b9 100644 --- a/src/docs/asciidoc/index.adoc +++ b/src/docs/asciidoc/index.adoc @@ -14,6 +14,7 @@ include::{snippets}/post-create/request-fields.adoc[] ==== HTTP response include::{snippets}/post-create/http-response.adoc[] +include::{snippets}/post-create/response-headers.adoc[] === Post 조회 ==== HTTP request diff --git a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java index 2971c99e1..f8850413f 100644 --- a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java +++ b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java @@ -9,10 +9,10 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.net.URI; import java.util.Optional; @RestController @@ -23,9 +23,9 @@ public class PostController { private final PostService postService; @PostMapping("/new") - public ResponseEntity postCreate(@RequestBody @Valid PostCreateRequest request) { + public ResponseEntity postCreate(@RequestBody @Valid PostCreateRequest request) { Long postId = postService.createPost(request); - return new ResponseEntity<>(postId, HttpStatus.CREATED); + return ResponseEntity.created(URI.create("/api/posts/" + postId)).build(); } @GetMapping("/{id}") diff --git a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java index 50b67db22..f0e1e1347 100644 --- a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java +++ b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java @@ -14,6 +14,7 @@ import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders; import org.springframework.restdocs.payload.JsonFieldType; @@ -22,6 +23,8 @@ import java.util.Collections; +import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName; +import static org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; import static org.springframework.restdocs.payload.PayloadDocumentation.*; import static org.springframework.restdocs.request.RequestDocumentation.*; @@ -68,17 +71,15 @@ void post_create_test() throws Exception { .andExpect(status().isCreated()) .andDo(print()) .andDo(document("post-create", + requestFields( fieldWithPath("userId").type(JsonFieldType.NUMBER).description("유저 Id"), fieldWithPath("title").type(JsonFieldType.STRING).description("제목"), fieldWithPath("content").type(JsonFieldType.STRING).description("본문") - ) -// 반환 타입이 한 개인경우 아래 주석과 같이 입력하면 에러가 발생하는데 이유를 모르겠습니다. -// responseFields( -// fieldWithPath("id").type(JsonFieldType.NUMBER).description("아이디") -// ) - , - responseBody(Collections.singletonMap("postId", "게시글 Id")))); + ), + responseHeaders( + headerWithName(HttpHeaders.LOCATION).description("리다이렉션 URI") + ))); } @ParameterizedTest From 452d9cc1b4daa7eef4afb7b4f151db43b3ee382a Mon Sep 17 00:00:00 2001 From: sangminnim Date: Mon, 31 Jul 2023 23:30:44 +0900 Subject: [PATCH 29/59] =?UTF-8?q?refactor:=20Lombok=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/user/UserConverter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/user/UserConverter.java b/src/main/java/com/jpaboard/domain/user/UserConverter.java index 7d939eeca..a8fe185df 100644 --- a/src/main/java/com/jpaboard/domain/user/UserConverter.java +++ b/src/main/java/com/jpaboard/domain/user/UserConverter.java @@ -3,12 +3,11 @@ import com.jpaboard.domain.user.dto.request.UserCreationRequest; import com.jpaboard.domain.user.dto.request.UserUpdateRequest; import com.jpaboard.domain.user.dto.response.UserResponse; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; +@NoArgsConstructor(access = AccessLevel.PRIVATE) public final class UserConverter { - private UserConverter() { - - } - public static UserResponse convertEntityToResponse(User user) { return UserResponse.builder() .id(user.getId()) @@ -25,6 +24,7 @@ public static User convertRequestToEntity(UserCreationRequest request) { .hobby(request.hobby()) .build(); } + public static User convertRequestToEntity(UserUpdateRequest request) { return User.builder() .name(request.name()) From fa33c8ffce833556709fc108c66dc0c3dce4a1ed Mon Sep 17 00:00:00 2001 From: sangminnim Date: Mon, 31 Jul 2023 23:35:10 +0900 Subject: [PATCH 30/59] =?UTF-8?q?feat:=20userCreate=20api=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpaboard/domain/user/application/UserServiceImpl.java | 4 +++- .../jpaboard/domain/user/presentation/UserController.java | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java index 102e213e7..b6d3d3217 100644 --- a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java @@ -7,11 +7,12 @@ import com.jpaboard.domain.user.dto.response.UserResponse; import com.jpaboard.domain.user.infrastructure.UserRepository; import jakarta.persistence.EntityNotFoundException; -import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service +@Transactional(readOnly = true) @RequiredArgsConstructor public class UserServiceImpl implements UserService { private final UserRepository userRepository; @@ -39,6 +40,7 @@ public void updateUser(Long id, UserUpdateRequest request) { user.update(forUpdate); } + @Transactional @Override public void deleteUser(Long id) { userRepository.deleteById(id); diff --git a/src/main/java/com/jpaboard/domain/user/presentation/UserController.java b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java index 9965ce8fd..600260f80 100644 --- a/src/main/java/com/jpaboard/domain/user/presentation/UserController.java +++ b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java @@ -6,9 +6,9 @@ import com.jpaboard.domain.user.dto.response.UserResponse; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import java.net.URI; @RestController @RequestMapping("/api/users") @@ -17,8 +17,9 @@ public class UserController { private final UserService userService; @PostMapping - public ResponseEntity userCreate(@RequestBody @Valid UserCreationRequest request) { - return ResponseEntity.status(HttpStatus.CREATED).body(userService.createUser(request)); + public ResponseEntity userCreate(@RequestBody @Valid UserCreationRequest request) { + Long userId = userService.createUser(request); + return ResponseEntity.created(URI.create("/api/users/" + userId)).build(); } @GetMapping("/{id}") From 4c7fd9bcd0aa03c3d91e5c1ec7f485d5b8ef376b Mon Sep 17 00:00:00 2001 From: sangminnim Date: Mon, 31 Jul 2023 23:35:55 +0900 Subject: [PATCH 31/59] =?UTF-8?q?test:=20rest=20docs=EB=A5=BC=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20test=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/presentation/UserControllerTest.java | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java index b8c3379ee..b22283bc0 100644 --- a/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java +++ b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java @@ -11,13 +11,18 @@ import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs; import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.restdocs.payload.JsonFieldType; import org.springframework.test.web.servlet.MockMvc; +import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName; +import static org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; +import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.*; import static org.springframework.restdocs.payload.PayloadDocumentation.*; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; +import static org.springframework.restdocs.request.RequestDocumentation.pathParameters; import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @@ -52,30 +57,34 @@ void testUserSave() throws Exception { .content(objectMapper.writeValueAsString(request)) ).andExpect(status().isCreated()) .andDo(print()) - .andDo(document( - "user-create", - requestFields( - fieldWithPath("name").type(JsonFieldType.STRING).description("이름"), - fieldWithPath("age").type(JsonFieldType.NUMBER).description("나이"), - fieldWithPath("hobby").type(JsonFieldType.STRING).description("취미") - ), - responseFields( - fieldWithPath("id").type(JsonFieldType.NUMBER).description("아이디") - ) - )); + .andDo( + document("user-create", + requestFields( + fieldWithPath("name").type(JsonFieldType.STRING).description("이름"), + fieldWithPath("age").type(JsonFieldType.NUMBER).description("나이"), + fieldWithPath("hobby").type(JsonFieldType.STRING).description("취미") + ), + responseHeaders( + headerWithName(HttpHeaders.LOCATION).description("리다이렉션 URI") + )) + ); } @Test @DisplayName("유저를 조회할 수 있다.") void testUserFind() throws Exception { - mockMvc.perform(get("/api/users/{id}", userId) - .contentType(MediaType.APPLICATION_JSON) + mockMvc.perform( + get("/api/users/{id}", userId) + .contentType(MediaType.APPLICATION_JSON) ).andExpect(status().isOk()) .andDo(print()) .andDo(document( "user-find", + pathParameters( + parameterWithName("id").description("유저 아이디") + ), responseFields( - fieldWithPath("id").type(JsonFieldType.NUMBER).description("아이디"), + fieldWithPath("id").type(JsonFieldType.NUMBER).description("유저 아이디"), fieldWithPath("name").type(JsonFieldType.STRING).description("이름"), fieldWithPath("age").type(JsonFieldType.NUMBER).description("나이"), fieldWithPath("hobby").type(JsonFieldType.STRING).description("취미") @@ -96,6 +105,9 @@ void testUserUpdate() throws Exception { .andDo( document( "user-update", + pathParameters( // path 파라미터 정보 입력 + parameterWithName("id").description("유저 아이디") + ), requestFields( fieldWithPath("name").type(JsonFieldType.STRING).description("수정할 이름"), fieldWithPath("age").type(JsonFieldType.NUMBER).description("수정할 나이"), @@ -112,6 +124,9 @@ void testUserDelete() throws Exception { .contentType(MediaType.APPLICATION_JSON) ).andExpect(status().isOk()) .andDo(print()) - .andDo(document("user-delete")); + .andDo(document("user-delete", + pathParameters( // path 파라미터 정보 입력 + parameterWithName("id").description("유저 아이디") + ))); } } From 901fad149cf2a9abfef9627c19408ec28095ff74 Mon Sep 17 00:00:00 2001 From: sangminnim Date: Mon, 31 Jul 2023 23:56:45 +0900 Subject: [PATCH 32/59] =?UTF-8?q?feat:=20rest=20docs=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/docs/asciidoc/index.adoc | 37 ++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc index 10de680b9..bb2cc97e2 100644 --- a/src/docs/asciidoc/index.adoc +++ b/src/docs/asciidoc/index.adoc @@ -33,5 +33,38 @@ include::{snippets}/post-update/request-fields.adoc[] === Post 삭제 ==== HTTP request -include::{snippets}/post-delete/httpie-request.adoc[] -include::{snippets}/post-delete/path-parameters.adoc[] \ No newline at end of file +include::{snippets}/post-delete/http-request.adoc[] +include::{snippets}/post-delete/path-parameters.adoc[] + +[[resources-user]] +== User + +[[resources-user-create]] +=== User 생성 +==== HTTP request +include::{snippets}/user-create/http-request.adoc[] +include::{snippets}/user-create/request-fields.adoc[] + +==== HTTP response +include::{snippets}/user-create/http-response.adoc[] +include::{snippets}/user-create/response-headers.adoc[] + +=== User 조회 +==== HTTP request +include::{snippets}/user-find/http-request.adoc[] +include::{snippets}/user-find/path-parameters.adoc[] + +==== HTTP response +include::{snippets}/user-find/http-response.adoc[] +include::{snippets}/user-find/response-fields.adoc[] + +=== User 수정 +==== HTTP request +include::{snippets}/user-update/http-request.adoc[] +include::{snippets}/user-update/path-parameters.adoc[] +include::{snippets}/user-update/request-fields.adoc[] + +=== Post 삭제 +==== HTTP request +include::{snippets}/user-delete/http-request.adoc[] +include::{snippets}/user-delete/path-parameters.adoc[] From 3f7f91d424b9c2ea6acf39a5738377df5d37e7de Mon Sep 17 00:00:00 2001 From: sangminnim Date: Tue, 1 Aug 2023 00:03:03 +0900 Subject: [PATCH 33/59] =?UTF-8?q?chore:=20=EC=98=A4=ED=83=80=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/docs/asciidoc/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/asciidoc/index.adoc b/src/docs/asciidoc/index.adoc index bb2cc97e2..865500986 100644 --- a/src/docs/asciidoc/index.adoc +++ b/src/docs/asciidoc/index.adoc @@ -64,7 +64,7 @@ include::{snippets}/user-update/http-request.adoc[] include::{snippets}/user-update/path-parameters.adoc[] include::{snippets}/user-update/request-fields.adoc[] -=== Post 삭제 +=== User 삭제 ==== HTTP request include::{snippets}/user-delete/http-request.adoc[] include::{snippets}/user-delete/path-parameters.adoc[] From 439894037a81444e10be03e74e55598987f6b942 Mon Sep 17 00:00:00 2001 From: sangminnim Date: Tue, 1 Aug 2023 01:09:28 +0900 Subject: [PATCH 34/59] =?UTF-8?q?test:=20UserService=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/application/UserServiceImplTest.java | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java diff --git a/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java b/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java new file mode 100644 index 000000000..289c2123e --- /dev/null +++ b/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java @@ -0,0 +1,62 @@ +package com.jpaboard.domain.user.application; + +import com.jpaboard.domain.user.dto.request.UserCreationRequest; +import com.jpaboard.domain.user.dto.request.UserUpdateRequest; +import com.jpaboard.domain.user.dto.response.UserResponse; +import jakarta.persistence.EntityNotFoundException; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.context.annotation.Import; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +@DataJpaTest +@Import(UserServiceImpl.class) +class UserServiceImplTest { + @Autowired + private UserService userService; + + private Long userId; + + @BeforeEach + void setup() { + userId = userService.createUser(new UserCreationRequest("이름", 20, "취미")); + } + + @Test + @DisplayName("유저를 조회할 수 있다.") + void testFindUserById() { + // given + // when + UserResponse userResponse = userService.findUserById(userId); + // then + assertThat(userResponse).isNotNull(); + } + + @Test + @DisplayName("유저를 수정할 수 있다.") + void testUpdate() { + // given + UserUpdateRequest request = new UserUpdateRequest("수정된 이름", 22, "수정된 취미"); + // when + userService.updateUser(userId, request); + UserResponse userResponse = userService.findUserById(userId); + // then + assertThat(userResponse).isNotNull(); + } + + @Test + @DisplayName("유저를 삭제할 수 있다.") + void testDelete() { + // given + // when + userService.deleteUser(userId); + // then + assertThatThrownBy(() -> userService.findUserById(userId)) + .isInstanceOf(EntityNotFoundException.class); + } +} From 27c79484cb1805f0b81856a955ba2d0471078f90 Mon Sep 17 00:00:00 2001 From: sangminnim Date: Tue, 1 Aug 2023 14:33:15 +0900 Subject: [PATCH 35/59] =?UTF-8?q?feat:=20=EC=83=9D=EC=84=B1=EC=9E=90=20?= =?UTF-8?q?=EC=A0=91=EA=B7=BC=EC=A7=80=EC=8B=9C=EC=9E=90=20private?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/user/User.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/jpaboard/domain/user/User.java b/src/main/java/com/jpaboard/domain/user/User.java index 9252780f3..2512b2c0f 100644 --- a/src/main/java/com/jpaboard/domain/user/User.java +++ b/src/main/java/com/jpaboard/domain/user/User.java @@ -30,7 +30,7 @@ public class User extends BaseEntity { private String hobby; @Builder - public User(String name, int age, String hobby) { + private User(String name, int age, String hobby) { this.name = name; this.age = age; this.hobby = hobby; From 05bfe24d796240dc52b6c9ee27d104cd595ce98a Mon Sep 17 00:00:00 2001 From: weonest Date: Tue, 1 Aug 2023 22:30:45 +0900 Subject: [PATCH 36/59] =?UTF-8?q?refactor:=20create=20path=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jpaboard/domain/post/presentation/PostController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java index f8850413f..e7650c55c 100644 --- a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java +++ b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java @@ -22,7 +22,7 @@ public class PostController { private final PostService postService; - @PostMapping("/new") + @PostMapping public ResponseEntity postCreate(@RequestBody @Valid PostCreateRequest request) { Long postId = postService.createPost(request); return ResponseEntity.created(URI.create("/api/posts/" + postId)).build(); From 09110011b036e7d3540bd045572f0d62d215dcf0 Mon Sep 17 00:00:00 2001 From: weonest Date: Wed, 2 Aug 2023 18:51:39 +0900 Subject: [PATCH 37/59] =?UTF-8?q?feedback:=20=EC=A0=9C=EB=AA=A9,=20?= =?UTF-8?q?=EB=B3=B8=EB=AC=B8=20=EA=B8=B8=EC=9D=B4=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/post/Post.java | 9 +++++---- .../com/jpaboard/domain/post/dto/PostCreateRequest.java | 2 +- .../com/jpaboard/domain/post/dto/PostUpdateRequest.java | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/Post.java b/src/main/java/com/jpaboard/domain/post/Post.java index 8430241a8..ec18d4ea3 100644 --- a/src/main/java/com/jpaboard/domain/post/Post.java +++ b/src/main/java/com/jpaboard/domain/post/Post.java @@ -18,9 +18,10 @@ public class Post extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(nullable = false) + @Column(nullable = false, length = 50) private String title; + @Lob @Column(nullable = false) private String content; @@ -35,8 +36,8 @@ private Post(String title, String content, User user) { this.user = user; } - public void update(PostUpdateRequest request) { - this.title = request.title(); - this.content = request.content(); + public void update(String title, String content) { + this.title = title; + this.content = content; } } diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java b/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java index 187bf68a8..cf88b6235 100644 --- a/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java +++ b/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java @@ -7,7 +7,7 @@ public record PostCreateRequest( @NotNull(message = "비회원은 게시글 작성 기능을 이용할 수 없습니다.") Long userId, - @Size(min = 1, message = "제목은 한 글자 이상입니다.") + @Size(min = 1, max = 50, message = "제목은 1 ~ 50 글자 사이입니다.") String title, @NotNull diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java b/src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java index f70276a37..bb5877bbf 100644 --- a/src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java +++ b/src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java @@ -4,7 +4,7 @@ import jakarta.validation.constraints.Size; public record PostUpdateRequest( - @Size(min = 1, message = "제목은 한 글자 이상입니다.") + @Size(min = 1, max = 50, message = "제목은 1 ~ 50 글자 사이입니다.") String title, @NotNull From 338969ff116b07a8f4ca7b9026f7f8689d64c6b7 Mon Sep 17 00:00:00 2001 From: weonest Date: Wed, 2 Aug 2023 19:29:33 +0900 Subject: [PATCH 38/59] =?UTF-8?q?feedback:=20pageable=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=A0=95=EB=B3=B4=EB=A7=8C=20=EB=8B=B4=EC=9D=84=20?= =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jpaboard/domain/post/Post.java | 1 - .../jpaboard/domain/post/PostConverter.java | 20 +++++++++++-- .../domain/post/application/PostService.java | 16 +++++----- .../post/application/PostServiceImpl.java | 29 +++++++++++-------- .../dto/{ => request}/PostCreateRequest.java | 2 +- .../dto/{ => request}/PostUpdateRequest.java | 2 +- .../post/dto/response/PostPageResponse.java | 18 ++++++++++++ .../post/dto/{ => response}/PostResponse.java | 2 +- .../post/presentation/PostController.java | 18 ++++++------ .../post/application/PostServiceImplTest.java | 24 +++++++-------- 10 files changed, 85 insertions(+), 47 deletions(-) rename src/main/java/com/jpaboard/domain/post/dto/{ => request}/PostCreateRequest.java (89%) rename src/main/java/com/jpaboard/domain/post/dto/{ => request}/PostUpdateRequest.java (85%) create mode 100644 src/main/java/com/jpaboard/domain/post/dto/response/PostPageResponse.java rename src/main/java/com/jpaboard/domain/post/dto/{ => response}/PostResponse.java (82%) diff --git a/src/main/java/com/jpaboard/domain/post/Post.java b/src/main/java/com/jpaboard/domain/post/Post.java index ec18d4ea3..9177998cd 100644 --- a/src/main/java/com/jpaboard/domain/post/Post.java +++ b/src/main/java/com/jpaboard/domain/post/Post.java @@ -1,7 +1,6 @@ package com.jpaboard.domain.post; import com.jpaboard.common.BaseEntity; -import com.jpaboard.domain.post.dto.PostUpdateRequest; import com.jpaboard.domain.user.User; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/com/jpaboard/domain/post/PostConverter.java b/src/main/java/com/jpaboard/domain/post/PostConverter.java index 700d51eb0..a298cff7d 100644 --- a/src/main/java/com/jpaboard/domain/post/PostConverter.java +++ b/src/main/java/com/jpaboard/domain/post/PostConverter.java @@ -1,10 +1,12 @@ package com.jpaboard.domain.post; -import com.jpaboard.domain.post.dto.PostCreateRequest; -import com.jpaboard.domain.post.dto.PostResponse; +import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.response.PostPageResponse; +import com.jpaboard.domain.post.dto.response.PostResponse; import com.jpaboard.domain.user.User; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import org.springframework.data.domain.Page; @NoArgsConstructor(access = AccessLevel.PRIVATE) public class PostConverter { @@ -26,4 +28,18 @@ public static PostResponse convertEntityToResponse(Post post) { .update_at(post.getUpdateAt()) .build(); } + + public static PostPageResponse convertEntityToPageResponse(Page posts) { + return PostPageResponse.builder() + .content(posts.getContent()) + .numberOfElements(posts.getNumberOfElements()) + .totalElements(posts.getTotalElements()) + .pageNumber(posts.getNumber()) + .pageSize(posts.getPageable().getPageSize()) + .isFirstPage(posts.isFirst()) + .hasNextPage(posts.hasNext()) + .isLastPage(posts.isLast()) + .build(); + + } } diff --git a/src/main/java/com/jpaboard/domain/post/application/PostService.java b/src/main/java/com/jpaboard/domain/post/application/PostService.java index a0da45a0f..e86c0c7e4 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostService.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostService.java @@ -1,9 +1,9 @@ package com.jpaboard.domain.post.application; -import com.jpaboard.domain.post.dto.PostCreateRequest; -import com.jpaboard.domain.post.dto.PostResponse; -import com.jpaboard.domain.post.dto.PostUpdateRequest; -import org.springframework.data.domain.Page; +import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.response.PostPageResponse; +import com.jpaboard.domain.post.dto.response.PostResponse; +import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import org.springframework.data.domain.Pageable; public interface PostService { @@ -12,13 +12,13 @@ public interface PostService { PostResponse findPostById(Long id); - Page findPosts(Pageable pageable); + PostPageResponse findPosts(Pageable pageable); - Page findPostByTitle(String title, Pageable pageable); + PostPageResponse findPostByTitle(String title, Pageable pageable); - Page findPostByContent(String content, Pageable pageable); + PostPageResponse findPostByContent(String content, Pageable pageable); - Page findByKeyword(String keyword, Pageable pageable); + PostPageResponse findByKeyword(String keyword, Pageable pageable); void updatePost(Long id, PostUpdateRequest request); diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java index e48843f6a..32f1c0267 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -2,9 +2,10 @@ import com.jpaboard.domain.post.Post; import com.jpaboard.domain.post.PostConverter; -import com.jpaboard.domain.post.dto.PostCreateRequest; -import com.jpaboard.domain.post.dto.PostResponse; -import com.jpaboard.domain.post.dto.PostUpdateRequest; +import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.response.PostPageResponse; +import com.jpaboard.domain.post.dto.response.PostResponse; +import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import com.jpaboard.domain.post.infrastructure.PostRepository; import com.jpaboard.domain.user.User; import com.jpaboard.domain.user.infrastructure.UserRepository; @@ -36,30 +37,34 @@ public PostResponse findPostById(Long id) { return PostConverter.convertEntityToResponse(post); } - public Page findPosts(Pageable pageable) { - return postRepository.findAll(pageable) + public PostPageResponse findPosts(Pageable pageable) { + Page posts = postRepository.findAll(pageable) .map(PostConverter::convertEntityToResponse); + return PostConverter.convertEntityToPageResponse(posts); } - public Page findPostByTitle(String title, Pageable pageable) { - return postRepository.findAllByTitleContaining(title, pageable) + public PostPageResponse findPostByTitle(String title, Pageable pageable) { + Page posts = postRepository.findAllByTitleContaining(title, pageable) .map(PostConverter::convertEntityToResponse); + return PostConverter.convertEntityToPageResponse(posts); } - public Page findPostByContent(String content, Pageable pageable) { - return postRepository.findAllByContentContaining(content, pageable) + public PostPageResponse findPostByContent(String content, Pageable pageable) { + Page posts = postRepository.findAllByContentContaining(content, pageable) .map(PostConverter::convertEntityToResponse); + return PostConverter.convertEntityToPageResponse(posts); } - public Page findByKeyword(String keyword, Pageable pageable) { - return postRepository.findAllByTitleContainingOrContentContaining(keyword, keyword, pageable) + public PostPageResponse findByKeyword(String keyword, Pageable pageable) { + Page posts = postRepository.findAllByTitleContainingOrContentContaining(keyword, keyword, pageable) .map(PostConverter::convertEntityToResponse); + return PostConverter.convertEntityToPageResponse(posts); } @Transactional public void updatePost(Long id, PostUpdateRequest request) { Post post = postRepository.findById(id).orElseThrow(IllegalArgumentException::new); - post.update(request); + post.update(request.title(), request.content()); } @Transactional diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java b/src/main/java/com/jpaboard/domain/post/dto/request/PostCreateRequest.java similarity index 89% rename from src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java rename to src/main/java/com/jpaboard/domain/post/dto/request/PostCreateRequest.java index cf88b6235..f6865ad68 100644 --- a/src/main/java/com/jpaboard/domain/post/dto/PostCreateRequest.java +++ b/src/main/java/com/jpaboard/domain/post/dto/request/PostCreateRequest.java @@ -1,4 +1,4 @@ -package com.jpaboard.domain.post.dto; +package com.jpaboard.domain.post.dto.request; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java b/src/main/java/com/jpaboard/domain/post/dto/request/PostUpdateRequest.java similarity index 85% rename from src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java rename to src/main/java/com/jpaboard/domain/post/dto/request/PostUpdateRequest.java index bb5877bbf..85ce674f9 100644 --- a/src/main/java/com/jpaboard/domain/post/dto/PostUpdateRequest.java +++ b/src/main/java/com/jpaboard/domain/post/dto/request/PostUpdateRequest.java @@ -1,4 +1,4 @@ -package com.jpaboard.domain.post.dto; +package com.jpaboard.domain.post.dto.request; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/jpaboard/domain/post/dto/response/PostPageResponse.java b/src/main/java/com/jpaboard/domain/post/dto/response/PostPageResponse.java new file mode 100644 index 000000000..93e204993 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/dto/response/PostPageResponse.java @@ -0,0 +1,18 @@ +package com.jpaboard.domain.post.dto.response; + +import lombok.Builder; + +import java.util.List; + +@Builder +public record PostPageResponse( + List content, + long numberOfElements, + long totalElements, + int pageNumber, + int pageSize, + boolean isFirstPage, + boolean hasNextPage, + boolean isLastPage +) { +} diff --git a/src/main/java/com/jpaboard/domain/post/dto/PostResponse.java b/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java similarity index 82% rename from src/main/java/com/jpaboard/domain/post/dto/PostResponse.java rename to src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java index ff06d4e79..cad349fe1 100644 --- a/src/main/java/com/jpaboard/domain/post/dto/PostResponse.java +++ b/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java @@ -1,4 +1,4 @@ -package com.jpaboard.domain.post.dto; +package com.jpaboard.domain.post.dto.response; import lombok.Builder; diff --git a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java index e7650c55c..ee948f64b 100644 --- a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java +++ b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java @@ -1,12 +1,12 @@ package com.jpaboard.domain.post.presentation; import com.jpaboard.domain.post.application.PostService; -import com.jpaboard.domain.post.dto.PostCreateRequest; -import com.jpaboard.domain.post.dto.PostResponse; -import com.jpaboard.domain.post.dto.PostUpdateRequest; +import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.response.PostPageResponse; +import com.jpaboard.domain.post.dto.response.PostResponse; +import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.web.PageableDefault; import org.springframework.http.ResponseEntity; @@ -35,26 +35,26 @@ public ResponseEntity postDetail(@PathVariable Long id) { } @GetMapping - public ResponseEntity> findByCondition( + public ResponseEntity findByCondition( @RequestParam(name = "title", required = false) Optional title, @RequestParam(name = "content", required = false) Optional content, @RequestParam(name = "keyword", required = false) Optional keyword, @PageableDefault Pageable pageable ){ if (title.isPresent()) { - Page response = postService.findPostByTitle(title.get(), pageable); + PostPageResponse response = postService.findPostByTitle(title.get(), pageable); return ResponseEntity.ok(response); } if (content.isPresent()) { - Page response = postService.findPostByContent(content.get(), pageable); + PostPageResponse response = postService.findPostByContent(content.get(), pageable); return ResponseEntity.ok(response); } if (keyword.isPresent()) { - Page response = postService.findByKeyword(keyword.get(), pageable); + PostPageResponse response = postService.findByKeyword(keyword.get(), pageable); return ResponseEntity.ok(response); } - Page response = postService.findPosts(pageable); + PostPageResponse response = postService.findPosts(pageable); return ResponseEntity.ok(response); } diff --git a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java index 99d304263..ecfe13396 100644 --- a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java +++ b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java @@ -1,8 +1,9 @@ package com.jpaboard.domain.post.application; -import com.jpaboard.domain.post.dto.PostCreateRequest; -import com.jpaboard.domain.post.dto.PostResponse; -import com.jpaboard.domain.post.dto.PostUpdateRequest; +import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.response.PostPageResponse; +import com.jpaboard.domain.post.dto.response.PostResponse; +import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import com.jpaboard.domain.user.application.UserService; import com.jpaboard.domain.user.dto.request.UserCreationRequest; import org.junit.jupiter.api.Test; @@ -10,7 +11,6 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.context.annotation.ComponentScan; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -57,9 +57,9 @@ void find_all_posts_test() { postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.2")); Pageable pageable = PageRequest.of(0, 10); - Page posts = postService.findPosts(pageable); + PostPageResponse posts = postService.findPosts(pageable); - assertThat(posts.getTotalElements()).isEqualTo(2); + assertThat(posts.totalElements()).isEqualTo(2); } @Test @@ -70,9 +70,9 @@ void find_post_by_title() { postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.2")); Pageable pageable = PageRequest.of(0, 10); - Page posts = postService.findPostByTitle(title, pageable); + PostPageResponse posts = postService.findPostByTitle(title, pageable); - assertThat(posts.getTotalElements()).isEqualTo(1); + assertThat(posts.totalElements()).isEqualTo(1); } @Test @@ -83,9 +83,9 @@ void find_post_by_content() { postService.createPost(new PostCreateRequest(userId, "안녕하세요2", content)); Pageable pageable = PageRequest.of(0, 10); - Page posts = postService.findPostByContent(content, pageable); + PostPageResponse posts = postService.findPostByContent(content, pageable); - assertThat(posts.getTotalElements()).isEqualTo(1); + assertThat(posts.totalElements()).isEqualTo(1); } @Test @@ -96,9 +96,9 @@ void find_post_by_keyword() { postService.createPost(new PostCreateRequest(userId, "안녕하세요2", keyword)); Pageable pageable = PageRequest.of(0, 10); - Page posts = postService.findByKeyword(keyword, pageable); + PostPageResponse posts = postService.findByKeyword(keyword, pageable); - assertThat(posts.getTotalElements()).isEqualTo(2); + assertThat(posts.totalElements()).isEqualTo(2); } @Test From 9e3d23ab04a0c8232016addf31192dbd3a2c812a Mon Sep 17 00:00:00 2001 From: sangminnim Date: Wed, 2 Aug 2023 20:09:23 +0900 Subject: [PATCH 39/59] =?UTF-8?q?chore:=20=EC=82=AC=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=ED=86=B5=ED=95=A9=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jpaboard/JpaBoardApplicationTests.java | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 src/test/java/com/jpaboard/JpaBoardApplicationTests.java diff --git a/src/test/java/com/jpaboard/JpaBoardApplicationTests.java b/src/test/java/com/jpaboard/JpaBoardApplicationTests.java deleted file mode 100644 index 836f02595..000000000 --- a/src/test/java/com/jpaboard/JpaBoardApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.jpaboard; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class JpaBoardApplicationTests { - - @Test - void contextLoads() { - } - -} From 71cca0319e7409930b40a4989bb02760f2142497 Mon Sep 17 00:00:00 2001 From: weonest Date: Wed, 2 Aug 2023 23:29:46 +0900 Subject: [PATCH 40/59] =?UTF-8?q?feedback:=20findByCondition=20=EB=B6=84?= =?UTF-8?q?=EA=B8=B0=20=EC=B2=98=EB=A6=AC=EB=A5=BC=20=EC=9C=84=ED=95=9C=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/post/application/PostService.java | 9 +- .../post/application/PostServiceImpl.java | 19 +---- .../post/dto/request/PostSearchRequest.java | 13 +++ .../post/infrastructure/PostRepository.java | 14 ++-- .../post/presentation/PostController.java | 29 +++---- .../post/application/PostServiceImplTest.java | 83 ++++++++++--------- 6 files changed, 81 insertions(+), 86 deletions(-) create mode 100644 src/main/java/com/jpaboard/domain/post/dto/request/PostSearchRequest.java diff --git a/src/main/java/com/jpaboard/domain/post/application/PostService.java b/src/main/java/com/jpaboard/domain/post/application/PostService.java index e86c0c7e4..9ff9cdb3d 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostService.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostService.java @@ -1,9 +1,10 @@ package com.jpaboard.domain.post.application; import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.request.PostSearchRequest; +import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import com.jpaboard.domain.post.dto.response.PostPageResponse; import com.jpaboard.domain.post.dto.response.PostResponse; -import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import org.springframework.data.domain.Pageable; public interface PostService { @@ -14,11 +15,7 @@ public interface PostService { PostPageResponse findPosts(Pageable pageable); - PostPageResponse findPostByTitle(String title, Pageable pageable); - - PostPageResponse findPostByContent(String content, Pageable pageable); - - PostPageResponse findByKeyword(String keyword, Pageable pageable); + PostPageResponse findPostsByCondition(PostSearchRequest request, Pageable pageable); void updatePost(Long id, PostUpdateRequest request); diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java index 32f1c0267..c697af3df 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -3,9 +3,10 @@ import com.jpaboard.domain.post.Post; import com.jpaboard.domain.post.PostConverter; import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.request.PostSearchRequest; +import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import com.jpaboard.domain.post.dto.response.PostPageResponse; import com.jpaboard.domain.post.dto.response.PostResponse; -import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import com.jpaboard.domain.post.infrastructure.PostRepository; import com.jpaboard.domain.user.User; import com.jpaboard.domain.user.infrastructure.UserRepository; @@ -43,20 +44,8 @@ public PostPageResponse findPosts(Pageable pageable) { return PostConverter.convertEntityToPageResponse(posts); } - public PostPageResponse findPostByTitle(String title, Pageable pageable) { - Page posts = postRepository.findAllByTitleContaining(title, pageable) - .map(PostConverter::convertEntityToResponse); - return PostConverter.convertEntityToPageResponse(posts); - } - - public PostPageResponse findPostByContent(String content, Pageable pageable) { - Page posts = postRepository.findAllByContentContaining(content, pageable) - .map(PostConverter::convertEntityToResponse); - return PostConverter.convertEntityToPageResponse(posts); - } - - public PostPageResponse findByKeyword(String keyword, Pageable pageable) { - Page posts = postRepository.findAllByTitleContainingOrContentContaining(keyword, keyword, pageable) + public PostPageResponse findPostsByCondition(PostSearchRequest request, Pageable pageable) { + Page posts = postRepository.findAllByCondition(request.title(), request.content(), request.keyword(), pageable) .map(PostConverter::convertEntityToResponse); return PostConverter.convertEntityToPageResponse(posts); } diff --git a/src/main/java/com/jpaboard/domain/post/dto/request/PostSearchRequest.java b/src/main/java/com/jpaboard/domain/post/dto/request/PostSearchRequest.java new file mode 100644 index 000000000..43d0c2970 --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/dto/request/PostSearchRequest.java @@ -0,0 +1,13 @@ +package com.jpaboard.domain.post.dto.request; + +import jakarta.annotation.Nullable; + +public record PostSearchRequest( + @Nullable + String title, + @Nullable + String content, + @Nullable + String keyword +) { +} diff --git a/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java index fc93ea1ca..2bb2a06a4 100644 --- a/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java +++ b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java @@ -4,14 +4,16 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; public interface PostRepository extends JpaRepository { - Page findAll(Pageable pageable); + @Query("select p from Post p where p.title like %:title% or p.content like %:content% or p.title like %:keyword% or p.content like %:keyword%") + Page findAllByCondition(String title, String content, String keyword, Pageable pageable); - Page findAllByTitleContaining(String title, Pageable pageable); - - Page findAllByContentContaining(String content, Pageable pageable); - - Page findAllByTitleContainingOrContentContaining(String title, String content, Pageable pageable); +// Page findAllByTitleContaining(String title, Pageable pageable); +// +// Page findAllByContentContaining(String content, Pageable pageable); +// +// Page findAllByTitleContainingOrContentContaining(String title, String content, Pageable pageable); } diff --git a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java index ee948f64b..24db688df 100644 --- a/src/main/java/com/jpaboard/domain/post/presentation/PostController.java +++ b/src/main/java/com/jpaboard/domain/post/presentation/PostController.java @@ -2,9 +2,10 @@ import com.jpaboard.domain.post.application.PostService; import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.request.PostSearchRequest; +import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import com.jpaboard.domain.post.dto.response.PostPageResponse; import com.jpaboard.domain.post.dto.response.PostResponse; -import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Pageable; @@ -13,7 +14,6 @@ import org.springframework.web.bind.annotation.*; import java.net.URI; -import java.util.Optional; @RestController @RequestMapping("/api/posts") @@ -35,26 +35,17 @@ public ResponseEntity postDetail(@PathVariable Long id) { } @GetMapping + public ResponseEntity postFindAll(@PageableDefault Pageable pageable) { + PostPageResponse response = postService.findPosts(pageable); + return ResponseEntity.ok(response); + } + + @GetMapping("/search") public ResponseEntity findByCondition( - @RequestParam(name = "title", required = false) Optional title, - @RequestParam(name = "content", required = false) Optional content, - @RequestParam(name = "keyword", required = false) Optional keyword, + @ModelAttribute PostSearchRequest request, @PageableDefault Pageable pageable ){ - if (title.isPresent()) { - PostPageResponse response = postService.findPostByTitle(title.get(), pageable); - return ResponseEntity.ok(response); - } - if (content.isPresent()) { - PostPageResponse response = postService.findPostByContent(content.get(), pageable); - return ResponseEntity.ok(response); - } - if (keyword.isPresent()) { - PostPageResponse response = postService.findByKeyword(keyword.get(), pageable); - return ResponseEntity.ok(response); - } - - PostPageResponse response = postService.findPosts(pageable); + PostPageResponse response = postService.findPostsByCondition(request, pageable); return ResponseEntity.ok(response); } diff --git a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java index ecfe13396..d7f45061d 100644 --- a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java +++ b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java @@ -1,6 +1,7 @@ package com.jpaboard.domain.post.application; import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.request.PostSearchRequest; import com.jpaboard.domain.post.dto.response.PostPageResponse; import com.jpaboard.domain.post.dto.response.PostResponse; import com.jpaboard.domain.post.dto.request.PostUpdateRequest; @@ -54,52 +55,54 @@ void find_post_by_id_test() { void find_all_posts_test() { Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.2")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "null")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요3", "죽")); + PostSearchRequest search = new PostSearchRequest("안녕", null, null); Pageable pageable = PageRequest.of(0, 10); - PostPageResponse posts = postService.findPosts(pageable); + PostPageResponse posts = postService.findPostsByCondition(search, pageable); assertThat(posts.totalElements()).isEqualTo(2); } - @Test - void find_post_by_title() { - String title = "타겟"; - Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); - postService.createPost(new PostCreateRequest(userId, title, "본문은 없습니다.")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.2")); - - Pageable pageable = PageRequest.of(0, 10); - PostPageResponse posts = postService.findPostByTitle(title, pageable); - - assertThat(posts.totalElements()).isEqualTo(1); - } - - @Test - void find_post_by_content() { - String content = "타겟"; - Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); - postService.createPost(new PostCreateRequest(userId, "제목입니다", "본문은 없습니다.")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요2", content)); - - Pageable pageable = PageRequest.of(0, 10); - PostPageResponse posts = postService.findPostByContent(content, pageable); - - assertThat(posts.totalElements()).isEqualTo(1); - } - - @Test - void find_post_by_keyword() { - String keyword = "타겟"; - Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); - postService.createPost(new PostCreateRequest(userId, keyword, "본문은 없습니다.")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요2", keyword)); - - Pageable pageable = PageRequest.of(0, 10); - PostPageResponse posts = postService.findByKeyword(keyword, pageable); - - assertThat(posts.totalElements()).isEqualTo(2); - } +// @Test +// void find_post_by_title() { +// String title = "타겟"; +// Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); +// postService.createPost(new PostCreateRequest(userId, title, "본문은 없습니다.")); +// postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.2")); +// +// Pageable pageable = PageRequest.of(0, 10); +// PostPageResponse posts = postService.findPostByTitle(title, pageable); +// +// assertThat(posts.totalElements()).isEqualTo(1); +// } +// +// @Test +// void find_post_by_content() { +// String content = "타겟"; +// Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); +// postService.createPost(new PostCreateRequest(userId, "제목입니다", "본문은 없습니다.")); +// postService.createPost(new PostCreateRequest(userId, "안녕하세요2", content)); +// +// Pageable pageable = PageRequest.of(0, 10); +// PostPageResponse posts = postService.findPostByContent(content, pageable); +// +// assertThat(posts.totalElements()).isEqualTo(1); +// } +// +// @Test +// void find_post_by_keyword() { +// String keyword = "타겟"; +// Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); +// postService.createPost(new PostCreateRequest(userId, keyword, "본문은 없습니다.")); +// postService.createPost(new PostCreateRequest(userId, "안녕하세요2", keyword)); +// +// Pageable pageable = PageRequest.of(0, 10); +// PostPageResponse posts = postService.findByKeyword(keyword, pageable); +// +// assertThat(posts.totalElements()).isEqualTo(2); +// } @Test void update_post_test() { From 0e1793ca3727db74b35f5c070cbdf5a9243c3362 Mon Sep 17 00:00:00 2001 From: weonest Date: Thu, 3 Aug 2023 19:32:06 +0900 Subject: [PATCH 41/59] =?UTF-8?q?feedback:=20PostConverter=20final=20?= =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=EB=A1=9C=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/post/PostConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/jpaboard/domain/post/PostConverter.java b/src/main/java/com/jpaboard/domain/post/PostConverter.java index a298cff7d..e7f1060b0 100644 --- a/src/main/java/com/jpaboard/domain/post/PostConverter.java +++ b/src/main/java/com/jpaboard/domain/post/PostConverter.java @@ -9,7 +9,7 @@ import org.springframework.data.domain.Page; @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class PostConverter { +public final class PostConverter { public static Post convertRequestToEntity(PostCreateRequest request, User user) { return Post.builder() From 6852e97b44c19bc58437a6758e64d6382eb1f28a Mon Sep 17 00:00:00 2001 From: weonest Date: Thu, 3 Aug 2023 19:35:09 +0900 Subject: [PATCH 42/59] =?UTF-8?q?feedback:=20ddl-auto=20=EC=98=B5=EC=85=98?= =?UTF-8?q?=20none=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 1746ab684..436d47445 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -12,7 +12,7 @@ spring: jpa: open-in-view: false hibernate: - ddl-auto: create + ddl-auto: none properties: hibernate: format_sql: true From bc08c7435ec4115bdb085ed643a7286472f207eb Mon Sep 17 00:00:00 2001 From: weonest Date: Thu, 3 Aug 2023 19:46:19 +0900 Subject: [PATCH 43/59] =?UTF-8?q?feedback:=20findByCondition=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post/infrastructure/PostRepository.java | 5 -- .../post/application/PostServiceImplTest.java | 63 ++++++------------- 2 files changed, 20 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java index 2bb2a06a4..d028e5f16 100644 --- a/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java +++ b/src/main/java/com/jpaboard/domain/post/infrastructure/PostRepository.java @@ -11,9 +11,4 @@ public interface PostRepository extends JpaRepository { @Query("select p from Post p where p.title like %:title% or p.content like %:content% or p.title like %:keyword% or p.content like %:keyword%") Page findAllByCondition(String title, String content, String keyword, Pageable pageable); -// Page findAllByTitleContaining(String title, Pageable pageable); -// -// Page findAllByContentContaining(String content, Pageable pageable); -// -// Page findAllByTitleContainingOrContentContaining(String title, String content, Pageable pageable); } diff --git a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java index d7f45061d..297e54763 100644 --- a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java +++ b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java @@ -8,6 +8,8 @@ import com.jpaboard.domain.user.application.UserService; import com.jpaboard.domain.user.dto.request.UserCreationRequest; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.context.TestConfiguration; @@ -55,54 +57,29 @@ void find_post_by_id_test() { void find_all_posts_test() { Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "null")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요3", "죽")); - PostSearchRequest search = new PostSearchRequest("안녕", null, null); + postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요3", "본문은 없습니다.")); Pageable pageable = PageRequest.of(0, 10); - PostPageResponse posts = postService.findPostsByCondition(search, pageable); + PostPageResponse posts = postService.findPosts(pageable); - assertThat(posts.totalElements()).isEqualTo(2); + assertThat(posts.totalElements()).isEqualTo(3); } -// @Test -// void find_post_by_title() { -// String title = "타겟"; -// Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); -// postService.createPost(new PostCreateRequest(userId, title, "본문은 없습니다.")); -// postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.2")); -// -// Pageable pageable = PageRequest.of(0, 10); -// PostPageResponse posts = postService.findPostByTitle(title, pageable); -// -// assertThat(posts.totalElements()).isEqualTo(1); -// } -// -// @Test -// void find_post_by_content() { -// String content = "타겟"; -// Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); -// postService.createPost(new PostCreateRequest(userId, "제목입니다", "본문은 없습니다.")); -// postService.createPost(new PostCreateRequest(userId, "안녕하세요2", content)); -// -// Pageable pageable = PageRequest.of(0, 10); -// PostPageResponse posts = postService.findPostByContent(content, pageable); -// -// assertThat(posts.totalElements()).isEqualTo(1); -// } -// -// @Test -// void find_post_by_keyword() { -// String keyword = "타겟"; -// Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); -// postService.createPost(new PostCreateRequest(userId, keyword, "본문은 없습니다.")); -// postService.createPost(new PostCreateRequest(userId, "안녕하세요2", keyword)); -// -// Pageable pageable = PageRequest.of(0, 10); -// PostPageResponse posts = postService.findByKeyword(keyword, pageable); -// -// assertThat(posts.totalElements()).isEqualTo(2); -// } + @ParameterizedTest + @CsvSource(value = {"안녕, null, null", "null, 본문, null", "null, null, 안녕", "null, null, 본문"}, nullValues = "null") + void find_all_posts_by_condition_test(String title, String content, String keyword) { + Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.")); + postService.createPost(new PostCreateRequest(userId, "안녕하세요3", "본문은 없습니다.")); + PostSearchRequest search = new PostSearchRequest(title, content, keyword); + + Pageable pageable = PageRequest.of(0, 10); + PostPageResponse posts = postService.findPostsByCondition(search, pageable); + + assertThat(posts.totalElements()).isEqualTo(3); + } @Test void update_post_test() { From 8edce4f1d993159a0514d9f21f13c9631375892a Mon Sep 17 00:00:00 2001 From: weonest Date: Thu, 3 Aug 2023 20:08:25 +0900 Subject: [PATCH 44/59] =?UTF-8?q?feedback:=20PostPageResponse=EC=97=90=20?= =?UTF-8?q?=EB=94=B0=EB=A5=B8=20restdocs=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post/presentation/PostControllerTest.java | 50 ++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java index f0e1e1347..c01a18c70 100644 --- a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java +++ b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java @@ -2,8 +2,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.jpaboard.domain.post.application.PostService; -import com.jpaboard.domain.post.dto.PostCreateRequest; -import com.jpaboard.domain.post.dto.PostUpdateRequest; +import com.jpaboard.domain.post.dto.request.PostCreateRequest; +import com.jpaboard.domain.post.dto.request.PostSearchRequest; +import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import com.jpaboard.domain.user.application.UserService; import com.jpaboard.domain.user.dto.request.UserCreationRequest; import org.junit.jupiter.api.BeforeEach; @@ -21,8 +22,6 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.util.LinkedMultiValueMap; -import java.util.Collections; - import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName; import static org.springframework.restdocs.headers.HeaderDocumentation.responseHeaders; import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document; @@ -65,7 +64,7 @@ void setUp() { void post_create_test() throws Exception { PostCreateRequest request = new PostCreateRequest(userId, "게시글 생성 테스트", "테스트 본문"); - mockMvc.perform(post("/api/posts/new") + mockMvc.perform(post("/api/posts") .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(request))) .andExpect(status().isCreated()) @@ -90,15 +89,25 @@ void find_by_condition_test(String title, String content, String keyword) throws paramMap.add("content", content); paramMap.add("keyword", keyword); + PostSearchRequest request = new PostSearchRequest(title, content, keyword); + mockMvc.perform(RestDocumentationRequestBuilders.get("/api/posts") - .params(paramMap)) + .params(paramMap) + .contentType(MediaType.APPLICATION_JSON) + .content(objectMapper.writeValueAsString(request))) .andExpect(status().isOk()) .andDo(print()) - .andDo(document("post-find", pathParameters( + .andDo(document("post-find", + pathParameters( parameterWithName("title").description("제목").optional(), parameterWithName("content").description("본문").optional(), parameterWithName("keyword").description("제목 + 본문").optional() ), + requestFields( + fieldWithPath("title").type(JsonFieldType.STRING).description("제목").optional(), + fieldWithPath("content").type(JsonFieldType.STRING).description("본문").optional(), + fieldWithPath("keyword").type(JsonFieldType.STRING).description("제목 + 본문").optional() + ), responseFields( fieldWithPath("content.[].id").type(JsonFieldType.NUMBER).description("게시글 Id"), fieldWithPath("content.[].title").type(JsonFieldType.STRING).description("제목"), @@ -106,28 +115,13 @@ void find_by_condition_test(String title, String content, String keyword) throws fieldWithPath("content.[].create_at").type(JsonFieldType.STRING).description("생성일"), fieldWithPath("content.[].update_at").type(JsonFieldType.STRING).description("수정일"), - fieldWithPath("pageable.sort.empty").type(JsonFieldType.BOOLEAN).description("정렬 데이터 비었는지 여부"), - fieldWithPath("pageable.sort.unsorted").type(JsonFieldType.BOOLEAN).description("비정렬 여부"), - fieldWithPath("pageable.sort.sorted").type(JsonFieldType.BOOLEAN).description("정렬 여부"), - - fieldWithPath("pageable.offset").type(JsonFieldType.NUMBER).description("몇 번째 데이터 인지 (0부터 시작)"), - fieldWithPath("pageable.pageSize").type(JsonFieldType.NUMBER).description("한 페이지당 조회할 데이터 개수"), - fieldWithPath("pageable.pageNumber").type(JsonFieldType.NUMBER).description("현재 페이지 번호"), - fieldWithPath("pageable.unpaged").type(JsonFieldType.BOOLEAN).description("페이징 정보를 포함하지 않는지 여부"), - fieldWithPath("pageable.paged").type(JsonFieldType.BOOLEAN).description("페이징 정보를 포함하는지 여부"), - - fieldWithPath("last").type(JsonFieldType.BOOLEAN).description("마지막 페이지인지 여부"), - fieldWithPath("totalElements").type(JsonFieldType.NUMBER).description("전체 요소 개수"), - fieldWithPath("totalPages").type(JsonFieldType.NUMBER).description("전체 페이지 개수"), - fieldWithPath("size").type(JsonFieldType.NUMBER).description("한 페이지당 조회할 데이터 개수"), - fieldWithPath("number").type(JsonFieldType.NUMBER).description("현재 페이지 번호"), - - fieldWithPath("sort.empty").type(JsonFieldType.BOOLEAN).description("정렬 데이터가 비었는지 여부"), - fieldWithPath("sort.unsorted").type(JsonFieldType.BOOLEAN).description("비정렬 여부"), - fieldWithPath("sort.sorted").type(JsonFieldType.BOOLEAN).description("정렬 여부"), - fieldWithPath("first").type(JsonFieldType.BOOLEAN).description("첫 번째 페이지인지 여부"), fieldWithPath("numberOfElements").type(JsonFieldType.NUMBER).description("전체 데이터 개수"), - fieldWithPath("empty").type(JsonFieldType.BOOLEAN).description("데이터가 비었는지 여부") + fieldWithPath("totalElements").type(JsonFieldType.NUMBER).description("전체 요소 개수"), + fieldWithPath("pageNumber").type(JsonFieldType.NUMBER).description("현재 페이지 번호"), + fieldWithPath("pageSize").type(JsonFieldType.NUMBER).description("한 페이지당 조회할 데이터 개수"), + fieldWithPath("isFirstPage").type(JsonFieldType.BOOLEAN).description("첫 번째 페이지인지 여부"), + fieldWithPath("hasNextPage").type(JsonFieldType.BOOLEAN).description("다음 페이지 존재 여부"), + fieldWithPath("isLastPage").type(JsonFieldType.BOOLEAN).description("마지막 페이지인지 여부") ))); } From df8ae83ba1a7dd0ddfec944152c529cc0aa4d2d2 Mon Sep 17 00:00:00 2001 From: sangminnim Date: Fri, 4 Aug 2023 00:10:16 +0900 Subject: [PATCH 45/59] =?UTF-8?q?test:=20=EB=82=B4=EB=B6=80=20field=20?= =?UTF-8?q?=EB=B9=84=EA=B5=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/user/application/UserServiceImplTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java b/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java index 289c2123e..f6c583249 100644 --- a/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java +++ b/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java @@ -4,6 +4,7 @@ import com.jpaboard.domain.user.dto.request.UserUpdateRequest; import com.jpaboard.domain.user.dto.response.UserResponse; import jakarta.persistence.EntityNotFoundException; +import org.assertj.core.api.ObjectAssert; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -46,7 +47,9 @@ void testUpdate() { userService.updateUser(userId, request); UserResponse userResponse = userService.findUserById(userId); // then - assertThat(userResponse).isNotNull(); + assertThat(userResponse).isNotNull() + .extracting(UserResponse::name, UserResponse::age, UserResponse::hobby) + .containsExactly(request.name(), request.age(), request.hobby()); } @Test From a250cb8c5ce2d385fac93fea36f731693eb926c7 Mon Sep 17 00:00:00 2001 From: sangminnim Date: Fri, 4 Aug 2023 00:12:51 +0900 Subject: [PATCH 46/59] =?UTF-8?q?feat:=20change=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=ED=95=9C=20=EA=B0=9C=EB=A1=9C=20=ED=86=B5=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jpaboard/domain/user/User.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/user/User.java b/src/main/java/com/jpaboard/domain/user/User.java index 2512b2c0f..785946745 100644 --- a/src/main/java/com/jpaboard/domain/user/User.java +++ b/src/main/java/com/jpaboard/domain/user/User.java @@ -37,20 +37,8 @@ private User(String name, int age, String hobby) { } public void update(User user) { - changeName(user.getName()); - changeAge(user.getAge()); - changeHobby(user.getHobby()); - } - - private void changeName(String name) { - this.name = name; - } - - private void changeAge(int age) { - this.age = age; - } - - private void changeHobby(String hobby) { - this.hobby = hobby; + this.name = user.name; + this.age = user.age; + this.hobby = user.hobby; } } From 18be7236a0d1c964b1df971f9874a4df84e30b3d Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 7 Aug 2023 15:03:56 +0900 Subject: [PATCH 47/59] =?UTF-8?q?feedback:=20PostResponse=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jpaboard/domain/post/dto/response/PostResponse.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java b/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java index cad349fe1..212aa2151 100644 --- a/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java +++ b/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java @@ -9,7 +9,7 @@ public record PostResponse( Long id, String title, String content, - LocalDateTime create_at, - LocalDateTime update_at + LocalDateTime createAt, + LocalDateTime updateAt ) { } From 3c938607c94f5fdd8c04b3608aecc87b2f14315a Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 7 Aug 2023 15:10:55 +0900 Subject: [PATCH 48/59] =?UTF-8?q?refactor:=20=EC=BB=A8=EB=B2=84=ED=84=B0?= =?UTF-8?q?=EC=99=80=20PostResponse=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/post/PostConverter.java | 5 +++-- .../com/jpaboard/domain/post/dto/response/PostResponse.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/PostConverter.java b/src/main/java/com/jpaboard/domain/post/PostConverter.java index e7f1060b0..ef0ec42b1 100644 --- a/src/main/java/com/jpaboard/domain/post/PostConverter.java +++ b/src/main/java/com/jpaboard/domain/post/PostConverter.java @@ -22,10 +22,11 @@ public static Post convertRequestToEntity(PostCreateRequest request, User user) public static PostResponse convertEntityToResponse(Post post) { return PostResponse.builder() .id(post.getId()) + .name(post.getUser().getName()) .title(post.getTitle()) .content(post.getContent()) - .create_at(post.getCreateAt()) - .update_at(post.getUpdateAt()) + .createAt(post.getCreateAt()) + .updateAt(post.getUpdateAt()) .build(); } diff --git a/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java b/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java index 212aa2151..7746a95bc 100644 --- a/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java +++ b/src/main/java/com/jpaboard/domain/post/dto/response/PostResponse.java @@ -7,6 +7,7 @@ @Builder public record PostResponse( Long id, + String name, String title, String content, LocalDateTime createAt, From d67b499449f0ca5bbfc867f0ec909c0f61693d0b Mon Sep 17 00:00:00 2001 From: sangminnim Date: Mon, 7 Aug 2023 15:20:38 +0900 Subject: [PATCH 49/59] =?UTF-8?q?feat:=20update=20PUT=20->=20PATCH=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/user/User.java | 8 ++++---- .../jpaboard/domain/user/application/UserServiceImpl.java | 3 +-- .../jpaboard/domain/user/presentation/UserController.java | 2 +- .../domain/user/presentation/UserControllerTest.java | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/user/User.java b/src/main/java/com/jpaboard/domain/user/User.java index 785946745..112587315 100644 --- a/src/main/java/com/jpaboard/domain/user/User.java +++ b/src/main/java/com/jpaboard/domain/user/User.java @@ -36,9 +36,9 @@ private User(String name, int age, String hobby) { this.hobby = hobby; } - public void update(User user) { - this.name = user.name; - this.age = user.age; - this.hobby = user.hobby; + public void update(String name, int age, String hobby) { + this.name = name; + this.age = age; + this.hobby = hobby; } } diff --git a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java index b6d3d3217..805a6c1c9 100644 --- a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java @@ -36,8 +36,7 @@ public UserResponse findUserById(Long id) { public void updateUser(Long id, UserUpdateRequest request) { User user = userRepository.findById(id) .orElseThrow(EntityNotFoundException::new); - User forUpdate = UserConverter.convertRequestToEntity(request); - user.update(forUpdate); + user.update(request.name(), request.age(), request.hobby()); } @Transactional diff --git a/src/main/java/com/jpaboard/domain/user/presentation/UserController.java b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java index 600260f80..793ec0406 100644 --- a/src/main/java/com/jpaboard/domain/user/presentation/UserController.java +++ b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java @@ -27,7 +27,7 @@ public ResponseEntity userFind(@PathVariable Long id) { return ResponseEntity.ok(userService.findUserById(id)); } - @PutMapping("/{id}") + @PatchMapping("/{id}") public ResponseEntity userUpdate(@PathVariable Long id, @RequestBody @Valid UserUpdateRequest request) { userService.updateUser(id, request); return ResponseEntity.ok().build(); diff --git a/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java index b22283bc0..faef74382 100644 --- a/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java +++ b/src/test/java/com/jpaboard/domain/user/presentation/UserControllerTest.java @@ -97,7 +97,7 @@ void testUserFind() throws Exception { void testUserUpdate() throws Exception { UserUpdateRequest request = new UserUpdateRequest("수정된 이름", 100, "수정된 취미"); - mockMvc.perform(put("/api/users/{id}", userId) + mockMvc.perform(patch("/api/users/{id}", userId) .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(request)) ).andExpect(status().isOk()) From 91866c32064be24f3b4d883c9d1d4d5a209e9225 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 7 Aug 2023 22:30:10 +0900 Subject: [PATCH 50/59] =?UTF-8?q?chore:=20instancio=20=EC=9D=98=EC=A1=B4?= =?UTF-8?q?=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 5974a8303..02a5a7c4b 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,7 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc' + testImplementation group: 'org.instancio', name: 'instancio-junit', version: '3.0.0' } tasks.named('test') { From 0733c4f4bf006dcbb24e05eae0ccb125e1f8ece0 Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 7 Aug 2023 22:31:03 +0900 Subject: [PATCH 51/59] =?UTF-8?q?refactor:=20User=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jpaboard/domain/user/User.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/user/User.java b/src/main/java/com/jpaboard/domain/user/User.java index 112587315..0cdc10191 100644 --- a/src/main/java/com/jpaboard/domain/user/User.java +++ b/src/main/java/com/jpaboard/domain/user/User.java @@ -4,14 +4,12 @@ import jakarta.persistence.*; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; +import lombok.*; @Entity @Getter @Table(name = "users") +@ToString @NoArgsConstructor(access = AccessLevel.PROTECTED) public class User extends BaseEntity { @Id From 5ed41ca6053f3811997354c9c657f48ebbe5a05c Mon Sep 17 00:00:00 2001 From: weonest Date: Mon, 7 Aug 2023 22:31:31 +0900 Subject: [PATCH 52/59] =?UTF-8?q?refactor:=20PostServiceImpl=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jpaboard/domain/post/application/PostServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java index c697af3df..2a2934f65 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -29,8 +29,7 @@ public class PostServiceImpl implements PostService { public Long createPost(PostCreateRequest request) { User user = userRepository.findById(request.userId()).orElseThrow(IllegalArgumentException::new); Post post = PostConverter.convertRequestToEntity(request, user); - postRepository.save(post); - return post.getId(); + return postRepository.save(post).getId(); } public PostResponse findPostById(Long id) { From 205262c0497137545a71a0373c0483572b77cf9a Mon Sep 17 00:00:00 2001 From: weonest Date: Tue, 8 Aug 2023 17:29:40 +0900 Subject: [PATCH 53/59] =?UTF-8?q?refactor:=20PostServiceImpl=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post/application/PostServiceImplTest.java | 214 ++++++++++++++---- 1 file changed, 167 insertions(+), 47 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java index 297e54763..61bdd3637 100644 --- a/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java +++ b/src/test/java/com/jpaboard/domain/post/application/PostServiceImplTest.java @@ -1,108 +1,228 @@ package com.jpaboard.domain.post.application; +import com.jpaboard.domain.post.Post; +import com.jpaboard.domain.post.PostConverter; import com.jpaboard.domain.post.dto.request.PostCreateRequest; import com.jpaboard.domain.post.dto.request.PostSearchRequest; +import com.jpaboard.domain.post.dto.request.PostUpdateRequest; import com.jpaboard.domain.post.dto.response.PostPageResponse; import com.jpaboard.domain.post.dto.response.PostResponse; -import com.jpaboard.domain.post.dto.request.PostUpdateRequest; -import com.jpaboard.domain.user.application.UserService; -import com.jpaboard.domain.user.dto.request.UserCreationRequest; +import com.jpaboard.domain.post.infrastructure.PostRepository; +import com.jpaboard.domain.user.User; +import com.jpaboard.domain.user.infrastructure.UserRepository; +import org.instancio.Instancio; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.boot.test.context.TestConfiguration; -import org.springframework.context.annotation.ComponentScan; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.Random; -@DataJpaTest +import static org.assertj.core.api.Assertions.*; +import static org.instancio.Select.all; +import static org.instancio.Select.field; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) class PostServiceImplTest { - @TestConfiguration - @ComponentScan(basePackages = {"com.jpaboard.domain"}) - static class Config{ - } + @InjectMocks + private PostServiceImpl postService; - @Autowired - private PostService postService; + @Mock + private PostRepository postRepository; - @Autowired - private UserService userService; + @Mock + private UserRepository userRepository; + Random random = new Random(); + + @DisplayName("올바른 요청을 통해 게시글을 생성할 수 있다.") @Test void create_post_test() { - Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); + //given + User user = Instancio.create(User.class); + Long userId = user.getId(); + PostCreateRequest request = createPostCreateRequest(userId); + Post post = createPostByRequest(request, user); + Long postId = post.getId(); + + given(userRepository.findById(userId)).willReturn(Optional.of(user)); + given(postRepository.save(any(Post.class))).willReturn(post); - Long postId = postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); + //when + Long expectedId = postService.createPost(request); - assertThat(postId).isNotNull(); + //then + assertThat(postId).isEqualTo(expectedId); } + @DisplayName("존재하는 게시글을 조회할 수 있다.") @Test void find_post_by_id_test() { - Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); - Long postId = postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); + //given + User user = Instancio.create(User.class); + Post post = createPost(user); + Long postId = post.getId(); + PostResponse response = createPostResponse(post); + + given(postRepository.findById(postId)).willReturn(Optional.of(post)); + //when PostResponse storedPost = postService.findPostById(postId); - assertThat(postId).isEqualTo(storedPost.id()); + //then + assertThat(response).isEqualTo(storedPost); } + @DisplayName("모든 게시글을 조회할 수 있다.") @Test void find_all_posts_test() { - Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요3", "본문은 없습니다.")); - - Pageable pageable = PageRequest.of(0, 10); + //이러한 데이터 생성을 beforeEach로 변경해야 하는지 + //어떠한 코드인지 파악이 쉽도록 아래와 같이 작성해야 하는지 + //given + int numberOfPost = random.nextInt(100); + int pageNum = 0; + int pageSize = 10; + + Pageable pageable = PageRequest.of(pageNum, pageSize); + User user = Instancio.create(User.class); + List postList = createPostList(numberOfPost, user); + Page pagedPost = new PageImpl<>(postList, pageable, numberOfPost); + Page pagedResponse = createPagedResponse(pagedPost); + PostPageResponse response = PostConverter.convertEntityToPageResponse(pagedResponse); + + given(postRepository.findAll(pageable)).willReturn(pagedPost); + + //when PostPageResponse posts = postService.findPosts(pageable); - assertThat(posts.totalElements()).isEqualTo(3); + //then + assertThat(posts.totalElements()).isEqualTo(numberOfPost); + assertThat(posts).isEqualTo(response); } + @DisplayName("검색 조건에 따라 게시글을 조회할 수 있다.") @ParameterizedTest @CsvSource(value = {"안녕, null, null", "null, 본문, null", "null, null, 안녕", "null, null, 본문"}, nullValues = "null") void find_all_posts_by_condition_test(String title, String content, String keyword) { - Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요", "본문은 없습니다.")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요2", "본문은 없습니다.")); - postService.createPost(new PostCreateRequest(userId, "안녕하세요3", "본문은 없습니다.")); + //given + int numberOfPost = random.nextInt(100); + int pageNum = 0; + int pageSize = 10; + + Pageable pageable = PageRequest.of(pageNum, pageSize); + User user = Instancio.create(User.class); + List postList = createPostListWithData(numberOfPost, user); + Page pagedPost = new PageImpl<>(postList, pageable, numberOfPost); + Page pagedResponse = createPagedResponse(pagedPost); + PostPageResponse response = PostConverter.convertEntityToPageResponse(pagedResponse); + PostSearchRequest search = new PostSearchRequest(title, content, keyword); - Pageable pageable = PageRequest.of(0, 10); + given(postRepository.findAllByCondition( + search.title(), search.content(), search.keyword(), pageable + )).willReturn(pagedPost); + + //when PostPageResponse posts = postService.findPostsByCondition(search, pageable); - assertThat(posts.totalElements()).isEqualTo(3); + //then + assertThat(posts.totalElements()).isEqualTo(postList.size()); + assertThat(posts).isEqualTo(response); } + @DisplayName("게시글을 수정할 수 있다.") @Test void update_post_test() { - Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); - Long postId = postService.createPost(new PostCreateRequest(userId, "제목", "본문은 없습니다.")); - PostUpdateRequest request = new PostUpdateRequest("수정된 제목", "수정된 본문"); + //given + Post post = mock(Post.class); + Long postId = post.getId(); + PostUpdateRequest request = Instancio.create(PostUpdateRequest.class); + given(postRepository.findById(postId)).willReturn(Optional.of(post)); + + //when postService.updatePost(postId, request); - PostResponse updatedPost = postService.findPostById(postId); - assertThat(updatedPost.title()).isEqualTo(request.title()); - assertThat(updatedPost.content()).isEqualTo(request.content()); + //then + verify(post, atMostOnce()).update(request.title(), request.content()); } + @DisplayName("게시글을 삭제할 수 있다.") @Test void delete_post_test() { - Long userId = userService.createUser(new UserCreationRequest("tester", 25, "축구")); - Long postId = postService.createPost(new PostCreateRequest(userId, "제목", "본문은 없습니다.")); + //given + Post post = mock(Post.class); + Long postId = post.getId(); + + doNothing().when(postRepository).deleteById(postId); + //when postService.deletePostById(postId); - assertThatThrownBy(() -> postService.findPostById(postId)) - .isInstanceOf(IllegalArgumentException.class); + //then + verify(postRepository, only()).deleteById(postId); + } + + private PostCreateRequest createPostCreateRequest(Long userId) { + return Instancio.of(PostCreateRequest.class) + .set(field(PostCreateRequest::userId), userId) + .create(); + } + + private Post createPost(User user) { + return Instancio.of(Post.class) + .set(field(Post::getUser), user) + .create(); + } + + private Post createPostByRequest(PostCreateRequest request, User user) { + return Instancio.of(Post.class) + .supply(all(Post.class), gen -> PostConverter.convertRequestToEntity(request, user)) + .create(); + } + + private List createPostList(int size, User user) { + return Instancio.ofList(Post.class) + .size(size) + .set(field(Post::getUser), user) + .create(); + } + + private List createPostListWithData(int size, User user) { + List postList = new ArrayList<>(); + for (int i = 0; i < size; i++) { + postList.add(Instancio.of(Post.class) + .set(field(Post::getUser), user) + .set(field(Post::getTitle), "안녕" + i) + .set(field(Post::getTitle), "본문" + i) + .create()); + } + return postList; + } + + private PostResponse createPostResponse(Post post) { + return Instancio.of(PostResponse.class) + .supply(all(PostResponse.class), gen -> PostConverter.convertEntityToResponse(post)) + .create(); + } + + private Page createPagedResponse(Page pagedPost) { + return pagedPost.map(PostConverter::convertEntityToResponse); } } From e8b4da2cffd48ee1353ff827958b5ba4aba7664c Mon Sep 17 00:00:00 2001 From: weonest Date: Tue, 8 Aug 2023 17:29:54 +0900 Subject: [PATCH 54/59] =?UTF-8?q?refactor:=20=EC=84=9C=EB=B9=84=EC=8A=A4?= =?UTF-8?q?=20=EB=A0=88=EC=9D=B4=EC=96=B4=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?Mock=20&=20Instancio=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/application/UserServiceImplTest.java | 100 +++++++++++++----- 1 file changed, 72 insertions(+), 28 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java b/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java index f6c583249..9e0f02a20 100644 --- a/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java +++ b/src/test/java/com/jpaboard/domain/user/application/UserServiceImplTest.java @@ -1,65 +1,109 @@ package com.jpaboard.domain.user.application; +import com.jpaboard.domain.user.User; +import com.jpaboard.domain.user.UserConverter; import com.jpaboard.domain.user.dto.request.UserCreationRequest; import com.jpaboard.domain.user.dto.request.UserUpdateRequest; import com.jpaboard.domain.user.dto.response.UserResponse; -import jakarta.persistence.EntityNotFoundException; -import org.assertj.core.api.ObjectAssert; -import org.junit.jupiter.api.BeforeEach; +import com.jpaboard.domain.user.infrastructure.UserRepository; +import org.instancio.Instancio; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.context.annotation.Import; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.instancio.Select.all; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.*; -@DataJpaTest -@Import(UserServiceImpl.class) +@ExtendWith(MockitoExtension.class) class UserServiceImplTest { - @Autowired - private UserService userService; + @InjectMocks + private UserServiceImpl userServiceImpl; + + @Mock + private UserRepository userRepository; + + @Test + @DisplayName("유저를 생성할 수 있다.") + void testCreateUser() { + // given + UserCreationRequest request = Instancio.create(UserCreationRequest.class); + User user = createUserByCreationRequest(request); + given(userRepository.save(any(User.class))).willReturn(user); - private Long userId; + // when + Long createdUserId = userServiceImpl.createUser(request); - @BeforeEach - void setup() { - userId = userService.createUser(new UserCreationRequest("이름", 20, "취미")); + // then + assertThat(createdUserId).isEqualTo(user.getId()); } @Test @DisplayName("유저를 조회할 수 있다.") void testFindUserById() { // given + User user = createUser(); + given(userRepository.findById(user.getId())).willReturn(Optional.of(user)); + UserResponse expected = createUserResponse(user); + // when - UserResponse userResponse = userService.findUserById(userId); + UserResponse response = userServiceImpl.findUserById(user.getId()); + // then - assertThat(userResponse).isNotNull(); + assertThat(response).isEqualTo(expected); } @Test @DisplayName("유저를 수정할 수 있다.") - void testUpdate() { + void testUpdateUser() { // given - UserUpdateRequest request = new UserUpdateRequest("수정된 이름", 22, "수정된 취미"); + User user = mock(User.class); + UserUpdateRequest request = Instancio.create(UserUpdateRequest.class); + given(userRepository.findById(user.getId())).willReturn(Optional.of(user)); + // when - userService.updateUser(userId, request); - UserResponse userResponse = userService.findUserById(userId); + userServiceImpl.updateUser(user.getId(), request); + // then - assertThat(userResponse).isNotNull() - .extracting(UserResponse::name, UserResponse::age, UserResponse::hobby) - .containsExactly(request.name(), request.age(), request.hobby()); + verify(userRepository, atMostOnce()).findById(user.getId()); + verify(user, atMostOnce()).update(request.name(), request.age(), request.hobby()); } @Test @DisplayName("유저를 삭제할 수 있다.") - void testDelete() { + void testDeleteUser() { // given + User user = mock(User.class); + Long userId = user.getId(); + doNothing().when(userRepository).deleteById(userId); + // when - userService.deleteUser(userId); + userServiceImpl.deleteUser(userId); + // then - assertThatThrownBy(() -> userService.findUserById(userId)) - .isInstanceOf(EntityNotFoundException.class); + verify(userRepository, only()).deleteById(userId); + } + + private User createUser() { + return Instancio.create(User.class); + } + + private UserResponse createUserResponse(User user) { + return Instancio.of(UserResponse.class) + .supply(all(UserResponse.class), gen -> UserConverter.convertEntityToResponse(user)) + .create(); + } + + private User createUserByCreationRequest(UserCreationRequest request) { + return Instancio.of(User.class) + .supply(all(User.class), gen -> UserConverter.convertRequestToEntity(request)) + .create(); } } From ac79d9f1d9c7cbbdb7db066ac0f5a14b4bd7fbd7 Mon Sep 17 00:00:00 2001 From: weonest Date: Tue, 8 Aug 2023 17:41:16 +0900 Subject: [PATCH 55/59] =?UTF-8?q?refactor:=20PostControllerTest=20?= =?UTF-8?q?=EC=B9=B4=EB=A9=9C=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/post/presentation/PostControllerTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java index c01a18c70..ed0b900f9 100644 --- a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java +++ b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java @@ -110,10 +110,11 @@ void find_by_condition_test(String title, String content, String keyword) throws ), responseFields( fieldWithPath("content.[].id").type(JsonFieldType.NUMBER).description("게시글 Id"), + fieldWithPath("content.[].name").type(JsonFieldType.STRING).description("작성자"), fieldWithPath("content.[].title").type(JsonFieldType.STRING).description("제목"), fieldWithPath("content.[].content").type(JsonFieldType.STRING).description("본문"), - fieldWithPath("content.[].create_at").type(JsonFieldType.STRING).description("생성일"), - fieldWithPath("content.[].update_at").type(JsonFieldType.STRING).description("수정일"), + fieldWithPath("content.[].createAt").type(JsonFieldType.STRING).description("생성일"), + fieldWithPath("content.[].updateAt").type(JsonFieldType.STRING).description("수정일"), fieldWithPath("numberOfElements").type(JsonFieldType.NUMBER).description("전체 데이터 개수"), fieldWithPath("totalElements").type(JsonFieldType.NUMBER).description("전체 요소 개수"), From 86d027676ec67160f01aa5e8d868670f2b8b9096 Mon Sep 17 00:00:00 2001 From: weonest Date: Tue, 8 Aug 2023 17:41:16 +0900 Subject: [PATCH 56/59] =?UTF-8?q?refactor:=20PostControllerTest=20?= =?UTF-8?q?=EC=B9=B4=EB=A9=9C=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/post/presentation/PostControllerTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java index c01a18c70..ed0b900f9 100644 --- a/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java +++ b/src/test/java/com/jpaboard/domain/post/presentation/PostControllerTest.java @@ -110,10 +110,11 @@ void find_by_condition_test(String title, String content, String keyword) throws ), responseFields( fieldWithPath("content.[].id").type(JsonFieldType.NUMBER).description("게시글 Id"), + fieldWithPath("content.[].name").type(JsonFieldType.STRING).description("작성자"), fieldWithPath("content.[].title").type(JsonFieldType.STRING).description("제목"), fieldWithPath("content.[].content").type(JsonFieldType.STRING).description("본문"), - fieldWithPath("content.[].create_at").type(JsonFieldType.STRING).description("생성일"), - fieldWithPath("content.[].update_at").type(JsonFieldType.STRING).description("수정일"), + fieldWithPath("content.[].createAt").type(JsonFieldType.STRING).description("생성일"), + fieldWithPath("content.[].updateAt").type(JsonFieldType.STRING).description("수정일"), fieldWithPath("numberOfElements").type(JsonFieldType.NUMBER).description("전체 데이터 개수"), fieldWithPath("totalElements").type(JsonFieldType.NUMBER).description("전체 요소 개수"), From e5b7e46f03aa92c3b047840f99e2aee6bf263fea Mon Sep 17 00:00:00 2001 From: weonest Date: Wed, 9 Aug 2023 23:17:35 +0900 Subject: [PATCH 57/59] =?UTF-8?q?feat:=20Error=20=EA=B8=80=EB=A1=9C?= =?UTF-8?q?=EB=B2=8C=20=EA=B4=80=EB=A6=AC=20base=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jpaboard/domain/post/Post.java | 2 +- .../post/application/PostServiceImpl.java | 4 +- .../post/exception/PostNotFoundException.java | 4 ++ .../java/com/jpaboard/domain/user/User.java | 2 +- .../user/presentation/UserController.java | 1 + .../{ => global}/common/BaseEntity.java | 2 +- .../global/exception/ErrorCodeWithDetail.java | 21 +++++++++ .../global/exception/ErrorResponse.java | 43 +++++++++++++++++++ .../global/exception/FieldErrorInfo.java | 30 +++++++++++++ .../exception/GlobalExceptionHandler.java | 16 +++++++ 10 files changed, 120 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/jpaboard/domain/post/exception/PostNotFoundException.java rename src/main/java/com/jpaboard/{ => global}/common/BaseEntity.java (95%) create mode 100644 src/main/java/com/jpaboard/global/exception/ErrorCodeWithDetail.java create mode 100644 src/main/java/com/jpaboard/global/exception/ErrorResponse.java create mode 100644 src/main/java/com/jpaboard/global/exception/FieldErrorInfo.java create mode 100644 src/main/java/com/jpaboard/global/exception/GlobalExceptionHandler.java diff --git a/src/main/java/com/jpaboard/domain/post/Post.java b/src/main/java/com/jpaboard/domain/post/Post.java index 9177998cd..8384d41b0 100644 --- a/src/main/java/com/jpaboard/domain/post/Post.java +++ b/src/main/java/com/jpaboard/domain/post/Post.java @@ -1,6 +1,6 @@ package com.jpaboard.domain.post; -import com.jpaboard.common.BaseEntity; +import com.jpaboard.global.common.BaseEntity; import com.jpaboard.domain.user.User; import jakarta.persistence.*; import lombok.AccessLevel; diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java index 2a2934f65..41becd706 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -10,6 +10,7 @@ import com.jpaboard.domain.post.infrastructure.PostRepository; import com.jpaboard.domain.user.User; import com.jpaboard.domain.user.infrastructure.UserRepository; +import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -22,12 +23,11 @@ public class PostServiceImpl implements PostService { private final PostRepository postRepository; - // Repository를 주입 받는 게 좋은지, Service를 주입 받는게 좋은지 private final UserRepository userRepository; @Transactional public Long createPost(PostCreateRequest request) { - User user = userRepository.findById(request.userId()).orElseThrow(IllegalArgumentException::new); + User user = userRepository.findById(request.userId()).orElseThrow(EntityNotFoundException::new); Post post = PostConverter.convertRequestToEntity(request, user); return postRepository.save(post).getId(); } diff --git a/src/main/java/com/jpaboard/domain/post/exception/PostNotFoundException.java b/src/main/java/com/jpaboard/domain/post/exception/PostNotFoundException.java new file mode 100644 index 000000000..47ac64c2c --- /dev/null +++ b/src/main/java/com/jpaboard/domain/post/exception/PostNotFoundException.java @@ -0,0 +1,4 @@ +package com.jpaboard.domain.post.exception; + +public class PostNotFoundException { +} diff --git a/src/main/java/com/jpaboard/domain/user/User.java b/src/main/java/com/jpaboard/domain/user/User.java index 0cdc10191..ec7d7a46f 100644 --- a/src/main/java/com/jpaboard/domain/user/User.java +++ b/src/main/java/com/jpaboard/domain/user/User.java @@ -1,6 +1,6 @@ package com.jpaboard.domain.user; -import com.jpaboard.common.BaseEntity; +import com.jpaboard.global.common.BaseEntity; import jakarta.persistence.*; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; diff --git a/src/main/java/com/jpaboard/domain/user/presentation/UserController.java b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java index 793ec0406..f6385c9c2 100644 --- a/src/main/java/com/jpaboard/domain/user/presentation/UserController.java +++ b/src/main/java/com/jpaboard/domain/user/presentation/UserController.java @@ -4,6 +4,7 @@ import com.jpaboard.domain.user.dto.request.UserCreationRequest; import com.jpaboard.domain.user.dto.request.UserUpdateRequest; import com.jpaboard.domain.user.dto.response.UserResponse; +import jakarta.validation.ConstraintViolationException; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/jpaboard/common/BaseEntity.java b/src/main/java/com/jpaboard/global/common/BaseEntity.java similarity index 95% rename from src/main/java/com/jpaboard/common/BaseEntity.java rename to src/main/java/com/jpaboard/global/common/BaseEntity.java index 36809d28c..c442fc50d 100644 --- a/src/main/java/com/jpaboard/common/BaseEntity.java +++ b/src/main/java/com/jpaboard/global/common/BaseEntity.java @@ -1,4 +1,4 @@ -package com.jpaboard.common; +package com.jpaboard.global.common; import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; diff --git a/src/main/java/com/jpaboard/global/exception/ErrorCodeWithDetail.java b/src/main/java/com/jpaboard/global/exception/ErrorCodeWithDetail.java new file mode 100644 index 000000000..f0e58462a --- /dev/null +++ b/src/main/java/com/jpaboard/global/exception/ErrorCodeWithDetail.java @@ -0,0 +1,21 @@ +package com.jpaboard.global.exception; + +import lombok.Getter; + +@Getter +public enum ErrorCodeWithDetail { + // Common + ENTITY_NOT_FOUND(404, "C001", "해당 엔티티를 찾을 수 없습니다."), + INTERNAL_SERVER_ERROR(500, "C999", "서버 내부 에러입니다."); + + private final int status; + private final String code; + private final String message; + + ErrorCodeWithDetail(int status, String code, String message) { + this.status = status; + this.code = code; + this.message = message; + } + +} diff --git a/src/main/java/com/jpaboard/global/exception/ErrorResponse.java b/src/main/java/com/jpaboard/global/exception/ErrorResponse.java new file mode 100644 index 000000000..4d6f24ab4 --- /dev/null +++ b/src/main/java/com/jpaboard/global/exception/ErrorResponse.java @@ -0,0 +1,43 @@ +package com.jpaboard.global.exception; + +import lombok.Getter; +import org.springframework.validation.BindingResult; + +import java.util.ArrayList; +import java.util.List; + +@Getter +public class ErrorResponse { + private final int status; + private final String code; + private final String message; + private final List errors; + + private ErrorResponse(int status, String code, String message) { + this.status = status; + this.code = code; + this.message = message; + this.errors = new ArrayList<>(); + } + + private ErrorResponse(int status, String code, String message, List errors) { + this.status = status; + this.code = code; + this.message = message; + this.errors = errors; + } + + public static ErrorResponse create(ErrorCodeWithDetail detail) { + return new ErrorResponse(detail.getStatus(), + detail.getCode(), + detail.getMessage()); + } + + public static ErrorResponse create(ErrorCodeWithDetail detail, BindingResult bindingResult) { + return new ErrorResponse(detail.getStatus(), + detail.getCode(), + detail.getMessage(), + FieldErrorInfo.create(bindingResult)); + } + +} diff --git a/src/main/java/com/jpaboard/global/exception/FieldErrorInfo.java b/src/main/java/com/jpaboard/global/exception/FieldErrorInfo.java new file mode 100644 index 000000000..4cf2016ff --- /dev/null +++ b/src/main/java/com/jpaboard/global/exception/FieldErrorInfo.java @@ -0,0 +1,30 @@ +package com.jpaboard.global.exception; + +import lombok.Getter; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; + +import java.util.List; + +@Getter +public class FieldErrorInfo { + private final String field; + private final String value; + private final String reason; + + private FieldErrorInfo(String field, String value, String reason) { + this.field = field; + this.value = value; + this.reason = reason; + } + + public static List create(BindingResult bindingResult) { + List fieldErrors = bindingResult.getFieldErrors(); + return fieldErrors.stream() + .map(error -> new FieldErrorInfo( + error.getField(), + error.getRejectedValue() == null ? null : error.getRejectedValue().toString(), + error.getDefaultMessage())) + .toList(); + } +} diff --git a/src/main/java/com/jpaboard/global/exception/GlobalExceptionHandler.java b/src/main/java/com/jpaboard/global/exception/GlobalExceptionHandler.java new file mode 100644 index 000000000..4dee30e41 --- /dev/null +++ b/src/main/java/com/jpaboard/global/exception/GlobalExceptionHandler.java @@ -0,0 +1,16 @@ +package com.jpaboard.global.exception; + +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + @ExceptionHandler(Exception.class) + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ErrorResponse handler(Exception e) { + return ErrorResponse.create(ErrorCodeWithDetail.INTERNAL_SERVER_ERROR); + } + +} From 79047049227cccb2c5eb93143bac16587c9d5e7b Mon Sep 17 00:00:00 2001 From: weonest Date: Thu, 10 Aug 2023 00:18:48 +0900 Subject: [PATCH 58/59] =?UTF-8?q?feat:=20=EC=98=88=EC=99=B8=20=ED=95=B8?= =?UTF-8?q?=EB=93=A4=EB=A7=81=20=EB=B0=8F=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../post/application/PostServiceImpl.java | 8 +++--- .../global/advice/GlobalExceptionHandler.java | 27 +++++++++++++++++++ .../exception/GlobalExceptionHandler.java | 16 ----------- .../exception/PostNotFoundException.java | 9 +++++++ .../exception/UserNotFoundException.java | 9 +++++++ .../{ => response}/ErrorCodeWithDetail.java | 3 ++- .../{ => response}/ErrorResponse.java | 2 +- .../{ => response}/FieldErrorInfo.java | 2 +- 8 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 src/main/java/com/jpaboard/global/advice/GlobalExceptionHandler.java delete mode 100644 src/main/java/com/jpaboard/global/exception/GlobalExceptionHandler.java create mode 100644 src/main/java/com/jpaboard/global/exception/PostNotFoundException.java create mode 100644 src/main/java/com/jpaboard/global/exception/UserNotFoundException.java rename src/main/java/com/jpaboard/global/exception/{ => response}/ErrorCodeWithDetail.java (82%) rename src/main/java/com/jpaboard/global/exception/{ => response}/ErrorResponse.java (96%) rename src/main/java/com/jpaboard/global/exception/{ => response}/FieldErrorInfo.java (95%) diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java index 41becd706..728a8fd0b 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -10,6 +10,8 @@ import com.jpaboard.domain.post.infrastructure.PostRepository; import com.jpaboard.domain.user.User; import com.jpaboard.domain.user.infrastructure.UserRepository; +import com.jpaboard.global.exception.PostNotFoundException; +import com.jpaboard.global.exception.UserNotFoundException; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; @@ -27,13 +29,13 @@ public class PostServiceImpl implements PostService { @Transactional public Long createPost(PostCreateRequest request) { - User user = userRepository.findById(request.userId()).orElseThrow(EntityNotFoundException::new); + User user = userRepository.findById(request.userId()).orElseThrow(UserNotFoundException::new); Post post = PostConverter.convertRequestToEntity(request, user); return postRepository.save(post).getId(); } public PostResponse findPostById(Long id) { - Post post = postRepository.findById(id).orElseThrow(IllegalArgumentException::new); + Post post = postRepository.findById(id).orElseThrow(PostNotFoundException::new); return PostConverter.convertEntityToResponse(post); } @@ -51,7 +53,7 @@ public PostPageResponse findPostsByCondition(PostSearchRequest request, Pageable @Transactional public void updatePost(Long id, PostUpdateRequest request) { - Post post = postRepository.findById(id).orElseThrow(IllegalArgumentException::new); + Post post = postRepository.findById(id).orElseThrow(PostNotFoundException::new); post.update(request.title(), request.content()); } diff --git a/src/main/java/com/jpaboard/global/advice/GlobalExceptionHandler.java b/src/main/java/com/jpaboard/global/advice/GlobalExceptionHandler.java new file mode 100644 index 000000000..e1ba4c3e4 --- /dev/null +++ b/src/main/java/com/jpaboard/global/advice/GlobalExceptionHandler.java @@ -0,0 +1,27 @@ +package com.jpaboard.global.advice; + +import com.jpaboard.global.exception.PostNotFoundException; +import com.jpaboard.global.exception.UserNotFoundException; +import com.jpaboard.global.exception.response.ErrorCodeWithDetail; +import com.jpaboard.global.exception.response.ErrorResponse; +import org.springframework.http.HttpStatus; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + @ExceptionHandler(Exception.class) + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ErrorResponse handleException(Exception e) { + return ErrorResponse.create(ErrorCodeWithDetail.INTERNAL_SERVER_ERROR); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public ErrorResponse handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { + return ErrorResponse.create(ErrorCodeWithDetail.BAD_REQUEST, e.getBindingResult()); + } + +} diff --git a/src/main/java/com/jpaboard/global/exception/GlobalExceptionHandler.java b/src/main/java/com/jpaboard/global/exception/GlobalExceptionHandler.java deleted file mode 100644 index 4dee30e41..000000000 --- a/src/main/java/com/jpaboard/global/exception/GlobalExceptionHandler.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jpaboard.global.exception; - -import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -@RestControllerAdvice -public class GlobalExceptionHandler { - @ExceptionHandler(Exception.class) - @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) - public ErrorResponse handler(Exception e) { - return ErrorResponse.create(ErrorCodeWithDetail.INTERNAL_SERVER_ERROR); - } - -} diff --git a/src/main/java/com/jpaboard/global/exception/PostNotFoundException.java b/src/main/java/com/jpaboard/global/exception/PostNotFoundException.java new file mode 100644 index 000000000..e794f995f --- /dev/null +++ b/src/main/java/com/jpaboard/global/exception/PostNotFoundException.java @@ -0,0 +1,9 @@ +package com.jpaboard.global.exception; + +public class PostNotFoundException extends RuntimeException { + private static final String POST_NOT_FOUND_MESSAGE = "조회할 수 있는 Post가 없습니다."; + + public PostNotFoundException() { + super(POST_NOT_FOUND_MESSAGE); + } +} diff --git a/src/main/java/com/jpaboard/global/exception/UserNotFoundException.java b/src/main/java/com/jpaboard/global/exception/UserNotFoundException.java new file mode 100644 index 000000000..963dc48b3 --- /dev/null +++ b/src/main/java/com/jpaboard/global/exception/UserNotFoundException.java @@ -0,0 +1,9 @@ +package com.jpaboard.global.exception; + +public class UserNotFoundException extends RuntimeException { + private static final String USER_NOT_FOUND_MESSAGE = "조회할 수 있는 User가 없습니다."; + + public UserNotFoundException() { + super(USER_NOT_FOUND_MESSAGE); + } +} diff --git a/src/main/java/com/jpaboard/global/exception/ErrorCodeWithDetail.java b/src/main/java/com/jpaboard/global/exception/response/ErrorCodeWithDetail.java similarity index 82% rename from src/main/java/com/jpaboard/global/exception/ErrorCodeWithDetail.java rename to src/main/java/com/jpaboard/global/exception/response/ErrorCodeWithDetail.java index f0e58462a..74e32dc30 100644 --- a/src/main/java/com/jpaboard/global/exception/ErrorCodeWithDetail.java +++ b/src/main/java/com/jpaboard/global/exception/response/ErrorCodeWithDetail.java @@ -1,10 +1,11 @@ -package com.jpaboard.global.exception; +package com.jpaboard.global.exception.response; import lombok.Getter; @Getter public enum ErrorCodeWithDetail { // Common + BAD_REQUEST(400, "C000", "잘못된 요청입니다."), ENTITY_NOT_FOUND(404, "C001", "해당 엔티티를 찾을 수 없습니다."), INTERNAL_SERVER_ERROR(500, "C999", "서버 내부 에러입니다."); diff --git a/src/main/java/com/jpaboard/global/exception/ErrorResponse.java b/src/main/java/com/jpaboard/global/exception/response/ErrorResponse.java similarity index 96% rename from src/main/java/com/jpaboard/global/exception/ErrorResponse.java rename to src/main/java/com/jpaboard/global/exception/response/ErrorResponse.java index 4d6f24ab4..a06a70624 100644 --- a/src/main/java/com/jpaboard/global/exception/ErrorResponse.java +++ b/src/main/java/com/jpaboard/global/exception/response/ErrorResponse.java @@ -1,4 +1,4 @@ -package com.jpaboard.global.exception; +package com.jpaboard.global.exception.response; import lombok.Getter; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/jpaboard/global/exception/FieldErrorInfo.java b/src/main/java/com/jpaboard/global/exception/response/FieldErrorInfo.java similarity index 95% rename from src/main/java/com/jpaboard/global/exception/FieldErrorInfo.java rename to src/main/java/com/jpaboard/global/exception/response/FieldErrorInfo.java index 4cf2016ff..4fe74d416 100644 --- a/src/main/java/com/jpaboard/global/exception/FieldErrorInfo.java +++ b/src/main/java/com/jpaboard/global/exception/response/FieldErrorInfo.java @@ -1,4 +1,4 @@ -package com.jpaboard.global.exception; +package com.jpaboard.global.exception.response; import lombok.Getter; import org.springframework.validation.BindingResult; From d6d9c71d1f19059e8e2cd1d3f4063ebc8a5d9e90 Mon Sep 17 00:00:00 2001 From: weonest Date: Thu, 10 Aug 2023 00:19:08 +0900 Subject: [PATCH 59/59] =?UTF-8?q?feat:=20=EC=98=88=EC=99=B8=20=ED=95=B8?= =?UTF-8?q?=EB=93=A4=EB=A7=81=20=EB=B0=8F=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B6=94=EA=B0=80=20by=20sangmin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jpaboard/domain/post/application/PostServiceImpl.java | 1 + .../jpaboard/domain/user/application/UserServiceImpl.java | 4 +++- .../com/jpaboard/global/advice/GlobalExceptionHandler.java | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java index 728a8fd0b..5f51b04aa 100644 --- a/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/post/application/PostServiceImpl.java @@ -9,6 +9,7 @@ import com.jpaboard.domain.post.dto.response.PostResponse; import com.jpaboard.domain.post.infrastructure.PostRepository; import com.jpaboard.domain.user.User; +import com.jpaboard.domain.user.application.UserServiceImpl; import com.jpaboard.domain.user.infrastructure.UserRepository; import com.jpaboard.global.exception.PostNotFoundException; import com.jpaboard.global.exception.UserNotFoundException; diff --git a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java index 805a6c1c9..ad60341f3 100644 --- a/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java +++ b/src/main/java/com/jpaboard/domain/user/application/UserServiceImpl.java @@ -6,6 +6,7 @@ import com.jpaboard.domain.user.dto.request.UserUpdateRequest; import com.jpaboard.domain.user.dto.response.UserResponse; import com.jpaboard.domain.user.infrastructure.UserRepository; +import com.jpaboard.global.exception.UserNotFoundException; import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -15,6 +16,7 @@ @Transactional(readOnly = true) @RequiredArgsConstructor public class UserServiceImpl implements UserService { + private final UserRepository userRepository; @Transactional @@ -27,7 +29,7 @@ public Long createUser(UserCreationRequest request) { @Override public UserResponse findUserById(Long id) { User user = userRepository.findById(id) - .orElseThrow(EntityNotFoundException::new); + .orElseThrow(UserNotFoundException::new); return UserConverter.convertEntityToResponse(user); } diff --git a/src/main/java/com/jpaboard/global/advice/GlobalExceptionHandler.java b/src/main/java/com/jpaboard/global/advice/GlobalExceptionHandler.java index e1ba4c3e4..d7397868d 100644 --- a/src/main/java/com/jpaboard/global/advice/GlobalExceptionHandler.java +++ b/src/main/java/com/jpaboard/global/advice/GlobalExceptionHandler.java @@ -18,6 +18,12 @@ public ErrorResponse handleException(Exception e) { return ErrorResponse.create(ErrorCodeWithDetail.INTERNAL_SERVER_ERROR); } + @ExceptionHandler({PostNotFoundException.class, UserNotFoundException.class}) + @ResponseStatus(HttpStatus.NOT_FOUND) + public ErrorResponse handleEntityNotFoundException(RuntimeException e) { + return ErrorResponse.create(ErrorCodeWithDetail.ENTITY_NOT_FOUND); + } + @ExceptionHandler(MethodArgumentNotValidException.class) @ResponseStatus(HttpStatus.BAD_REQUEST) public ErrorResponse handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {