diff --git a/demo/.gitignore b/demo/.gitignore new file mode 100644 index 00000000..0032438f --- /dev/null +++ b/demo/.gitignore @@ -0,0 +1,40 @@ +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/ + +### properties ### +application.dev.properties \ No newline at end of file diff --git a/demo/build.gradle b/demo/build.gradle new file mode 100644 index 00000000..c25ccea9 --- /dev/null +++ b/demo/build.gradle @@ -0,0 +1,64 @@ +plugins { +// id 'java' +// id 'org.springframework.boot' version '3.1.0-SNAPSHOT' +// id 'io.spring.dependency-management' version '1.1.0' +// id 'org.asciidoctor.jvm.convert' version '3.3.2' + + id 'org.springframework.boot' version '2.5.3' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '11' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + + +//repositories { +// mavenCentral() +// maven { url 'https://repo.spring.io/milestone' } +// maven { url 'https://repo.spring.io/snapshot' } +//} + +repositories { + mavenCentral() +} + +ext { + set('snippetsDir', file("build/generated-snippets")) +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-web-services' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-validation' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + runtimeOnly 'mysql:mysql-connector-java' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc' +} +// +//tasks.named('test') { +// outputs.dir snippetsDir +// useJUnitPlatform() +//} +// +//tasks.named('asciidoctor') { +// inputs.dir snippetsDir +// dependsOn test +//} +// + +test { + useJUnitPlatform() +} diff --git a/demo/gradle/wrapper/gradle-wrapper.jar b/demo/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..249e5832 Binary files /dev/null and b/demo/gradle/wrapper/gradle-wrapper.jar differ diff --git a/demo/gradle/wrapper/gradle-wrapper.properties b/demo/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..070cb702 --- /dev/null +++ b/demo/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/demo/gradlew b/demo/gradlew new file mode 100644 index 00000000..a69d9cb6 --- /dev/null +++ b/demo/gradlew @@ -0,0 +1,240 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + 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/demo/gradlew.bat b/demo/gradlew.bat new file mode 100644 index 00000000..f127cfd4 --- /dev/null +++ b/demo/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/demo/settings.gradle b/demo/settings.gradle new file mode 100644 index 00000000..d294bd1c --- /dev/null +++ b/demo/settings.gradle @@ -0,0 +1,8 @@ +pluginManagement { + repositories { + maven { url 'https://repo.spring.io/milestone' } + maven { url 'https://repo.spring.io/snapshot' } + gradlePluginPortal() + } +} +rootProject.name = 'demo' diff --git a/demo/src/main/java/com/example/demo/DemoApplication.java b/demo/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 00000000..092926c0 --- /dev/null +++ b/demo/src/main/java/com/example/demo/DemoApplication.java @@ -0,0 +1,15 @@ +package com.example.demo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +@EnableJpaAuditing +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/controller/RestaurantController.java b/demo/src/main/java/com/example/demo/domain/restaurant/controller/RestaurantController.java new file mode 100644 index 00000000..1db04c0f --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/controller/RestaurantController.java @@ -0,0 +1,50 @@ +package com.example.demo.domain.restaurant.controller; + +import com.example.demo.domain.restaurant.dto.request.RestaurantCreateRequest; +import com.example.demo.domain.restaurant.dto.response.RestaurantResponse; +import com.example.demo.domain.restaurant.dto.request.RestaurantSearchRequest; +import com.example.demo.domain.restaurant.dto.request.RestaurantUpdateRequest; +import com.example.demo.domain.restaurant.service.RestaurantServiceImpl; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RequestMapping("/api/v1/restaurants") +@RequiredArgsConstructor +@RestController +public class RestaurantController { + + private final RestaurantServiceImpl restaurantService; + + @PostMapping() + public ResponseEntity createRestaurant(@RequestBody RestaurantCreateRequest restaurantCreateRequest) { + RestaurantResponse restaurantResponse = restaurantService.createRestaurant(restaurantCreateRequest); + return ResponseEntity.ok(restaurantResponse); + } + + @GetMapping() + public ResponseEntity> getRestaurants(@ModelAttribute RestaurantSearchRequest restaurantSearchRequest) { + List restaurantResponses = restaurantService.getRestaurants(restaurantSearchRequest); + return ResponseEntity.ok(restaurantResponses); + } + + @GetMapping("/{id}") + public ResponseEntity getRestaurantById(@PathVariable Long id) { + RestaurantResponse restaurantResponse = restaurantService.getRestaurantById(id); + return ResponseEntity.ok(restaurantResponse); + } + + @PutMapping("/{id}") + public ResponseEntity updateRestaurant(@PathVariable Long id, @RequestBody RestaurantUpdateRequest restaurantUpdateRequest) { + RestaurantResponse restaurantResponse = restaurantService.updateRestaurant(id, restaurantUpdateRequest); + return ResponseEntity.ok(restaurantResponse); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteRestaurant(@PathVariable Long id) { + Boolean bool = restaurantService.deleteRestaurant(id); + return ResponseEntity.ok(bool); + } +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/dto/request/RestaurantCreateRequest.java b/demo/src/main/java/com/example/demo/domain/restaurant/dto/request/RestaurantCreateRequest.java new file mode 100644 index 00000000..aec74409 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/dto/request/RestaurantCreateRequest.java @@ -0,0 +1,24 @@ +package com.example.demo.domain.restaurant.dto.request; + +import com.example.demo.global.enumpkg.Category; +import com.example.demo.domain.restaurant.entity.Restaurant; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.ToString; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Getter +@Builder +@AllArgsConstructor +@ToString +public class RestaurantCreateRequest { + @NotBlank(message = "식당 이름은 빈칸일 수 없습니다") + private final String name; + + @NotNull(message = "식당 카테고리는 공백이 올 수 없습니다.") + private final Category category; + +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/dto/request/RestaurantSearchRequest.java b/demo/src/main/java/com/example/demo/domain/restaurant/dto/request/RestaurantSearchRequest.java new file mode 100644 index 00000000..20ddab65 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/dto/request/RestaurantSearchRequest.java @@ -0,0 +1,16 @@ +package com.example.demo.domain.restaurant.dto.request; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.global.enumpkg.Category; +import lombok.*; + +import javax.validation.constraints.NotNull; + +@Getter +@Builder +@AllArgsConstructor +@ToString +public class RestaurantSearchRequest { + private Category category; + +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/dto/request/RestaurantUpdateRequest.java b/demo/src/main/java/com/example/demo/domain/restaurant/dto/request/RestaurantUpdateRequest.java new file mode 100644 index 00000000..72b177bd --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/dto/request/RestaurantUpdateRequest.java @@ -0,0 +1,20 @@ +package com.example.demo.domain.restaurant.dto.request; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.global.enumpkg.Category; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotNull; + +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class RestaurantUpdateRequest { + @NotNull(message = "식당 카테고리는 공백이 올 수 없습니다.") + private Category category; + +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/dto/response/RestaurantResponse.java b/demo/src/main/java/com/example/demo/domain/restaurant/dto/response/RestaurantResponse.java new file mode 100644 index 00000000..9504f3d0 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/dto/response/RestaurantResponse.java @@ -0,0 +1,20 @@ +package com.example.demo.domain.restaurant.dto.response; + +import com.example.demo.global.enumpkg.Category; +import lombok.*; + +import java.time.LocalDateTime; + +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class RestaurantResponse { + private Long id; + private String name; + + private Category category; + + private LocalDateTime createdAt; + +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/entity/Restaurant.java b/demo/src/main/java/com/example/demo/domain/restaurant/entity/Restaurant.java new file mode 100644 index 00000000..d0372665 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/entity/Restaurant.java @@ -0,0 +1,47 @@ +package com.example.demo.domain.restaurant.entity; + +import com.example.demo.domain.review.entity.Review; +import com.example.demo.global.entity.TimeEntity; +import com.example.demo.global.enumpkg.Category; +import com.example.demo.domain.restaurant.dto.request.RestaurantUpdateRequest; +import javax.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Entity +@Data +public class Restaurant extends TimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "category", nullable = false) + @Enumerated(EnumType.STRING) + private Category category; + + @Column(name = "isDeleted", nullable = false) + private boolean isDeleted = Boolean.FALSE; + + @OneToMany(mappedBy = "restaurant") + private List reviewList; + + @Builder + public Restaurant(String name, Category category) { + this.name = name; + this.category = category; + } + + public void update(RestaurantUpdateRequest restaurantUpdateRequest){ + this.category = restaurantUpdateRequest.getCategory(); + } +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/map/ToRestaurantEntity.java b/demo/src/main/java/com/example/demo/domain/restaurant/map/ToRestaurantEntity.java new file mode 100644 index 00000000..f066cfeb --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/map/ToRestaurantEntity.java @@ -0,0 +1,17 @@ +package com.example.demo.domain.restaurant.map; + +import com.example.demo.domain.restaurant.dto.request.RestaurantCreateRequest; +import com.example.demo.domain.restaurant.entity.Restaurant; +import org.springframework.stereotype.Component; + +@Component +public class ToRestaurantEntity { + + public Restaurant toCreateEntity(RestaurantCreateRequest restaurant) { + return Restaurant.builder() + .name(restaurant.getName()) + .category(restaurant.getCategory()) + .build(); + } + +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/map/ToRestaurantResponse.java b/demo/src/main/java/com/example/demo/domain/restaurant/map/ToRestaurantResponse.java new file mode 100644 index 00000000..15b5949b --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/map/ToRestaurantResponse.java @@ -0,0 +1,17 @@ +package com.example.demo.domain.restaurant.map; + +import com.example.demo.domain.restaurant.dto.response.RestaurantResponse; +import com.example.demo.domain.restaurant.entity.Restaurant; +import org.springframework.stereotype.Component; + +@Component +public class ToRestaurantResponse { + public RestaurantResponse toResponse(Restaurant restaurant) { + return RestaurantResponse.builder() + .id(restaurant.getId()) + .name(restaurant.getName()) + .category(restaurant.getCategory()) + .createdAt(restaurant.getCreatedAt()) + .build(); + } +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/repository/RestaurantRepository.java b/demo/src/main/java/com/example/demo/domain/restaurant/repository/RestaurantRepository.java new file mode 100644 index 00000000..09d3ca11 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/repository/RestaurantRepository.java @@ -0,0 +1,27 @@ +package com.example.demo.domain.restaurant.repository; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.global.enumpkg.Category; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Repository +public interface RestaurantRepository extends JpaRepository { + + Restaurant findByIdAndIsDeletedFalse(Long id); + + List findAllByIsDeletedFalse(); + + List findAllByCategoryAndIsDeletedFalse(Category category); + + @Transactional + @Modifying(clearAutomatically = true) + @Query("UPDATE Restaurant r SET r.isDeleted = true WHERE r.id = :id") + void deleteByIdAndIsDeletedFalse(Long id); + +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/service/RestaurantService.java b/demo/src/main/java/com/example/demo/domain/restaurant/service/RestaurantService.java new file mode 100644 index 00000000..de46971a --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/service/RestaurantService.java @@ -0,0 +1,25 @@ +package com.example.demo.domain.restaurant.service; + +import com.example.demo.domain.restaurant.dto.request.RestaurantCreateRequest; +import com.example.demo.domain.restaurant.dto.response.RestaurantResponse; +import com.example.demo.domain.restaurant.dto.request.RestaurantSearchRequest; +import com.example.demo.domain.restaurant.dto.request.RestaurantUpdateRequest; + +import java.util.List; + +public interface RestaurantService { + // 식당 생성 + public RestaurantResponse createRestaurant(RestaurantCreateRequest restaurantDto); + + // 식당 수정 + public RestaurantResponse updateRestaurant(Long id, RestaurantUpdateRequest restaurantDto); + + // 식당 조회 - list + public List getRestaurants(RestaurantSearchRequest reviewDto); + + // 식당 조회 - detail + public RestaurantResponse getRestaurantById(Long restaurantId); + + // 식당 삭제 + public Boolean deleteRestaurant(Long restaurantId); +} diff --git a/demo/src/main/java/com/example/demo/domain/restaurant/service/RestaurantServiceImpl.java b/demo/src/main/java/com/example/demo/domain/restaurant/service/RestaurantServiceImpl.java new file mode 100644 index 00000000..cdc55116 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/restaurant/service/RestaurantServiceImpl.java @@ -0,0 +1,81 @@ +package com.example.demo.domain.restaurant.service; + +import com.example.demo.domain.restaurant.dto.request.RestaurantCreateRequest; +import com.example.demo.domain.restaurant.dto.response.RestaurantResponse; +import com.example.demo.domain.restaurant.dto.request.RestaurantSearchRequest; +import com.example.demo.domain.restaurant.dto.request.RestaurantUpdateRequest; +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.restaurant.map.ToRestaurantEntity; +import com.example.demo.domain.restaurant.map.ToRestaurantResponse; +import com.example.demo.domain.restaurant.repository.RestaurantRepository; +import javax.persistence.EntityNotFoundException; + +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class RestaurantServiceImpl implements RestaurantService{ + + @Autowired + RestaurantRepository repository; + + private final ToRestaurantEntity entity; + + private final ToRestaurantResponse response; + + @Transactional + public RestaurantResponse createRestaurant(RestaurantCreateRequest restaurantDto) { + Restaurant restaurant = entity.toCreateEntity(restaurantDto); + Restaurant savedRestaurant = repository.save(restaurant); + return response.toResponse(savedRestaurant); + } + + @Transactional + public RestaurantResponse updateRestaurant(Long id, RestaurantUpdateRequest restaurantDto) { + Restaurant restaurant = repository.findById(id).orElseThrow(EntityNotFoundException::new); + + restaurant.update(restaurantDto); + Restaurant savedRestaurant = repository.save(restaurant); + + return response.toResponse(savedRestaurant); + } + + @Transactional(readOnly = true) + public List getRestaurants(RestaurantSearchRequest reviewDto) { + List restaurants; + if(reviewDto.getCategory() == null) { + restaurants = repository.findAllByIsDeletedFalse(); + } else { + restaurants = repository.findAllByCategoryAndIsDeletedFalse(reviewDto.getCategory()); + } + List restaurantResponses = new ArrayList<>(); + restaurants.forEach(s -> restaurantResponses.add(response.toResponse(s))); + return restaurantResponses; + } + + @Transactional(readOnly = true) + public RestaurantResponse getRestaurantById(Long restaurantId) { + Restaurant restaurant = repository.findByIdAndIsDeletedFalse(restaurantId); + if (restaurant == null) { + return null; + } + return response.toResponse(restaurant); + } + + @Transactional + public Boolean deleteRestaurant(Long restaurantId) { + Restaurant restaurant = repository.findById(restaurantId).orElseThrow(EntityNotFoundException::new); + if(restaurant != null && restaurant.isDeleted() == false) { + repository.deleteByIdAndIsDeletedFalse(restaurantId); + return true; + } + return false; + } + +} diff --git a/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java b/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java new file mode 100644 index 00000000..5ea2e86d --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/controller/ReviewController.java @@ -0,0 +1,52 @@ +package com.example.demo.domain.review.controller; + +import com.example.demo.domain.review.dto.request.ReviewCreateRequest; +import com.example.demo.domain.review.dto.request.ReviewSearchRequest; +import com.example.demo.domain.review.dto.request.ReviewUpdateRequest; +import com.example.demo.domain.review.dto.response.ReviewResponse; +import com.example.demo.domain.review.service.ReviewServiceImpl; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RequestMapping("/api/v1/restaurants") +@RestController +@RequiredArgsConstructor +public class ReviewController { + private final ReviewServiceImpl reviewServiceImpl; + + @PostMapping("{restaurantId}/reviews") + public ResponseEntity createRestaurant(@PathVariable Long restaurantId, @RequestBody ReviewCreateRequest reviewCreateRequest) { + ReviewResponse reviewResponse = reviewServiceImpl.createReview(restaurantId, reviewCreateRequest); + return ResponseEntity.ok(reviewResponse); + } + + @GetMapping("{restaurantId}/reviews") + public ResponseEntity> getRestaurants( + @RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "5") int size, + @ModelAttribute ReviewSearchRequest reviewSearchRequest) { + List reviewResponse = reviewServiceImpl.getReviews(page, size, reviewSearchRequest); + return ResponseEntity.ok(reviewResponse); + } + + @GetMapping("{restaurantId}/reviews/{id}") + public ResponseEntity getRestaurantById(@PathVariable Long restaurantId, @PathVariable Long id) { + ReviewResponse reviewResponse = reviewServiceImpl.getReviewById(restaurantId, id); + return ResponseEntity.ok(reviewResponse); + } + + @PutMapping("{restaurantId}/reviews/{id}") + public ResponseEntity updateRestaurant(@PathVariable Long restaurantId, @PathVariable Long id, @RequestBody ReviewUpdateRequest reviewUpdateRequest) { + ReviewResponse reviewResponse = reviewServiceImpl.updateReview(restaurantId, id, reviewUpdateRequest); + return ResponseEntity.ok(reviewResponse); + } + + @DeleteMapping("{restaurantId}/reviews/{id}") + public ResponseEntity deleteRestaurant(@PathVariable Long restaurantId, @PathVariable Long id) { + reviewServiceImpl.deleteReview(restaurantId, id); + return ResponseEntity.ok("ok"); + } + +} diff --git a/demo/src/main/java/com/example/demo/domain/review/dto/request/ReviewCreateRequest.java b/demo/src/main/java/com/example/demo/domain/review/dto/request/ReviewCreateRequest.java new file mode 100644 index 00000000..3dfe513b --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/dto/request/ReviewCreateRequest.java @@ -0,0 +1,26 @@ +package com.example.demo.domain.review.dto.request; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.review.entity.Review; +import com.example.demo.global.enumpkg.Category; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.ToString; + +import javax.validation.constraints.NotBlank; + +@Getter +@Builder +@AllArgsConstructor +@ToString +public class ReviewCreateRequest { + private final Restaurant restaurant; + + @NotBlank(message = "리뷰 제목은 빈칸일 수 없습니다") + private final String title; + + @NotBlank(message = "리뷰 내용은 공백이 올 수 없습니다.") + private final String content; + +} diff --git a/demo/src/main/java/com/example/demo/domain/review/dto/request/ReviewSearchRequest.java b/demo/src/main/java/com/example/demo/domain/review/dto/request/ReviewSearchRequest.java new file mode 100644 index 00000000..9b29409f --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/dto/request/ReviewSearchRequest.java @@ -0,0 +1,19 @@ +package com.example.demo.domain.review.dto.request; + +import com.example.demo.global.enumpkg.SearchType; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.ToString; +import org.hibernate.annotations.ColumnDefault; + +@Getter +@Builder +@AllArgsConstructor +@ToString +public class ReviewSearchRequest { + private SearchType searchType; + + private String searchKeyword; + +} diff --git a/demo/src/main/java/com/example/demo/domain/review/dto/request/ReviewUpdateRequest.java b/demo/src/main/java/com/example/demo/domain/review/dto/request/ReviewUpdateRequest.java new file mode 100644 index 00000000..400782c8 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/dto/request/ReviewUpdateRequest.java @@ -0,0 +1,23 @@ +package com.example.demo.domain.review.dto.request; + +import com.example.demo.domain.review.entity.Review; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ReviewUpdateRequest { + @NotBlank(message = "리뷰 제목은 빈칸일 수 없습니다") + private String title; + + @NotNull(message = "리뷰 내용은 공백이 올 수 없습니다.") + private String content; + +} diff --git a/demo/src/main/java/com/example/demo/domain/review/dto/response/ReviewResponse.java b/demo/src/main/java/com/example/demo/domain/review/dto/response/ReviewResponse.java new file mode 100644 index 00000000..e86237f3 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/dto/response/ReviewResponse.java @@ -0,0 +1,27 @@ +package com.example.demo.domain.review.dto.response; + +import com.example.demo.domain.restaurant.dto.response.RestaurantResponse; +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.review.entity.Review; +import com.example.demo.global.enumpkg.Category; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ReviewResponse { + private Long id; + private String restaurantName; + private String title; + + private String content; + + private LocalDateTime createdAt; + +} diff --git a/demo/src/main/java/com/example/demo/domain/review/entity/Review.java b/demo/src/main/java/com/example/demo/domain/review/entity/Review.java new file mode 100644 index 00000000..4a0007d7 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/entity/Review.java @@ -0,0 +1,44 @@ +package com.example.demo.domain.review.entity; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.review.dto.request.ReviewUpdateRequest; +import com.example.demo.global.entity.TimeEntity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Entity +@Data +public class Review extends TimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "title", nullable = false) + private String title; + + @Column(name = "content", nullable = false) + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "restaurant_id") + private Restaurant restaurant; + + @Builder + public Review(String title, String content, Restaurant restaurant) { + this.title = title; + this.content = content; + this.restaurant = restaurant; + } + + public void update(ReviewUpdateRequest reviewUpdateRequest) { + this.title = reviewUpdateRequest.getTitle(); + this.content = reviewUpdateRequest.getContent(); + } +} diff --git a/demo/src/main/java/com/example/demo/domain/review/map/ToReviewEntity.java b/demo/src/main/java/com/example/demo/domain/review/map/ToReviewEntity.java new file mode 100644 index 00000000..51de8664 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/map/ToReviewEntity.java @@ -0,0 +1,26 @@ +package com.example.demo.domain.review.map; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.review.dto.request.ReviewCreateRequest; +import com.example.demo.domain.review.dto.request.ReviewUpdateRequest; +import com.example.demo.domain.review.entity.Review; +import org.springframework.stereotype.Component; + +@Component +public class ToReviewEntity { + + public Review toCreateEntity(ReviewCreateRequest review, Restaurant restaurant) { + return Review.builder() + .title(review.getTitle()) + .content(review.getContent()) + .restaurant(restaurant) + .build(); + } + + public Review toUpdateEntity(ReviewUpdateRequest review) { + return Review.builder() + .title(review.getTitle()) + .content(review.getContent()) + .build(); + } +} diff --git a/demo/src/main/java/com/example/demo/domain/review/map/ToReviewResponse.java b/demo/src/main/java/com/example/demo/domain/review/map/ToReviewResponse.java new file mode 100644 index 00000000..ad699ea5 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/map/ToReviewResponse.java @@ -0,0 +1,18 @@ +package com.example.demo.domain.review.map; + +import com.example.demo.domain.review.dto.response.ReviewResponse; +import com.example.demo.domain.review.entity.Review; +import org.springframework.stereotype.Component; + +@Component +public class ToReviewResponse { + public ReviewResponse toResponse(Review review) { + return ReviewResponse.builder() + .id(review.getId()) + .restaurantName(review.getRestaurant().getName()) + .title(review.getTitle()) + .content(review.getContent()) + .createdAt(review.getCreatedAt()) + .build(); + } +} diff --git a/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java b/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java new file mode 100644 index 00000000..5a71e83c --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/repository/ReviewRepository.java @@ -0,0 +1,26 @@ +package com.example.demo.domain.review.repository; + +import java.util.List; + +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 com.example.demo.domain.review.entity.Review; + +@Repository +public interface ReviewRepository extends JpaRepository { + + @Query(value = "SELECT * FROM review ORDER BY id DESC LIMIT :page, :size", nativeQuery = true) + List findAllOrderByCreatedAtDesc(@Param("page") int page, @Param("size") int size); + + @Query(value = "SELECT * FROM review WHERE title LIKE %:searchKeyword% OR content LIKE %:searchKeyword% ORDER BY id DESC LIMIT :page, :size", nativeQuery = true) + List findAllContainingTitleAndContentOrderByCreatedAtDesc(@Param("searchKeyword") String searchKeyword, @Param("page") int page, @Param("size") int size); + + @Query(value = "SELECT * FROM review WHERE title LIKE %:searchKeyword% ORDER BY id DESC LIMIT :page, :size", nativeQuery = true) + List findAllContainingTitleOrderByCreatedAtDesc(@Param("searchKeyword") String searchKeyword, @Param("page") int page, @Param("size") int size); + + @Query(value = "SELECT * FROM review WHERE content LIKE %:searchKeyword% ORDER BY id DESC LIMIT :page, :size", nativeQuery = true) + List findAllContainingContentOrderByCreatedAtDesc(@Param("searchKeyword") String searchKeyword, @Param("page") int page, @Param("size") int size); +} \ No newline at end of file diff --git a/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java b/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java new file mode 100644 index 00000000..325a2f70 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/service/ReviewService.java @@ -0,0 +1,25 @@ +package com.example.demo.domain.review.service; + +import com.example.demo.domain.review.dto.request.ReviewCreateRequest; +import com.example.demo.domain.review.dto.request.ReviewSearchRequest; +import com.example.demo.domain.review.dto.request.ReviewUpdateRequest; +import com.example.demo.domain.review.dto.response.ReviewResponse; + +import java.util.List; + +public interface ReviewService { + // 리뷰 생성 + public ReviewResponse createReview(Long restaurantId, ReviewCreateRequest reviewDto); + + // 리뷰 수정 + public ReviewResponse updateReview(Long restaurantId, Long id, ReviewUpdateRequest reviewDto); + + // 리뷰 조회 - list + public List getReviews(int page, int size, ReviewSearchRequest reviewDto); + + // 리뷰 조회 - detail + public ReviewResponse getReviewById(Long restaurantId, Long reviewId); + + // 리뷰 삭제 + public void deleteReview(Long restaurantId, Long reviewId); +} diff --git a/demo/src/main/java/com/example/demo/domain/review/service/ReviewServiceImpl.java b/demo/src/main/java/com/example/demo/domain/review/service/ReviewServiceImpl.java new file mode 100644 index 00000000..0dc92005 --- /dev/null +++ b/demo/src/main/java/com/example/demo/domain/review/service/ReviewServiceImpl.java @@ -0,0 +1,90 @@ +package com.example.demo.domain.review.service; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.restaurant.repository.RestaurantRepository; +import com.example.demo.domain.review.dto.request.ReviewCreateRequest; +import com.example.demo.domain.review.dto.request.ReviewSearchRequest; +import com.example.demo.domain.review.dto.request.ReviewUpdateRequest; +import com.example.demo.domain.review.dto.response.ReviewResponse; +import com.example.demo.domain.review.entity.Review; +import com.example.demo.domain.review.map.ToReviewEntity; +import com.example.demo.domain.review.map.ToReviewResponse; +import com.example.demo.domain.review.repository.ReviewRepository; + +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.persistence.EntityNotFoundException; +import java.util.ArrayList; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class ReviewServiceImpl implements ReviewService{ + @Autowired + RestaurantRepository restaurantRepository; + + @Autowired + ReviewRepository reviewRepository; + + private final ToReviewEntity entity; + + private final ToReviewResponse response; + + @Transactional + public ReviewResponse createReview(Long restaurantId, ReviewCreateRequest reviewDto) { + Restaurant foundRestaurant = restaurantRepository.findById(restaurantId).orElseThrow(EntityNotFoundException::new); + Review foundReview = entity.toCreateEntity(reviewDto, foundRestaurant); + Review savedReview = reviewRepository.save(foundReview); + return response.toResponse(savedReview); + } + + @Transactional + public ReviewResponse updateReview(Long restaurantId, Long id, ReviewUpdateRequest reviewDto){ + Review foundReview = reviewRepository.findById(id).orElseThrow(EntityNotFoundException::new); + + foundReview.update(reviewDto); + Review savedReview = reviewRepository.save(foundReview); + + return response.toResponse(savedReview); + } + + @Transactional(readOnly = true) + public List getReviews(int page, int size, ReviewSearchRequest reviewDto){ + List reviews = null; + + if(reviewDto.getSearchType() == null) { + reviews = reviewRepository.findAllOrderByCreatedAtDesc((page-1)*size, size); + } + else if(reviewDto.getSearchType().toString().equals("title")) { + reviews = reviewRepository.findAllContainingTitleOrderByCreatedAtDesc( + reviewDto.getSearchKeyword(), + (page-1)*size, size); + } else if(reviewDto.getSearchType().toString().equals("content")) { + reviews = reviewRepository.findAllContainingContentOrderByCreatedAtDesc( + reviewDto.getSearchKeyword(), + (page-1)*size, size); + } else if(reviewDto.getSearchType().toString().equals("all")) { + reviews = reviewRepository.findAllContainingTitleAndContentOrderByCreatedAtDesc( + reviewDto.getSearchKeyword(), + (page-1)*size, size); + } + List reviewResponses = new ArrayList<>(); + reviews.forEach(s -> reviewResponses.add(response.toResponse(s))); + return reviewResponses; + } + + @Transactional(readOnly = true) + public ReviewResponse getReviewById(Long restaurantId, Long reviewId){ + Review foundReview = reviewRepository.findById(reviewId).orElseThrow(EntityNotFoundException::new); + return response.toResponse(foundReview); + } + + @Transactional + public void deleteReview(Long restaurantId, Long reviewId){ + Review review = reviewRepository.findById(reviewId).orElseThrow(EntityNotFoundException::new); + reviewRepository.delete(review); + } +} diff --git a/demo/src/main/java/com/example/demo/global/entity/TimeEntity.java b/demo/src/main/java/com/example/demo/global/entity/TimeEntity.java new file mode 100644 index 00000000..dcd8d735 --- /dev/null +++ b/demo/src/main/java/com/example/demo/global/entity/TimeEntity.java @@ -0,0 +1,33 @@ +package com.example.demo.global.entity; + +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.*; +import java.time.LocalDateTime; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public abstract class TimeEntity { + @Column + @CreatedDate + private LocalDateTime createdAt; + + @Column + @LastModifiedDate + private LocalDateTime updatedAt; + + @PrePersist + public void onPrePersist() { + this.createdAt = LocalDateTime.now(); + this.updatedAt = this.updatedAt; + } + + @PreUpdate + public void onPreUpdate() { + this.updatedAt = LocalDateTime.now(); + } +} diff --git a/demo/src/main/java/com/example/demo/global/enumpkg/Category.java b/demo/src/main/java/com/example/demo/global/enumpkg/Category.java new file mode 100644 index 00000000..3d8cea87 --- /dev/null +++ b/demo/src/main/java/com/example/demo/global/enumpkg/Category.java @@ -0,0 +1,33 @@ +package com.example.demo.global.enumpkg; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +//@AllArgsConstructor +//@Getter +public enum Category { + 한식 { + @Override + public String toString() { + return "한식"; + } + }, + 중식{ + @Override + public String toString() { + return "중식"; + } + }, + 일식{ + @Override + public String toString() { + return "일식"; + } + } + ; + +// public Category valueOf() { +// +// return this; +// } +} diff --git a/demo/src/main/java/com/example/demo/global/enumpkg/SearchType.java b/demo/src/main/java/com/example/demo/global/enumpkg/SearchType.java new file mode 100644 index 00000000..4ebb1c4a --- /dev/null +++ b/demo/src/main/java/com/example/demo/global/enumpkg/SearchType.java @@ -0,0 +1,22 @@ +package com.example.demo.global.enumpkg; + +public enum SearchType { + title{ + @Override + public String toString() { + return "title"; + } + }, + content{ + @Override + public String toString() { + return "content"; + } + }, + all{ + @Override + public String toString() { + return "all"; + } + } +} diff --git a/demo/src/main/resources/application-dev.properties b/demo/src/main/resources/application-dev.properties new file mode 100644 index 00000000..d4a4c3eb --- /dev/null +++ b/demo/src/main/resources/application-dev.properties @@ -0,0 +1,3 @@ +SPRING_DATASOURCE_URL=jdbc:mysql://localhost:3306/hackathon?useSSL=false&characterEncoding=UTF-8&serverTimezone=UTC +SPRING_DATASOURCE_USERNAME=root +SPRING_DATA_SOURCE_PASSWORD=fishtail03412! \ No newline at end of file diff --git a/demo/src/main/resources/application.properties b/demo/src/main/resources/application.properties new file mode 100644 index 00000000..5b8470ad --- /dev/null +++ b/demo/src/main/resources/application.properties @@ -0,0 +1,14 @@ +spring.profiles.active=dev + +spring.datasource.url=${SPRING_DATASOURCE_URL} +spring.datasource.username=${SPRING_DATASOURCE_USERNAME} +spring.datasource.password=${SPRING_DATA_SOURCE_PASSWORD} + +spring.jpa.database=mysql +spring.jpa.show-sql=true +spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect + +spring.jpa.generate-ddl=true +spring.jpa.open-in-view=false +spring.jpa.hibernate.hbm2ddl.auto=update +spring.jpa.hibernate.format_sql=true diff --git a/demo/src/test/java/com/example/demo/DemoApplicationTests.java b/demo/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 00000000..2778a6a7 --- /dev/null +++ b/demo/src/test/java/com/example/demo/DemoApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.demo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DemoApplicationTests { + + @Test + void contextLoads() { + } + +}