From ad496e37383ae5715da6eea5a25f04be3d75e0af Mon Sep 17 00:00:00 2001 From: Ellie Date: Sat, 25 Feb 2023 23:27:12 +0900 Subject: [PATCH 01/18] chore: initial settings --- restaurant/.gitignore | 37 +++ restaurant/build.gradle | 33 +++ restaurant/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + restaurant/gradlew | 240 ++++++++++++++++++ restaurant/gradlew.bat | 91 +++++++ restaurant/settings.gradle | 1 + .../restaurant/RestaurantApplication.java | 13 + .../src/main/resources/application.properties | 1 + .../RestaurantApplicationTests.java | 13 + 10 files changed, 434 insertions(+) create mode 100644 restaurant/.gitignore create mode 100644 restaurant/build.gradle create mode 100644 restaurant/gradle/wrapper/gradle-wrapper.jar create mode 100644 restaurant/gradle/wrapper/gradle-wrapper.properties create mode 100755 restaurant/gradlew create mode 100644 restaurant/gradlew.bat create mode 100644 restaurant/settings.gradle create mode 100644 restaurant/src/main/java/techeer/restaurant/RestaurantApplication.java create mode 100644 restaurant/src/main/resources/application.properties create mode 100644 restaurant/src/test/java/techeer/restaurant/RestaurantApplicationTests.java diff --git a/restaurant/.gitignore b/restaurant/.gitignore new file mode 100644 index 00000000..c2065bc2 --- /dev/null +++ b/restaurant/.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/restaurant/build.gradle b/restaurant/build.gradle new file mode 100644 index 00000000..f8014f67 --- /dev/null +++ b/restaurant/build.gradle @@ -0,0 +1,33 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.9' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +group = 'techeer' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '11' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + 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/restaurant/gradle/wrapper/gradle-wrapper.jar b/restaurant/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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"' + +# 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 + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + 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 + +# 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/restaurant/gradlew.bat b/restaurant/gradlew.bat new file mode 100644 index 00000000..53a6b238 --- /dev/null +++ b/restaurant/gradlew.bat @@ -0,0 +1,91 @@ +@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=. +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/restaurant/settings.gradle b/restaurant/settings.gradle new file mode 100644 index 00000000..253a94af --- /dev/null +++ b/restaurant/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'restaurant' diff --git a/restaurant/src/main/java/techeer/restaurant/RestaurantApplication.java b/restaurant/src/main/java/techeer/restaurant/RestaurantApplication.java new file mode 100644 index 00000000..e39cbf84 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/RestaurantApplication.java @@ -0,0 +1,13 @@ +package techeer.restaurant; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class RestaurantApplication { + + public static void main(String[] args) { + SpringApplication.run(RestaurantApplication.class, args); + } + +} diff --git a/restaurant/src/main/resources/application.properties b/restaurant/src/main/resources/application.properties new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/restaurant/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/restaurant/src/test/java/techeer/restaurant/RestaurantApplicationTests.java b/restaurant/src/test/java/techeer/restaurant/RestaurantApplicationTests.java new file mode 100644 index 00000000..88c61b5b --- /dev/null +++ b/restaurant/src/test/java/techeer/restaurant/RestaurantApplicationTests.java @@ -0,0 +1,13 @@ +package techeer.restaurant; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class RestaurantApplicationTests { + + @Test + void contextLoads() { + } + +} From e2be003d255947d7a100cc81dc91be5a175c58a4 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sat, 25 Feb 2023 23:53:57 +0900 Subject: [PATCH 02/18] chore: db settings --- .../src/main/resources/application.properties | 1 - restaurant/src/main/resources/application.yml | 18 ++++++++++++++++++ restaurant/src/main/resources/index.html | 0 3 files changed, 18 insertions(+), 1 deletion(-) delete mode 100644 restaurant/src/main/resources/application.properties create mode 100644 restaurant/src/main/resources/application.yml create mode 100644 restaurant/src/main/resources/index.html diff --git a/restaurant/src/main/resources/application.properties b/restaurant/src/main/resources/application.properties deleted file mode 100644 index 8b137891..00000000 --- a/restaurant/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ - diff --git a/restaurant/src/main/resources/application.yml b/restaurant/src/main/resources/application.yml new file mode 100644 index 00000000..67b8b750 --- /dev/null +++ b/restaurant/src/main/resources/application.yml @@ -0,0 +1,18 @@ +spring: + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://localhost:3306/restaurant?serverTimezone=Asia/Seoul + username: root + password: root0707 + + jpa: + hibernate: + ddl-auto: create # ? ??? ?????? ?? ??? ???? drop ??, ?? ????. + properties: + hibernate: + show_sql: true # System.out ? ?????? ?? SQL? ???. + format_sql: true # logger? ?? ?????? ?? SQL? ???. + +logging.level: + org.hibernate.SQL: debug + org.hibernate.type: trace # ?? ???? ?? ??? \ No newline at end of file diff --git a/restaurant/src/main/resources/index.html b/restaurant/src/main/resources/index.html new file mode 100644 index 00000000..e69de29b From 117e248dfa53624a50f92c50df99f7e516246043 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 00:36:14 +0900 Subject: [PATCH 03/18] feat: entity setting --- restaurant/build.gradle | 1 + .../domain/restaurant/entity/Category.java | 5 +++ .../domain/restaurant/entity/Restaurant.java | 32 +++++++++++++++++++ .../domain/review/entity/Review.java | 30 +++++++++++++++++ 4 files changed, 68 insertions(+) create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Category.java create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java diff --git a/restaurant/build.gradle b/restaurant/build.gradle index f8014f67..457341d4 100644 --- a/restaurant/build.gradle +++ b/restaurant/build.gradle @@ -22,6 +22,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.5.6' //쿼리 파라미터 로그 남기기 compileOnly 'org.projectlombok:lombok' runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Category.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Category.java new file mode 100644 index 00000000..fd416a1b --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Category.java @@ -0,0 +1,5 @@ +package techeer.restaurant.domain.restaurant.entity; + +public enum Category { + 한식, 중식, 일식 +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java new file mode 100644 index 00000000..6452fda7 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java @@ -0,0 +1,32 @@ +package techeer.restaurant.domain.restaurant.entity; + +import lombok.Getter; +import techeer.restaurant.domain.review.entity.Review; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Table(name = "restaurant") +public class Restaurant { + + @Id @GeneratedValue + @Column(name = "restaurant_id", nullable = false) + private Long id; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "category", nullable = false) + @Enumerated(EnumType.STRING) + private Category category; + + @OneToMany(mappedBy = "restaurant") + private List reviews = new ArrayList<>(); + + @Column(name = "is_deleted", nullable = false) + private boolean isDeleted; + +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java new file mode 100644 index 00000000..a8a6e628 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java @@ -0,0 +1,30 @@ +package techeer.restaurant.domain.review.entity; + +import lombok.Getter; +import techeer.restaurant.domain.restaurant.entity.Restaurant; + +import javax.persistence.*; + +import static javax.persistence.FetchType.LAZY; + +@Entity +@Getter +@Table(name = "review") +public class Review { + + @Id + @GeneratedValue + @Column(name = "review_id", nullable = false) + private Long id; + + @ManyToOne(fetch = LAZY) + @JoinColumn(name = "restaurant_id", nullable = false) + private Restaurant restaurant; + + @Column(name = "title", nullable = false) + private String title; + + @Column(name = "content", nullable = false) + private String content; + +} From 99ca3a1dfda93883eb96e6e66297394d28f8c45b Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 00:52:47 +0900 Subject: [PATCH 04/18] feat: base entity settings --- .../domain/restaurant/entity/Restaurant.java | 6 ++-- .../domain/review/entity/Review.java | 3 +- .../restaurant/global/domain/BaseEntity.java | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java index 6452fda7..eadbb48c 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java @@ -2,6 +2,7 @@ import lombok.Getter; import techeer.restaurant.domain.review.entity.Review; +import techeer.restaurant.global.domain.BaseEntity; import javax.persistence.*; import java.util.ArrayList; @@ -10,7 +11,7 @@ @Entity @Getter @Table(name = "restaurant") -public class Restaurant { +public class Restaurant extends BaseEntity { @Id @GeneratedValue @Column(name = "restaurant_id", nullable = false) @@ -26,7 +27,4 @@ public class Restaurant { @OneToMany(mappedBy = "restaurant") private List reviews = new ArrayList<>(); - @Column(name = "is_deleted", nullable = false) - private boolean isDeleted; - } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java index a8a6e628..b07778b1 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java @@ -2,6 +2,7 @@ import lombok.Getter; import techeer.restaurant.domain.restaurant.entity.Restaurant; +import techeer.restaurant.global.domain.BaseEntity; import javax.persistence.*; @@ -10,7 +11,7 @@ @Entity @Getter @Table(name = "review") -public class Review { +public class Review extends BaseEntity { @Id @GeneratedValue diff --git a/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java b/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java new file mode 100644 index 00000000..14883d07 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java @@ -0,0 +1,28 @@ +package techeer.restaurant.global.domain; + +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import javax.persistence.Column; +import javax.persistence.EntityListeners; +import javax.persistence.MappedSuperclass; +import java.time.LocalDateTime; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public class BaseEntity { + @CreatedDate protected LocalDateTime createdDate; + + @LastModifiedDate private LocalDateTime updatedDate; + + @Getter + @Column(name = "is_activated", nullable = false) + protected boolean isActivated; + + public void activeOff() { + this.isActivated = false; + } +} From fae99c23d84c4e02b7025a48a82cebe385cd6c71 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 00:55:29 +0900 Subject: [PATCH 05/18] refactor: rename entity var --- .../techeer/restaurant/global/domain/BaseEntity.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java b/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java index 14883d07..fbbf47bd 100644 --- a/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java +++ b/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java @@ -14,15 +14,15 @@ @MappedSuperclass @EntityListeners(AuditingEntityListener.class) public class BaseEntity { - @CreatedDate protected LocalDateTime createdDate; + @CreatedDate protected LocalDateTime createdAt; - @LastModifiedDate private LocalDateTime updatedDate; + @LastModifiedDate private LocalDateTime updatedAt; @Getter - @Column(name = "is_activated", nullable = false) - protected boolean isActivated; + @Column(name = "is_active", nullable = false) + protected boolean isActive; public void activeOff() { - this.isActivated = false; + this.isActive = false; } } From 8629f55b7cff17f55270455edca69103614ee9fd Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 03:13:40 +0900 Subject: [PATCH 06/18] =?UTF-8?q?feat:=20restaurant=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RestaurantController.java | 31 +++++++++++++++ .../dto/RestaurantCreateRequest.java | 19 +++++++++ .../domain/restaurant/dto/RestaurantInfo.java | 35 +++++++++++++++++ .../domain/restaurant/entity/Restaurant.java | 17 ++++++++ .../repository/RestaurantRepository.java | 18 +++++++++ .../restaurant/service/RestaurantService.java | 39 +++++++++++++++++++ .../review/repository/ReviewRepository.java | 4 ++ .../global/config/JpaAuditingConfig.java | 12 ++++++ .../restaurant/global/domain/BaseEntity.java | 1 - .../global/response/ResultResponse.java | 25 ++++++++++++ .../global/response/code/ResultCode.java | 15 +++++++ restaurant/src/main/resources/application.yml | 8 ++-- 12 files changed, 219 insertions(+), 5 deletions(-) create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantCreateRequest.java create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantInfo.java create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java create mode 100644 restaurant/src/main/java/techeer/restaurant/global/config/JpaAuditingConfig.java create mode 100644 restaurant/src/main/java/techeer/restaurant/global/response/ResultResponse.java create mode 100644 restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java new file mode 100644 index 00000000..b0b028d1 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java @@ -0,0 +1,31 @@ +package techeer.restaurant.domain.restaurant.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import techeer.restaurant.domain.restaurant.dto.RestaurantCreateRequest; +import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; +import techeer.restaurant.domain.restaurant.service.RestaurantService; +import techeer.restaurant.global.response.ResultResponse; +import techeer.restaurant.global.response.code.ResultCode; + +import javax.validation.Valid; + +@RequestMapping("/api/v1/restaurant") +@RestController +@RequiredArgsConstructor +public class RestaurantController { + + private final RestaurantService restaurantService; + + @PostMapping + public ResponseEntity createRestaurant( + @Valid @RequestBody RestaurantCreateRequest request) { + RestaurantInfo restaurantInfo = restaurantService.createRestaurant(request); + return ResponseEntity.ok(ResultResponse.of(ResultCode.RESTAURANT_CREATE_SUCCESS, restaurantInfo)); + + } +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantCreateRequest.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantCreateRequest.java new file mode 100644 index 00000000..ce1bd437 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantCreateRequest.java @@ -0,0 +1,19 @@ +package techeer.restaurant.domain.restaurant.dto; + + +import lombok.Builder; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import techeer.restaurant.domain.restaurant.entity.Category; + +import javax.validation.constraints.NotNull; + +@Builder +@Getter +@RequiredArgsConstructor +public class RestaurantCreateRequest { + + private final String name; + private final Category category; + +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantInfo.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantInfo.java new file mode 100644 index 00000000..27f214a9 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantInfo.java @@ -0,0 +1,35 @@ +package techeer.restaurant.domain.restaurant.dto; + +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; +import techeer.restaurant.domain.restaurant.entity.Category; + +import java.time.LocalDateTime; + +@Getter +@NoArgsConstructor +public class RestaurantInfo { + + private String name; + + private Category category; + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private LocalDateTime createdAt; + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private LocalDateTime updatedAt; + + @Builder + public RestaurantInfo(String name, Category category, LocalDateTime createdAt, LocalDateTime updatedAt) { + this.name = name; + this.category = category; + this.createdAt = createdAt; + this.updatedAt = updatedAt; + } + + + +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java index eadbb48c..8c9202c0 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java @@ -1,5 +1,6 @@ package techeer.restaurant.domain.restaurant.entity; +import lombok.Builder; import lombok.Getter; import techeer.restaurant.domain.review.entity.Review; import techeer.restaurant.global.domain.BaseEntity; @@ -27,4 +28,20 @@ public class Restaurant extends BaseEntity { @OneToMany(mappedBy = "restaurant") private List reviews = new ArrayList<>(); +/* public void updateCategory(RestaurantUpdateRequest restaurantUpdateRequest) { + this.category = restaurantUpdateRequest.getCategory(); + }*/ + + @Builder + public Restaurant(String name, Category category) { + this.name = name; + this.category = category; + this.isActive = true; + } + + public void deleteRestaurant() { + this.activeOff(); + } + + } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java new file mode 100644 index 00000000..0853d33a --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java @@ -0,0 +1,18 @@ +package techeer.restaurant.domain.restaurant.repository; + +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; +import org.springframework.stereotype.Repository; +import techeer.restaurant.domain.restaurant.entity.Restaurant; + +import java.util.Optional; + +@Repository +public interface RestaurantRepository extends JpaRepository { + + @Query("select R from Restaurant R where R.id= :id and R.isActive is true") + Optional findRestaurantById(Long id); + +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java new file mode 100644 index 00000000..4ea4582a --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java @@ -0,0 +1,39 @@ +package techeer.restaurant.domain.restaurant.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import techeer.restaurant.domain.restaurant.dto.RestaurantCreateRequest; +import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; +import techeer.restaurant.domain.restaurant.entity.Restaurant; +import techeer.restaurant.domain.restaurant.repository.RestaurantRepository; + +@Service +@RequiredArgsConstructor +public class RestaurantService { + + + private final RestaurantRepository restaurantRepository; + + public RestaurantInfo createRestaurant(RestaurantCreateRequest restaurantCreateRequest) { + Restaurant newRestaurant = convertRestaurantFromRequest(restaurantCreateRequest); + Restaurant savedRestaurant = restaurantRepository.save(newRestaurant); + return mapRestaurantEntityToRestaurantInfoResponse(savedRestaurant); + } + + private RestaurantInfo mapRestaurantEntityToRestaurantInfoResponse(Restaurant savedRestaurant) { + return RestaurantInfo.builder() + .name(savedRestaurant.getName()) + .category(savedRestaurant.getCategory()) + .createdAt(savedRestaurant.getCreatedAt()) + .updatedAt(savedRestaurant.getUpdatedAt()) + .build(); + } + + + private Restaurant convertRestaurantFromRequest(RestaurantCreateRequest restaurantCreateRequest) { + return Restaurant.builder() + .name(restaurantCreateRequest.getName()) + .category(restaurantCreateRequest.getCategory()) + .build(); + } +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java b/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java new file mode 100644 index 00000000..c8b3f18d --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java @@ -0,0 +1,4 @@ +package techeer.restaurant.domain.review.repository; + +public class ReviewRepository { +} diff --git a/restaurant/src/main/java/techeer/restaurant/global/config/JpaAuditingConfig.java b/restaurant/src/main/java/techeer/restaurant/global/config/JpaAuditingConfig.java new file mode 100644 index 00000000..6c944671 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/global/config/JpaAuditingConfig.java @@ -0,0 +1,12 @@ +package techeer.restaurant.global.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +//원래 Application에 설정할 애너테이션들을 여기에 넣음 (@Configuration에 의해) + +@EnableJpaAuditing //createdAt, updatedAt 설정 +@Configuration //애플리케이션 실행될때 실행 +public class JpaAuditingConfig { + +} diff --git a/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java b/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java index fbbf47bd..59cb9938 100644 --- a/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java +++ b/restaurant/src/main/java/techeer/restaurant/global/domain/BaseEntity.java @@ -15,7 +15,6 @@ @EntityListeners(AuditingEntityListener.class) public class BaseEntity { @CreatedDate protected LocalDateTime createdAt; - @LastModifiedDate private LocalDateTime updatedAt; @Getter diff --git a/restaurant/src/main/java/techeer/restaurant/global/response/ResultResponse.java b/restaurant/src/main/java/techeer/restaurant/global/response/ResultResponse.java new file mode 100644 index 00000000..ff6d81ff --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/global/response/ResultResponse.java @@ -0,0 +1,25 @@ +package techeer.restaurant.global.response; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import techeer.restaurant.global.response.code.ResultCode; + +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class ResultResponse { + private String code; + private String message; + private Object data; + + public static ResultResponse of(ResultCode resultCode, Object data) { + return new ResultResponse(resultCode, data); + } + + public ResultResponse(ResultCode resultCode, Object data) { + this.code = resultCode.getCode(); + this.message = resultCode.getMessage(); + this.data = data; + } +} diff --git a/restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java b/restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java new file mode 100644 index 00000000..d6121ae7 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java @@ -0,0 +1,15 @@ +package techeer.restaurant.global.response.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ResultCode { + + RESTAURANT_CREATE_SUCCESS("R001", "레스토랑 생성 성공"), + ; + + private final String code; + private final String message; +} diff --git a/restaurant/src/main/resources/application.yml b/restaurant/src/main/resources/application.yml index 67b8b750..e1f06981 100644 --- a/restaurant/src/main/resources/application.yml +++ b/restaurant/src/main/resources/application.yml @@ -7,12 +7,12 @@ spring: jpa: hibernate: - ddl-auto: create # ? ??? ?????? ?? ??? ???? drop ??, ?? ????. + ddl-auto: create properties: hibernate: - show_sql: true # System.out ? ?????? ?? SQL? ???. - format_sql: true # logger? ?? ?????? ?? SQL? ???. + show_sql: true + format_sql: true logging.level: org.hibernate.SQL: debug - org.hibernate.type: trace # ?? ???? ?? ??? \ No newline at end of file + org.hibernate.type: trace \ No newline at end of file From b9578525ef6c06c58550443bea466bd621d8b924 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 04:07:15 +0900 Subject: [PATCH 07/18] =?UTF-8?q?feat:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EB=8B=A8=EC=9D=BC=20=EC=A1=B0=ED=9A=8C=20api=20?= =?UTF-8?q?=EA=B0=9C=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RestaurantController.java | 11 +++++++---- .../domain/restaurant/entity/Restaurant.java | 15 +++++++++++++++ .../repository/RestaurantRepository.java | 3 ++- .../restaurant/service/RestaurantService.java | 13 +++++++++++++ .../global/response/code/ResultCode.java | 1 + 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java index b0b028d1..16e92c44 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java @@ -2,10 +2,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import techeer.restaurant.domain.restaurant.dto.RestaurantCreateRequest; import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; import techeer.restaurant.domain.restaurant.service.RestaurantService; @@ -28,4 +25,10 @@ public ResponseEntity createRestaurant( return ResponseEntity.ok(ResultResponse.of(ResultCode.RESTAURANT_CREATE_SUCCESS, restaurantInfo)); } + @GetMapping("/{id}") + public ResponseEntity findRestaurantById(@PathVariable Long id) { + RestaurantInfo restaurantInfo = restaurantService.findRestaurantInfoById(id); + return ResponseEntity.ok(ResultResponse.of(ResultCode.GET_ONE_RESTAURANT_SUCCESS, restaurantInfo)); + } + } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java index 8c9202c0..7f52e4f3 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java @@ -1,16 +1,21 @@ package techeer.restaurant.domain.restaurant.entity; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import techeer.restaurant.domain.review.entity.Review; import techeer.restaurant.global.domain.BaseEntity; import javax.persistence.*; import java.util.ArrayList; import java.util.List; +import java.util.Objects; @Entity @Getter +@NoArgsConstructor +@AllArgsConstructor @Table(name = "restaurant") public class Restaurant extends BaseEntity { @@ -39,6 +44,16 @@ public Restaurant(String name, Category category) { this.isActive = true; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Restaurant restaurant = (Restaurant) o; + return Objects.equals(id, restaurant.id) + && Objects.equals(name, restaurant.name) + && Objects.equals(category, restaurant.category); + } + public void deleteRestaurant() { this.activeOff(); } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java index 0853d33a..09e26b36 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java @@ -4,6 +4,7 @@ import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import techeer.restaurant.domain.restaurant.entity.Restaurant; @@ -13,6 +14,6 @@ public interface RestaurantRepository extends JpaRepository { @Query("select R from Restaurant R where R.id= :id and R.isActive is true") - Optional findRestaurantById(Long id); + Restaurant findRestaurantById(@Param("id") Long id); } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java index 4ea4582a..0262bdc4 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java @@ -7,6 +7,8 @@ import techeer.restaurant.domain.restaurant.entity.Restaurant; import techeer.restaurant.domain.restaurant.repository.RestaurantRepository; +import java.util.List; + @Service @RequiredArgsConstructor public class RestaurantService { @@ -36,4 +38,15 @@ private Restaurant convertRestaurantFromRequest(RestaurantCreateRequest restaura .category(restaurantCreateRequest.getCategory()) .build(); } + + + public RestaurantInfo findRestaurantInfoById(Long id) { + Restaurant foundRestaurant = findRestaurantById(id); + restaurantRepository.save(foundRestaurant); + return mapRestaurantEntityToRestaurantInfoResponse(foundRestaurant); + } + + private Restaurant findRestaurantById(Long id) { + return restaurantRepository.findRestaurantById(id); + } } diff --git a/restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java b/restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java index d6121ae7..1070b002 100644 --- a/restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java +++ b/restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java @@ -8,6 +8,7 @@ public enum ResultCode { RESTAURANT_CREATE_SUCCESS("R001", "레스토랑 생성 성공"), + GET_ONE_RESTAURANT_SUCCESS("R004", "레스토랑 단일 조회 성공"), ; private final String code; From a3ecff6b83178f765243bf87c2e868c7d73a5945 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 05:03:54 +0900 Subject: [PATCH 08/18] =?UTF-8?q?feat:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EC=A0=84=EC=B2=B4=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20and=20=EB=8B=A8=EC=9D=BC=20=EB=A0=88=EC=8A=A4?= =?UTF-8?q?=ED=86=A0=EB=9E=91=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RestaurantController.java | 24 ++++++++++++++--- .../restaurant/dto/RestaurantInfoList.java | 26 +++++++++++++++++++ .../domain/restaurant/entity/Restaurant.java | 18 ++++++------- .../repository/RestaurantRepository.java | 5 ++++ .../restaurant/service/RestaurantService.java | 25 ++++++++++++++++++ .../{ => domain}/response/ResultResponse.java | 4 +-- .../response/code/ResultCode.java | 4 ++- 7 files changed, 90 insertions(+), 16 deletions(-) create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantInfoList.java rename restaurant/src/main/java/techeer/restaurant/global/{ => domain}/response/ResultResponse.java (82%) rename restaurant/src/main/java/techeer/restaurant/global/{ => domain}/response/code/ResultCode.java (62%) diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java index 16e92c44..4d1a1681 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java @@ -5,12 +5,17 @@ import org.springframework.web.bind.annotation.*; import techeer.restaurant.domain.restaurant.dto.RestaurantCreateRequest; import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; +import techeer.restaurant.domain.restaurant.dto.RestaurantInfoList; +import techeer.restaurant.domain.restaurant.entity.Restaurant; import techeer.restaurant.domain.restaurant.service.RestaurantService; -import techeer.restaurant.global.response.ResultResponse; -import techeer.restaurant.global.response.code.ResultCode; +import techeer.restaurant.global.domain.response.ResultResponse; import javax.validation.Valid; +import java.util.List; + +import static techeer.restaurant.global.domain.response.code.ResultCode.*; + @RequestMapping("/api/v1/restaurant") @RestController @RequiredArgsConstructor @@ -22,13 +27,24 @@ public class RestaurantController { public ResponseEntity createRestaurant( @Valid @RequestBody RestaurantCreateRequest request) { RestaurantInfo restaurantInfo = restaurantService.createRestaurant(request); - return ResponseEntity.ok(ResultResponse.of(ResultCode.RESTAURANT_CREATE_SUCCESS, restaurantInfo)); + return ResponseEntity.ok(ResultResponse.of(RESTAURANT_CREATE_SUCCESS, restaurantInfo)); + } + @GetMapping + public ResponseEntity getAllRestaurant() { + RestaurantInfoList restaurantInfoList = restaurantService.getAllRestaurants(); + return ResponseEntity.ok(ResultResponse.of(GET_ALL_RESTAURANT_SUCCESS, restaurantInfoList)); } + @GetMapping("/{id}") public ResponseEntity findRestaurantById(@PathVariable Long id) { RestaurantInfo restaurantInfo = restaurantService.findRestaurantInfoById(id); - return ResponseEntity.ok(ResultResponse.of(ResultCode.GET_ONE_RESTAURANT_SUCCESS, restaurantInfo)); + return ResponseEntity.ok(ResultResponse.of(GET_ONE_RESTAURANT_SUCCESS, restaurantInfo)); + } + @DeleteMapping("/{id}") + public ResponseEntity deleteRestaurant(@PathVariable Long id) { + restaurantService.deleteRestaurant(id); + return ResponseEntity.ok(ResultResponse.of(DELETE_RESTAURANT_SUCCESS, "")); } } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantInfoList.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantInfoList.java new file mode 100644 index 00000000..6fa8bae0 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/dto/RestaurantInfoList.java @@ -0,0 +1,26 @@ +package techeer.restaurant.domain.restaurant.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import techeer.restaurant.domain.restaurant.entity.Restaurant; + +import java.util.ArrayList; +import java.util.List; + +@Builder +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class RestaurantInfoList { + private List restaurantInfos = new ArrayList<>(); + + public void addAllRestaurantInfo(List restaurantInfos) { + this.restaurantInfos.addAll(restaurantInfos); + } + + public void addRestaurantInfo(RestaurantInfo restaurantInfo) { + this.restaurantInfos.add(restaurantInfo); + } +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java index 7f52e4f3..be287a67 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java @@ -44,15 +44,15 @@ public Restaurant(String name, Category category) { this.isActive = true; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Restaurant restaurant = (Restaurant) o; - return Objects.equals(id, restaurant.id) - && Objects.equals(name, restaurant.name) - && Objects.equals(category, restaurant.category); - } +// @Override +// public boolean equals(Object o) { +// if (this == o) return true; +// if (o == null || getClass() != o.getClass()) return false; +// Restaurant restaurant = (Restaurant) o; +// return Objects.equals(id, restaurant.id) +// && Objects.equals(name, restaurant.name) +// && Objects.equals(category, restaurant.category); +// } public void deleteRestaurant() { this.activeOff(); diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java index 09e26b36..69678376 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java @@ -6,8 +6,10 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; import techeer.restaurant.domain.restaurant.entity.Restaurant; +import java.util.List; import java.util.Optional; @Repository @@ -16,4 +18,7 @@ public interface RestaurantRepository extends JpaRepository { @Query("select R from Restaurant R where R.id= :id and R.isActive is true") Restaurant findRestaurantById(@Param("id") Long id); + @Query("select R from Restaurant R where R.isActive is true") + List findAllRestaurant(); + } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java index 0262bdc4..8020c7d3 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java @@ -4,9 +4,11 @@ import org.springframework.stereotype.Service; import techeer.restaurant.domain.restaurant.dto.RestaurantCreateRequest; import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; +import techeer.restaurant.domain.restaurant.dto.RestaurantInfoList; import techeer.restaurant.domain.restaurant.entity.Restaurant; import techeer.restaurant.domain.restaurant.repository.RestaurantRepository; +import java.util.ArrayList; import java.util.List; @Service @@ -15,6 +17,21 @@ public class RestaurantService { private final RestaurantRepository restaurantRepository; + public RestaurantInfoList getAllRestaurants() { + List restaurants = restaurantRepository.findAllRestaurant(); + List restaurantInfos = new ArrayList<>(); + for(int i = 0; i < restaurants.size(); i++) { + restaurantInfos.add(RestaurantInfo.builder() + .name(restaurants.get(i).getName()) + .category(restaurants.get(i).getCategory()) + .createdAt(restaurants.get(i).getCreatedAt()) + .updatedAt(restaurants.get(i).getUpdatedAt()) + .build()); + } + + return new RestaurantInfoList(restaurantInfos); + } + public RestaurantInfo createRestaurant(RestaurantCreateRequest restaurantCreateRequest) { Restaurant newRestaurant = convertRestaurantFromRequest(restaurantCreateRequest); @@ -46,6 +63,14 @@ public RestaurantInfo findRestaurantInfoById(Long id) { return mapRestaurantEntityToRestaurantInfoResponse(foundRestaurant); } + + public void deleteRestaurant(Long id) { + Restaurant foundRestaurant = findRestaurantById(id); + foundRestaurant.deleteRestaurant(); + restaurantRepository.save(foundRestaurant); + } + + private Restaurant findRestaurantById(Long id) { return restaurantRepository.findRestaurantById(id); } diff --git a/restaurant/src/main/java/techeer/restaurant/global/response/ResultResponse.java b/restaurant/src/main/java/techeer/restaurant/global/domain/response/ResultResponse.java similarity index 82% rename from restaurant/src/main/java/techeer/restaurant/global/response/ResultResponse.java rename to restaurant/src/main/java/techeer/restaurant/global/domain/response/ResultResponse.java index ff6d81ff..72120bcf 100644 --- a/restaurant/src/main/java/techeer/restaurant/global/response/ResultResponse.java +++ b/restaurant/src/main/java/techeer/restaurant/global/domain/response/ResultResponse.java @@ -1,9 +1,9 @@ -package techeer.restaurant.global.response; +package techeer.restaurant.global.domain.response; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; -import techeer.restaurant.global.response.code.ResultCode; +import techeer.restaurant.global.domain.response.code.ResultCode; @Getter @AllArgsConstructor diff --git a/restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java b/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java similarity index 62% rename from restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java rename to restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java index 1070b002..841aa62c 100644 --- a/restaurant/src/main/java/techeer/restaurant/global/response/code/ResultCode.java +++ b/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java @@ -1,4 +1,4 @@ -package techeer.restaurant.global.response.code; +package techeer.restaurant.global.domain.response.code; import lombok.AllArgsConstructor; import lombok.Getter; @@ -8,7 +8,9 @@ public enum ResultCode { RESTAURANT_CREATE_SUCCESS("R001", "레스토랑 생성 성공"), + GET_ALL_RESTAURANT_SUCCESS("R003", "레스토랑 전체 조회 성공"), GET_ONE_RESTAURANT_SUCCESS("R004", "레스토랑 단일 조회 성공"), + DELETE_RESTAURANT_SUCCESS("R005", "레스토랑 삭제 성공"), ; private final String code; From 2e1dd351670d07cc9a1d69927d6f66cfe1e84bf7 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 05:53:20 +0900 Subject: [PATCH 09/18] =?UTF-8?q?feat:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EB=B3=84=20=EB=A0=88=EC=8A=A4=ED=86=A0=EB=9E=91=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20api=20=EA=B0=9C?= =?UTF-8?q?=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RestaurantController.java | 10 +++++++++- .../domain/restaurant/entity/Category.java | 2 +- .../repository/RestaurantRepository.java | 7 +++---- .../restaurant/service/RestaurantService.java | 16 ++++++++++++++-- .../global/domain/response/code/ResultCode.java | 4 +++- 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java index 4d1a1681..b1456074 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java @@ -6,6 +6,7 @@ import techeer.restaurant.domain.restaurant.dto.RestaurantCreateRequest; import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; import techeer.restaurant.domain.restaurant.dto.RestaurantInfoList; +import techeer.restaurant.domain.restaurant.entity.Category; import techeer.restaurant.domain.restaurant.entity.Restaurant; import techeer.restaurant.domain.restaurant.service.RestaurantService; import techeer.restaurant.global.domain.response.ResultResponse; @@ -32,10 +33,17 @@ public ResponseEntity createRestaurant( @GetMapping public ResponseEntity getAllRestaurant() { - RestaurantInfoList restaurantInfoList = restaurantService.getAllRestaurants(); + RestaurantInfoList restaurantInfoList = restaurantService.findAllRestaurants(); return ResponseEntity.ok(ResultResponse.of(GET_ALL_RESTAURANT_SUCCESS, restaurantInfoList)); } + @GetMapping(params={"category"}) + public ResponseEntity findAllRestaurantByCategory(@RequestParam("category") String category) { + RestaurantInfoList restaurantInfoList = restaurantService.findAllRestaurantsByCategory(Category.valueOf(category)); + return ResponseEntity.ok(ResultResponse.of(GET_CATEGORY_RESTAURANT_SUCCESS, restaurantInfoList)); + } + + @GetMapping("/{id}") public ResponseEntity findRestaurantById(@PathVariable Long id) { RestaurantInfo restaurantInfo = restaurantService.findRestaurantInfoById(id); diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Category.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Category.java index fd416a1b..16c81914 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Category.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Category.java @@ -1,5 +1,5 @@ package techeer.restaurant.domain.restaurant.entity; public enum Category { - 한식, 중식, 일식 + 한식, 중식, 일식, 양식 } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java index 69678376..ce20f818 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/repository/RestaurantRepository.java @@ -1,16 +1,13 @@ package techeer.restaurant.domain.restaurant.repository; -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; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; +import techeer.restaurant.domain.restaurant.entity.Category; import techeer.restaurant.domain.restaurant.entity.Restaurant; import java.util.List; -import java.util.Optional; @Repository public interface RestaurantRepository extends JpaRepository { @@ -21,4 +18,6 @@ public interface RestaurantRepository extends JpaRepository { @Query("select R from Restaurant R where R.isActive is true") List findAllRestaurant(); + @Query("select R from Restaurant R where R.category= :category and R.isActive is true") + List findAllRestaurantByCategory(@Param("category") Category category); } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java index 8020c7d3..c1665ec7 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java @@ -5,6 +5,7 @@ import techeer.restaurant.domain.restaurant.dto.RestaurantCreateRequest; import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; import techeer.restaurant.domain.restaurant.dto.RestaurantInfoList; +import techeer.restaurant.domain.restaurant.entity.Category; import techeer.restaurant.domain.restaurant.entity.Restaurant; import techeer.restaurant.domain.restaurant.repository.RestaurantRepository; @@ -17,8 +18,18 @@ public class RestaurantService { private final RestaurantRepository restaurantRepository; - public RestaurantInfoList getAllRestaurants() { + public RestaurantInfoList findAllRestaurants() { List restaurants = restaurantRepository.findAllRestaurant(); + return getRestaurantInfoList(restaurants); + } + + + public RestaurantInfoList findAllRestaurantsByCategory(Category category) { + List restaurants = restaurantRepository.findAllRestaurantByCategory(category); + return getRestaurantInfoList(restaurants); + } + + private RestaurantInfoList getRestaurantInfoList(List restaurants) { List restaurantInfos = new ArrayList<>(); for(int i = 0; i < restaurants.size(); i++) { restaurantInfos.add(RestaurantInfo.builder() @@ -32,7 +43,6 @@ public RestaurantInfoList getAllRestaurants() { return new RestaurantInfoList(restaurantInfos); } - public RestaurantInfo createRestaurant(RestaurantCreateRequest restaurantCreateRequest) { Restaurant newRestaurant = convertRestaurantFromRequest(restaurantCreateRequest); Restaurant savedRestaurant = restaurantRepository.save(newRestaurant); @@ -74,4 +84,6 @@ public void deleteRestaurant(Long id) { private Restaurant findRestaurantById(Long id) { return restaurantRepository.findRestaurantById(id); } + + } diff --git a/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java b/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java index 841aa62c..0c39af39 100644 --- a/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java +++ b/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java @@ -8,7 +8,9 @@ public enum ResultCode { RESTAURANT_CREATE_SUCCESS("R001", "레스토랑 생성 성공"), - GET_ALL_RESTAURANT_SUCCESS("R003", "레스토랑 전체 조회 성공"), + GET_ALL_RESTAURANT_SUCCESS("R003-1", "레스토랑 전체 조회 성공"), + + GET_CATEGORY_RESTAURANT_SUCCESS("R003-2", "레스토랑 카테고리 별 조회 성공"), GET_ONE_RESTAURANT_SUCCESS("R004", "레스토랑 단일 조회 성공"), DELETE_RESTAURANT_SUCCESS("R005", "레스토랑 삭제 성공"), ; From 24413adc6a8b0790ea69d463581caf1a6fd1e748 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 06:39:03 +0900 Subject: [PATCH 10/18] =?UTF-8?q?feat:=20=EB=A0=88=EC=8A=A4=ED=86=A0?= =?UTF-8?q?=EB=9E=91=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20api=20=EA=B0=9C=EB=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RestaurantController.java | 14 ++++++++++++-- .../domain/restaurant/entity/Restaurant.java | 1 + .../restaurant/service/RestaurantService.java | 9 +++++++++ .../global/domain/response/code/ResultCode.java | 3 ++- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java index b1456074..416cf814 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java @@ -14,6 +14,8 @@ import javax.validation.Valid; import java.util.List; +import java.util.Map; +import java.util.Optional; import static techeer.restaurant.global.domain.response.code.ResultCode.*; @@ -28,7 +30,7 @@ public class RestaurantController { public ResponseEntity createRestaurant( @Valid @RequestBody RestaurantCreateRequest request) { RestaurantInfo restaurantInfo = restaurantService.createRestaurant(request); - return ResponseEntity.ok(ResultResponse.of(RESTAURANT_CREATE_SUCCESS, restaurantInfo)); + return ResponseEntity.ok(ResultResponse.of(CREATE_RESTAURANT_SUCCESS, restaurantInfo)); } @GetMapping @@ -43,7 +45,6 @@ public ResponseEntity findAllRestaurantByCategory(@RequestParam( return ResponseEntity.ok(ResultResponse.of(GET_CATEGORY_RESTAURANT_SUCCESS, restaurantInfoList)); } - @GetMapping("/{id}") public ResponseEntity findRestaurantById(@PathVariable Long id) { RestaurantInfo restaurantInfo = restaurantService.findRestaurantInfoById(id); @@ -55,4 +56,13 @@ public ResponseEntity deleteRestaurant(@PathVariable Long id) { return ResponseEntity.ok(ResultResponse.of(DELETE_RESTAURANT_SUCCESS, "")); } + @PatchMapping("/{id}") + public ResponseEntity updateRestaurantCategory( + @PathVariable Long id, + @RequestBody Map request + ) { + String category = request.get("category"); + restaurantService.updateRestaurantInfo(id, Category.valueOf(category)); + return ResponseEntity.ok(ResultResponse.of(UPDATE_RESTAURANT_SUCCESS, "")); + } } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java index be287a67..5e79ff91 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java @@ -57,6 +57,7 @@ public Restaurant(String name, Category category) { public void deleteRestaurant() { this.activeOff(); } + public void updateCategory(Category category){ this.category = category; } } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java index c1665ec7..728ec57f 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/service/RestaurantService.java @@ -1,6 +1,7 @@ package techeer.restaurant.domain.restaurant.service; import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import techeer.restaurant.domain.restaurant.dto.RestaurantCreateRequest; import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; @@ -9,8 +10,11 @@ import techeer.restaurant.domain.restaurant.entity.Restaurant; import techeer.restaurant.domain.restaurant.repository.RestaurantRepository; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Optional; @Service @RequiredArgsConstructor @@ -86,4 +90,9 @@ private Restaurant findRestaurantById(Long id) { } + public void updateRestaurantInfo(Long id, Category category) { + Restaurant restaurant = restaurantRepository.findRestaurantById(id); + restaurant.updateCategory(category); + restaurantRepository.save(restaurant); + } } diff --git a/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java b/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java index 0c39af39..5db4eac6 100644 --- a/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java +++ b/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java @@ -7,7 +7,8 @@ @AllArgsConstructor public enum ResultCode { - RESTAURANT_CREATE_SUCCESS("R001", "레스토랑 생성 성공"), + CREATE_RESTAURANT_SUCCESS("R001", "레스토랑 생성 성공"), + UPDATE_RESTAURANT_SUCCESS("R002", "레스토랑 수정 성공"), GET_ALL_RESTAURANT_SUCCESS("R003-1", "레스토랑 전체 조회 성공"), GET_CATEGORY_RESTAURANT_SUCCESS("R003-2", "레스토랑 카테고리 별 조회 성공"), From a71dea4dcce337426d3a2ea87fb7bdddde8987e6 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 07:19:47 +0900 Subject: [PATCH 11/18] =?UTF-8?q?feat:=20=EA=B2=B0=EA=B3=BC=20=EC=BD=94?= =?UTF-8?q?=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 --- .../review/controller/ReviewController.java | 28 +++++++++++++++++++ .../domain/review/dto/ReviewInfo.java | 4 +++ .../domain/review/dto/ReviewRequest.java | 15 ++++++++++ .../domain/response/code/ResultCode.java | 9 +++++- 4 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewRequest.java diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java new file mode 100644 index 00000000..9534af18 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java @@ -0,0 +1,28 @@ +package techeer.restaurant.domain.review.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import techeer.restaurant.domain.review.dto.ReviewInfo; +import techeer.restaurant.domain.review.dto.ReviewRequest; +import techeer.restaurant.domain.review.entity.Review; +import techeer.restaurant.global.domain.response.ResultResponse; +import techeer.restaurant.global.domain.response.code.ResultCode; + +import javax.validation.Valid; + +@RequestMapping("/api/v1/review") +@RestController +@RequiredArgsConstructor +public class ReviewController { + + @PostMapping + public ResponseEntity createReview( + @Valid @RequestBody ReviewRequest request + ) { + ReviewInfo reviewInfo = + return ResponseEntity.ok(ResultResponse.of(ResultCode.CREATE_REVIEW_SUCCESS_SUCCESS, reviewInfo)); + } + + +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java new file mode 100644 index 00000000..46dbb4bc --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java @@ -0,0 +1,4 @@ +package techeer.restaurant.domain.review.dto; + +public class ReviewInfo { +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewRequest.java b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewRequest.java new file mode 100644 index 00000000..b964ce89 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewRequest.java @@ -0,0 +1,15 @@ +package techeer.restaurant.domain.review.dto; + +import lombok.Builder; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Builder +@Getter +@RequiredArgsConstructor +public class ReviewRequest { + + private final Long restaurantId; + private final String title; + private final String content; +} diff --git a/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java b/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java index 5db4eac6..a5be5e3e 100644 --- a/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java +++ b/restaurant/src/main/java/techeer/restaurant/global/domain/response/code/ResultCode.java @@ -7,13 +7,20 @@ @AllArgsConstructor public enum ResultCode { + // restaurant CREATE_RESTAURANT_SUCCESS("R001", "레스토랑 생성 성공"), UPDATE_RESTAURANT_SUCCESS("R002", "레스토랑 수정 성공"), GET_ALL_RESTAURANT_SUCCESS("R003-1", "레스토랑 전체 조회 성공"), - GET_CATEGORY_RESTAURANT_SUCCESS("R003-2", "레스토랑 카테고리 별 조회 성공"), GET_ONE_RESTAURANT_SUCCESS("R004", "레스토랑 단일 조회 성공"), DELETE_RESTAURANT_SUCCESS("R005", "레스토랑 삭제 성공"), + + //review + GET_ALL_REVIEW_SUCCESS("RV001", "리뷰 전체 조회 성공"), + GET_ONE_REVIEW_SUCCESS("RV002", "리뷰 단일 조회 성공"), + UPDATE_REVIEW_SUCCESS("RV003", "리뷰 수정 성공"), + CREATE_REVIEW_SUCCESS("RV004", "리뷰 생성 성공"), + DELETE_REVIEW_SUCCESS("RV005", "리뷰 삭제 성공"), ; private final String code; From d0052b18d8b2bfa7d3ba42eb366c8fdc8368922e Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 07:59:31 +0900 Subject: [PATCH 12/18] =?UTF-8?q?=EB=A6=AC=EB=B7=B0=20=EC=9E=91=EC=84=B1?= =?UTF-8?q?=20api=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/restaurant/entity/Restaurant.java | 2 +- .../review/controller/ReviewController.java | 8 +++- .../domain/review/dto/ReviewInfo.java | 19 ++++++++ .../domain/review/entity/Review.java | 15 +++++- .../review/repository/ReviewRepository.java | 14 +++++- .../domain/review/service/ReviewService.java | 47 +++++++++++++++++++ 6 files changed, 100 insertions(+), 5 deletions(-) create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java index 5e79ff91..b850f1b0 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/entity/Restaurant.java @@ -19,7 +19,7 @@ @Table(name = "restaurant") public class Restaurant extends BaseEntity { - @Id @GeneratedValue + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "restaurant_id", nullable = false) private Long id; diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java index 9534af18..26d63ba1 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java @@ -6,22 +6,26 @@ import techeer.restaurant.domain.review.dto.ReviewInfo; import techeer.restaurant.domain.review.dto.ReviewRequest; import techeer.restaurant.domain.review.entity.Review; +import techeer.restaurant.domain.review.service.ReviewService; import techeer.restaurant.global.domain.response.ResultResponse; import techeer.restaurant.global.domain.response.code.ResultCode; import javax.validation.Valid; +import static techeer.restaurant.global.domain.response.code.ResultCode.CREATE_REVIEW_SUCCESS; + @RequestMapping("/api/v1/review") @RestController @RequiredArgsConstructor public class ReviewController { + private final ReviewService reviewService; @PostMapping public ResponseEntity createReview( @Valid @RequestBody ReviewRequest request ) { - ReviewInfo reviewInfo = - return ResponseEntity.ok(ResultResponse.of(ResultCode.CREATE_REVIEW_SUCCESS_SUCCESS, reviewInfo)); + ReviewInfo reviewInfo = reviewService.createReview(request); + return ResponseEntity.ok(ResultResponse.of(CREATE_REVIEW_SUCCESS, reviewInfo)); } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java index 46dbb4bc..eda929ff 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java @@ -1,4 +1,23 @@ package techeer.restaurant.domain.review.dto; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import techeer.restaurant.domain.restaurant.entity.Restaurant; + +@Getter +@NoArgsConstructor public class ReviewInfo { + + private String restaurant; + private String title; + private String content; + + @Builder + public ReviewInfo( + String restaurant, String title, String content) { + this.restaurant = restaurant; + this.title = title; + this.content = content; + } } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java index b07778b1..f29458db 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java @@ -1,6 +1,9 @@ package techeer.restaurant.domain.review.entity; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import techeer.restaurant.domain.restaurant.entity.Restaurant; import techeer.restaurant.global.domain.BaseEntity; @@ -10,11 +13,13 @@ @Entity @Getter +@NoArgsConstructor +@AllArgsConstructor @Table(name = "review") public class Review extends BaseEntity { @Id - @GeneratedValue + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "review_id", nullable = false) private Long id; @@ -28,4 +33,12 @@ public class Review extends BaseEntity { @Column(name = "content", nullable = false) private String content; + @Builder + public Review(String title, String content, Restaurant restaurant) { + this.title = title; + this.content = content; + this.restaurant = restaurant; + this.isActive = true; + } + } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java b/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java index c8b3f18d..3e8abf73 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java @@ -1,4 +1,16 @@ package techeer.restaurant.domain.review.repository; -public class ReviewRepository { +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; +import techeer.restaurant.domain.review.entity.Review; + +import java.util.Optional; + +@Repository +public interface ReviewRepository extends JpaRepository { + @Query(value = "select R from Review R where R.id = :id and R.isActive = true") + Review findReviewById(@Param("id") Long id); + } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java new file mode 100644 index 00000000..6df06ae4 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java @@ -0,0 +1,47 @@ +package techeer.restaurant.domain.review.service; + + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import techeer.restaurant.domain.restaurant.entity.Restaurant; +import techeer.restaurant.domain.restaurant.repository.RestaurantRepository; +import techeer.restaurant.domain.review.dto.ReviewInfo; +import techeer.restaurant.domain.review.dto.ReviewRequest; +import techeer.restaurant.domain.review.entity.Review; +import techeer.restaurant.domain.review.repository.ReviewRepository; + +@Service +@RequiredArgsConstructor +public class ReviewService { + + private final RestaurantRepository restaurantRepository; + private final ReviewRepository reviewRepository; + + public ReviewInfo createReview(ReviewRequest request) { + Review newReview = convertReviewFromRequest(request); + Review savedReview = reviewRepository.save(newReview); + return mapReviewEntityToReviewInfoResponse(savedReview); + } + + private Review convertReviewFromRequest(ReviewRequest request) { + Restaurant foundRestaurant = getRestaurantById(request.getRestaurantId()); + + return Review.builder() + .title(request.getTitle()) + .content(request.getContent()) + .restaurant(foundRestaurant) + .build(); + } + + private Restaurant getRestaurantById(Long restaurantId) { + return restaurantRepository.findRestaurantById(restaurantId); + } + + private ReviewInfo mapReviewEntityToReviewInfoResponse(Review review) { + return ReviewInfo.builder() + .title(review.getTitle()) + .content(review.getContent()) + .restaurant(review.getRestaurant().getName()) + .build(); + } +} From bb76674d80652e200152a0320fd9aa77e5ba59c5 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 08:10:17 +0900 Subject: [PATCH 13/18] =?UTF-8?q?feat:=20=EB=A6=AC=EB=B7=B0=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20api=20=EC=99=84=EB=A3=8C=20(hard=20delete)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/review/controller/ReviewController.java | 8 +++++++- .../restaurant/domain/review/service/ReviewService.java | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java index 26d63ba1..af244e89 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java @@ -12,7 +12,7 @@ import javax.validation.Valid; -import static techeer.restaurant.global.domain.response.code.ResultCode.CREATE_REVIEW_SUCCESS; +import static techeer.restaurant.global.domain.response.code.ResultCode.*; @RequestMapping("/api/v1/review") @RestController @@ -28,5 +28,11 @@ public ResponseEntity createReview( return ResponseEntity.ok(ResultResponse.of(CREATE_REVIEW_SUCCESS, reviewInfo)); } + @DeleteMapping("/{id}") + public ResponseEntity deleteRestaurant(@PathVariable Long id) { + reviewService.deleteReview(id); + return ResponseEntity.ok(ResultResponse.of(DELETE_REVIEW_SUCCESS, "")); + } + } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java index 6df06ae4..45836f04 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java @@ -44,4 +44,8 @@ private ReviewInfo mapReviewEntityToReviewInfoResponse(Review review) { .restaurant(review.getRestaurant().getName()) .build(); } + + public void deleteReview(Long id) { + reviewRepository.deleteById(id); + } } From c3d49e16abbd857a801f2dd93693ce57a44a573d Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 08:20:42 +0900 Subject: [PATCH 14/18] =?UTF-8?q?featL:=20=EB=A6=AC=EB=B7=B0=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20api=20=EC=99=84=EB=A3=8C~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/review/controller/ReviewController.java | 13 +++++++++++++ .../domain/review/dto/UpdateReviewRequest.java | 13 +++++++++++++ .../restaurant/domain/review/entity/Review.java | 8 ++++++++ .../domain/review/service/ReviewService.java | 8 ++++++++ 4 files changed, 42 insertions(+) create mode 100644 restaurant/src/main/java/techeer/restaurant/domain/review/dto/UpdateReviewRequest.java diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java index af244e89..8913f366 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java @@ -3,8 +3,10 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import techeer.restaurant.domain.restaurant.entity.Category; import techeer.restaurant.domain.review.dto.ReviewInfo; import techeer.restaurant.domain.review.dto.ReviewRequest; +import techeer.restaurant.domain.review.dto.UpdateReviewRequest; import techeer.restaurant.domain.review.entity.Review; import techeer.restaurant.domain.review.service.ReviewService; import techeer.restaurant.global.domain.response.ResultResponse; @@ -12,6 +14,8 @@ import javax.validation.Valid; +import java.util.Map; + import static techeer.restaurant.global.domain.response.code.ResultCode.*; @RequestMapping("/api/v1/review") @@ -28,6 +32,15 @@ public ResponseEntity createReview( return ResponseEntity.ok(ResultResponse.of(CREATE_REVIEW_SUCCESS, reviewInfo)); } + @PatchMapping("/{id}") + public ResponseEntity updateReview( + @PathVariable Long id, + @RequestBody UpdateReviewRequest request + ) { + reviewService.updateReviewInfo(id, request); + return ResponseEntity.ok(ResultResponse.of(UPDATE_RESTAURANT_SUCCESS, "")); + } + @DeleteMapping("/{id}") public ResponseEntity deleteRestaurant(@PathVariable Long id) { reviewService.deleteReview(id); diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/dto/UpdateReviewRequest.java b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/UpdateReviewRequest.java new file mode 100644 index 00000000..442cb979 --- /dev/null +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/UpdateReviewRequest.java @@ -0,0 +1,13 @@ +package techeer.restaurant.domain.review.dto; + +import lombok.Builder; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Builder +@Getter +@RequiredArgsConstructor +public class UpdateReviewRequest { + private final String title; + private final String content; +} diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java index f29458db..15fba2bd 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java @@ -41,4 +41,12 @@ public Review(String title, String content, Restaurant restaurant) { this.isActive = true; } + public void updateTitle(String title) { + this.title = title; + } + + public void updateContent(String content) { + this.content = content; + } + } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java index 45836f04..c4b41671 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java @@ -7,6 +7,7 @@ import techeer.restaurant.domain.restaurant.repository.RestaurantRepository; import techeer.restaurant.domain.review.dto.ReviewInfo; import techeer.restaurant.domain.review.dto.ReviewRequest; +import techeer.restaurant.domain.review.dto.UpdateReviewRequest; import techeer.restaurant.domain.review.entity.Review; import techeer.restaurant.domain.review.repository.ReviewRepository; @@ -48,4 +49,11 @@ private ReviewInfo mapReviewEntityToReviewInfoResponse(Review review) { public void deleteReview(Long id) { reviewRepository.deleteById(id); } + + public void updateReviewInfo(Long id, UpdateReviewRequest request) { + Review review = reviewRepository.findReviewById(id); + review.updateTitle(request.getTitle()); + review.updateContent(request.getContent()); + reviewRepository.save(review); + } } From 42437f559e123078edd0141acc3e72ae4d60c115 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 08:28:50 +0900 Subject: [PATCH 15/18] =?UTF-8?q?feat:=20=EB=A6=AC=EB=B7=B0=20=EB=8B=A8?= =?UTF-8?q?=EC=9D=BC=20=EC=A1=B0=ED=9A=8C=20api=20=EC=99=84=EB=A3=8C~~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/review/controller/ReviewController.java | 8 +++++++- .../domain/review/service/ReviewService.java | 11 +++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java index 8913f366..5eb596c1 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java @@ -3,6 +3,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; import techeer.restaurant.domain.restaurant.entity.Category; import techeer.restaurant.domain.review.dto.ReviewInfo; import techeer.restaurant.domain.review.dto.ReviewRequest; @@ -32,6 +33,12 @@ public ResponseEntity createReview( return ResponseEntity.ok(ResultResponse.of(CREATE_REVIEW_SUCCESS, reviewInfo)); } + @GetMapping("/{id}") + public ResponseEntity findReviewById(@PathVariable Long id) { + ReviewInfo reviewInfo = reviewService.findReviewInfoById(id); + return ResponseEntity.ok(ResultResponse.of(GET_ONE_REVIEW_SUCCESS, reviewInfo)); + } + @PatchMapping("/{id}") public ResponseEntity updateReview( @PathVariable Long id, @@ -47,5 +54,4 @@ public ResponseEntity deleteRestaurant(@PathVariable Long id) { return ResponseEntity.ok(ResultResponse.of(DELETE_REVIEW_SUCCESS, "")); } - } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java index c4b41671..9c82b373 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java @@ -3,6 +3,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; import techeer.restaurant.domain.restaurant.entity.Restaurant; import techeer.restaurant.domain.restaurant.repository.RestaurantRepository; import techeer.restaurant.domain.review.dto.ReviewInfo; @@ -56,4 +57,14 @@ public void updateReviewInfo(Long id, UpdateReviewRequest request) { review.updateContent(request.getContent()); reviewRepository.save(review); } + + public ReviewInfo findReviewInfoById(Long id) { + Review review = findReviewById(id); + reviewRepository.save(review); + return mapReviewEntityToReviewInfoResponse(review); + } + + public Review findReviewById(Long id) { + return reviewRepository.findReviewById(id); + } } From c16e260de9f4fc4c2cdac0bc9382e2bc7a3cda18 Mon Sep 17 00:00:00 2001 From: Ellie Date: Sun, 26 Feb 2023 09:46:36 +0900 Subject: [PATCH 16/18] =?UTF-8?q?feat:=20=EB=A6=AC=EB=B7=B0=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4=EC=9D=B4?= =?UTF-8?q?=EC=85=98&=EC=84=9C=EC=B9=AD..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/controller/ReviewController.java | 11 ++++- .../domain/review/entity/Review.java | 1 + .../review/repository/ReviewRepository.java | 22 ++++++++++ .../domain/review/service/ReviewService.java | 41 +++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java index 5eb596c1..1e372cf3 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java @@ -15,7 +15,7 @@ import javax.validation.Valid; -import java.util.Map; +import java.util.List; import static techeer.restaurant.global.domain.response.code.ResultCode.*; @@ -39,6 +39,15 @@ public ResponseEntity findReviewById(@PathVariable Long id) { return ResponseEntity.ok(ResultResponse.of(GET_ONE_REVIEW_SUCCESS, reviewInfo)); } + @GetMapping + public ResponseEntity getReviews(@RequestParam(required = false, defaultValue = "1") int page, + @RequestParam(required = false, defaultValue = "") String title, + @RequestParam(required = false, defaultValue = "") String content, + @RequestParam(required = false, defaultValue = "desc") String sort) { + List reviewInfos = reviewService.getReviews(page, title, content, sort); + return ResponseEntity.ok(ResultResponse.of(GET_ALL_REVIEW_SUCCESS, reviewInfos)); + } + @PatchMapping("/{id}") public ResponseEntity updateReview( @PathVariable Long id, diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java index 15fba2bd..13a6fb9f 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/entity/Review.java @@ -1,5 +1,6 @@ package techeer.restaurant.domain.review.entity; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java b/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java index 3e8abf73..d057483a 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java @@ -1,11 +1,18 @@ package techeer.restaurant.domain.review.repository; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; +import org.w3c.dom.css.CSS2Properties; import techeer.restaurant.domain.review.entity.Review; +import java.util.List; import java.util.Optional; @Repository @@ -13,4 +20,19 @@ public interface ReviewRepository extends JpaRepository { @Query(value = "select R from Review R where R.id = :id and R.isActive = true") Review findReviewById(@Param("id") Long id); + Page findByTitleContainingIgnoreCaseAndContentContainingIgnoreCaseOrderByCreatedAtDesc(String title, String content, PageRequest pageRequest); + + Page findByTitleContainingIgnoreCaseAndContentContainingIgnoreCaseOrderByCreatedAtAsc(String title, String content, PageRequest pageRequest); + + Page findByTitleContainingIgnoreCaseOrderByCreatedAtDesc(String title, PageRequest pageRequest); + + Page findByTitleContainingIgnoreCaseOrderByCreatedAtAsc(String title, PageRequest pageRequest); + + Page findByContentContainingIgnoreCaseOrderByCreatedAtDesc(String content, PageRequest pageRequest); + + Page findAllByOrderByCreatedAtDesc(PageRequest pageRequest); + + Page findByContentContainingIgnoreCaseOrderByCreatedAtAsc(String content, PageRequest pageRequest); + + Page findAllByOrderByCreatedAtAsc(PageRequest pageRequest); } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java index 9c82b373..19ee750a 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java @@ -2,6 +2,11 @@ import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; import techeer.restaurant.domain.restaurant.entity.Restaurant; @@ -12,6 +17,9 @@ import techeer.restaurant.domain.review.entity.Review; import techeer.restaurant.domain.review.repository.ReviewRepository; +import java.util.ArrayList; +import java.util.List; + @Service @RequiredArgsConstructor public class ReviewService { @@ -67,4 +75,37 @@ public ReviewInfo findReviewInfoById(Long id) { public Review findReviewById(Long id) { return reviewRepository.findReviewById(id); } + + public List getReviews(int page, String title, String content, String sort) { + PageRequest pageRequest = PageRequest.of(page - 1, 5, Sort.Direction.fromString(sort), "createdAt"); + + Page reviewsPage = null; + + + if (title != null && content != null && sort.equals("desc")) { + reviewsPage = reviewRepository.findByTitleContainingIgnoreCaseAndContentContainingIgnoreCaseOrderByCreatedAtDesc(title,content,pageRequest); + } else if (title != null && content != null && sort.equals("asc")) { + reviewsPage = reviewRepository.findByTitleContainingIgnoreCaseAndContentContainingIgnoreCaseOrderByCreatedAtAsc(title,content,pageRequest); + } else if (title != null && sort.equals("desc")) { + reviewsPage = reviewRepository.findByTitleContainingIgnoreCaseOrderByCreatedAtDesc(title, pageRequest); + } else if (title != null && sort.equals("asc")) { + reviewsPage = reviewRepository.findByTitleContainingIgnoreCaseOrderByCreatedAtAsc(title, pageRequest); + } else if (content != null && sort.equals("desc")) { + reviewsPage = reviewRepository.findByContentContainingIgnoreCaseOrderByCreatedAtDesc(content, pageRequest); + } else if (content != null && sort.equals("asc")) { + reviewsPage = reviewRepository.findByContentContainingIgnoreCaseOrderByCreatedAtAsc(content, pageRequest); + } else if (sort.equals("desc")) { + reviewsPage = reviewRepository.findAllByOrderByCreatedAtDesc(pageRequest); + } else if (sort.equals("asc")) { + reviewsPage = reviewRepository.findAllByOrderByCreatedAtAsc(pageRequest); + } + + + List reviews = reviewsPage.getContent(); + List reviewInfos = new ArrayList<>(); + for(int i = 0; i < reviews.size(); i++) { + reviewInfos.add(mapReviewEntityToReviewInfoResponse(reviews.get(i))); + } + return reviewInfos; + } } From e39dd1cefa90e35be0902ba2a329a15f43c8a901 Mon Sep 17 00:00:00 2001 From: Ellie Date: Mon, 27 Feb 2023 02:12:32 +0900 Subject: [PATCH 17/18] chore: restapi mod --- .../domain/restaurant/controller/RestaurantController.java | 2 +- .../domain/review/controller/ReviewController.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java index 416cf814..4dd3afaa 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/restaurant/controller/RestaurantController.java @@ -19,7 +19,7 @@ import static techeer.restaurant.global.domain.response.code.ResultCode.*; -@RequestMapping("/api/v1/restaurant") +@RequestMapping("/api/v1/restaurants") @RestController @RequiredArgsConstructor public class RestaurantController { diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java index 1e372cf3..51f5ff57 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java @@ -19,7 +19,7 @@ import static techeer.restaurant.global.domain.response.code.ResultCode.*; -@RequestMapping("/api/v1/review") +@RequestMapping("/api/v1/reviews") @RestController @RequiredArgsConstructor public class ReviewController { @@ -41,8 +41,8 @@ public ResponseEntity findReviewById(@PathVariable Long id) { @GetMapping public ResponseEntity getReviews(@RequestParam(required = false, defaultValue = "1") int page, - @RequestParam(required = false, defaultValue = "") String title, - @RequestParam(required = false, defaultValue = "") String content, + @RequestParam(required = false) String title, + @RequestParam(required = false) String content, @RequestParam(required = false, defaultValue = "desc") String sort) { List reviewInfos = reviewService.getReviews(page, title, content, sort); return ResponseEntity.ok(ResultResponse.of(GET_ALL_REVIEW_SUCCESS, reviewInfos)); From 617b4245975aad985b1f62b0ae9d55586f84c9f8 Mon Sep 17 00:00:00 2001 From: Ellie Date: Mon, 27 Feb 2023 03:06:31 +0900 Subject: [PATCH 18/18] =?UTF-8?q?refactor:=20=EB=A6=AC=EB=B7=B0=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20api=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../review/controller/ReviewController.java | 15 ++--- .../domain/review/dto/ReviewInfo.java | 26 +++++++- .../review/repository/ReviewRepository.java | 30 +++------ .../domain/review/service/ReviewService.java | 61 ++++++++----------- 4 files changed, 63 insertions(+), 69 deletions(-) diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java index 51f5ff57..8b5cffe6 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/controller/ReviewController.java @@ -3,15 +3,11 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; -import techeer.restaurant.domain.restaurant.entity.Category; import techeer.restaurant.domain.review.dto.ReviewInfo; import techeer.restaurant.domain.review.dto.ReviewRequest; import techeer.restaurant.domain.review.dto.UpdateReviewRequest; -import techeer.restaurant.domain.review.entity.Review; import techeer.restaurant.domain.review.service.ReviewService; import techeer.restaurant.global.domain.response.ResultResponse; -import techeer.restaurant.global.domain.response.code.ResultCode; import javax.validation.Valid; @@ -40,11 +36,12 @@ public ResponseEntity findReviewById(@PathVariable Long id) { } @GetMapping - public ResponseEntity getReviews(@RequestParam(required = false, defaultValue = "1") int page, - @RequestParam(required = false) String title, - @RequestParam(required = false) String content, - @RequestParam(required = false, defaultValue = "desc") String sort) { - List reviewInfos = reviewService.getReviews(page, title, content, sort); + public ResponseEntity getReviews(@RequestParam(required = false, defaultValue = "0") Integer page, + @RequestParam(required = false, defaultValue = "3") Integer size, + @RequestParam(required = false, defaultValue = "") String title, + @RequestParam(required = false, defaultValue = "") String content, + @RequestParam(required = false, defaultValue = "false") String descending) { + List reviewInfos = reviewService.findAllWithPagination(page, size, title, content, Boolean.parseBoolean(descending)); return ResponseEntity.ok(ResultResponse.of(GET_ALL_REVIEW_SUCCESS, reviewInfos)); } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java index eda929ff..7632741d 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/dto/ReviewInfo.java @@ -4,20 +4,40 @@ import lombok.Getter; import lombok.NoArgsConstructor; import techeer.restaurant.domain.restaurant.entity.Restaurant; +import techeer.restaurant.domain.review.entity.Review; + +import java.time.LocalDateTime; @Getter @NoArgsConstructor public class ReviewInfo { - private String restaurant; + private Long reviewId; + private String restaurantName; private String title; private String content; + private LocalDateTime createdAt; + @Builder public ReviewInfo( - String restaurant, String title, String content) { - this.restaurant = restaurant; + Long reviewId, String restaurantName, String title, String content, LocalDateTime createdAt) { + this.reviewId = reviewId; + this.restaurantName = restaurantName; this.title = title; this.content = content; + this.createdAt = createdAt; + } + + public static ReviewInfo of( + Review entity + ) { + return ReviewInfo.builder() + .reviewId(entity.getId()) + .restaurantName(entity.getRestaurant().getName()) + .title(entity.getTitle()) + .content(entity.getContent()) + .createdAt(entity.getCreatedAt()) + .build(); } } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java b/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java index d057483a..014d24a1 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/repository/ReviewRepository.java @@ -1,38 +1,26 @@ package techeer.restaurant.domain.review.repository; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import org.springframework.data.domain.Sort; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; -import org.w3c.dom.css.CSS2Properties; import techeer.restaurant.domain.review.entity.Review; import java.util.List; -import java.util.Optional; @Repository public interface ReviewRepository extends JpaRepository { @Query(value = "select R from Review R where R.id = :id and R.isActive = true") Review findReviewById(@Param("id") Long id); - Page findByTitleContainingIgnoreCaseAndContentContainingIgnoreCaseOrderByCreatedAtDesc(String title, String content, PageRequest pageRequest); - - Page findByTitleContainingIgnoreCaseAndContentContainingIgnoreCaseOrderByCreatedAtAsc(String title, String content, PageRequest pageRequest); - - Page findByTitleContainingIgnoreCaseOrderByCreatedAtDesc(String title, PageRequest pageRequest); - - Page findByTitleContainingIgnoreCaseOrderByCreatedAtAsc(String title, PageRequest pageRequest); - - Page findByContentContainingIgnoreCaseOrderByCreatedAtDesc(String content, PageRequest pageRequest); - - Page findAllByOrderByCreatedAtDesc(PageRequest pageRequest); - - Page findByContentContainingIgnoreCaseOrderByCreatedAtAsc(String content, PageRequest pageRequest); - - Page findAllByOrderByCreatedAtAsc(PageRequest pageRequest); + @Query(value = "SELECT r\n " + + "FROM Review r\n " + + "WHERE (r.title = '' OR r.title Like CONCAT('%', :title, '%'))\n " + + "AND (r.content = '' OR r.content Like CONCAT('%', :content, '%'))\n") + List findAllWithFieldQuery( + String title, + String content, + Pageable pageable + ); } diff --git a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java index 19ee750a..4154ffde 100644 --- a/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java +++ b/restaurant/src/main/java/techeer/restaurant/domain/review/service/ReviewService.java @@ -2,13 +2,9 @@ import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.jpa.domain.Specification; import org.springframework.stereotype.Service; -import techeer.restaurant.domain.restaurant.dto.RestaurantInfo; import techeer.restaurant.domain.restaurant.entity.Restaurant; import techeer.restaurant.domain.restaurant.repository.RestaurantRepository; import techeer.restaurant.domain.review.dto.ReviewInfo; @@ -19,6 +15,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; @Service @RequiredArgsConstructor @@ -49,9 +46,11 @@ private Restaurant getRestaurantById(Long restaurantId) { private ReviewInfo mapReviewEntityToReviewInfoResponse(Review review) { return ReviewInfo.builder() + .reviewId(review.getId()) .title(review.getTitle()) .content(review.getContent()) - .restaurant(review.getRestaurant().getName()) + .restaurantName(review.getRestaurant().getName()) + .createdAt(review.getCreatedAt()) .build(); } @@ -76,36 +75,26 @@ public Review findReviewById(Long id) { return reviewRepository.findReviewById(id); } - public List getReviews(int page, String title, String content, String sort) { - PageRequest pageRequest = PageRequest.of(page - 1, 5, Sort.Direction.fromString(sort), "createdAt"); - - Page reviewsPage = null; - - - if (title != null && content != null && sort.equals("desc")) { - reviewsPage = reviewRepository.findByTitleContainingIgnoreCaseAndContentContainingIgnoreCaseOrderByCreatedAtDesc(title,content,pageRequest); - } else if (title != null && content != null && sort.equals("asc")) { - reviewsPage = reviewRepository.findByTitleContainingIgnoreCaseAndContentContainingIgnoreCaseOrderByCreatedAtAsc(title,content,pageRequest); - } else if (title != null && sort.equals("desc")) { - reviewsPage = reviewRepository.findByTitleContainingIgnoreCaseOrderByCreatedAtDesc(title, pageRequest); - } else if (title != null && sort.equals("asc")) { - reviewsPage = reviewRepository.findByTitleContainingIgnoreCaseOrderByCreatedAtAsc(title, pageRequest); - } else if (content != null && sort.equals("desc")) { - reviewsPage = reviewRepository.findByContentContainingIgnoreCaseOrderByCreatedAtDesc(content, pageRequest); - } else if (content != null && sort.equals("asc")) { - reviewsPage = reviewRepository.findByContentContainingIgnoreCaseOrderByCreatedAtAsc(content, pageRequest); - } else if (sort.equals("desc")) { - reviewsPage = reviewRepository.findAllByOrderByCreatedAtDesc(pageRequest); - } else if (sort.equals("asc")) { - reviewsPage = reviewRepository.findAllByOrderByCreatedAtAsc(pageRequest); - } - - - List reviews = reviewsPage.getContent(); - List reviewInfos = new ArrayList<>(); - for(int i = 0; i < reviews.size(); i++) { - reviewInfos.add(mapReviewEntityToReviewInfoResponse(reviews.get(i))); - } - return reviewInfos; + public List findAllWithPagination( + Integer page, + Integer size, + String title, + String content, + boolean descending + ) { + PageRequest pageRequest = PageRequest.of( + page, + size, + descending ? Sort.by("createdAt").descending() : Sort.by("createdAt").ascending() + ); + + return reviewRepository.findAllWithFieldQuery( + title, + content, + pageRequest + ) + .stream() + .map(ReviewInfo::of) + .collect(Collectors.toList()); } }