diff --git a/goodnight/.gitignore b/goodnight/.gitignore new file mode 100644 index 00000000..c2065bc2 --- /dev/null +++ b/goodnight/.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/goodnight/build.gradle b/goodnight/build.gradle new file mode 100644 index 00000000..8e43230e --- /dev/null +++ b/goodnight/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 = 'com.example' +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-web' + implementation 'io.springfox:springfox-boot-starter:3.0.0' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.h2database:h2' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/goodnight/gradle/wrapper/gradle-wrapper.jar b/goodnight/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..249e5832 Binary files /dev/null and b/goodnight/gradle/wrapper/gradle-wrapper.jar differ diff --git a/goodnight/gradle/wrapper/gradle-wrapper.properties b/goodnight/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..070cb702 --- /dev/null +++ b/goodnight/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/goodnight/gradlew b/goodnight/gradlew new file mode 100755 index 00000000..a69d9cb6 --- /dev/null +++ b/goodnight/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/goodnight/gradlew.bat b/goodnight/gradlew.bat new file mode 100644 index 00000000..f127cfd4 --- /dev/null +++ b/goodnight/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/goodnight/settings.gradle b/goodnight/settings.gradle new file mode 100644 index 00000000..182a5b2f --- /dev/null +++ b/goodnight/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'goodnight' diff --git a/goodnight/src/main/java/com/example/goodnight/GoodnightApplication.java b/goodnight/src/main/java/com/example/goodnight/GoodnightApplication.java new file mode 100644 index 00000000..d11a920d --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/GoodnightApplication.java @@ -0,0 +1,13 @@ +package com.example.goodnight; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class GoodnightApplication { + + public static void main(String[] args) { + SpringApplication.run(GoodnightApplication.class, args); + } + +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/restaurant/controller/RestaurantController.java b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/controller/RestaurantController.java new file mode 100644 index 00000000..f51c8b1b --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/controller/RestaurantController.java @@ -0,0 +1,47 @@ +package com.example.goodnight.domain.restaurant.controller; + +import com.example.goodnight.domain.restaurant.domain.Restaurant; +import com.example.goodnight.domain.restaurant.dto.request.RestaurantDto; +import com.example.goodnight.domain.restaurant.dto.request.RestaurantReqDto; +import com.example.goodnight.domain.restaurant.dto.response.RestaurantResDto; +import com.example.goodnight.domain.restaurant.service.RestaurantService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +public class RestaurantController { + private final RestaurantService restaurantService; + + @GetMapping("/api/v1/restaurants/{id}") + public RestaurantResDto getRestaurantV1(@PathVariable Long id) { + return restaurantService.find(id); + } + + @GetMapping("/api/v1/restaurants") + public List getAllRestaurantV1() { + return restaurantService.findAll(); + } + + @GetMapping("/api/v1/restaurants/categorys") + public List getByCategoryRestaurantV1(@RequestParam(value = "category") String category) { + return restaurantService.findAllByCategory(category); + } + + @PostMapping("/api/v1/restaurants") + public void createRestaurant(@RequestBody RestaurantDto dto) { + restaurantService.registration(dto); + } + + @PutMapping("/api/v1/restaurants") + public void updateRestaurant(@RequestBody RestaurantReqDto dto) { + restaurantService.update(dto.getId(),dto.getCategory()); + } + + @DeleteMapping("/api/v1/restaurants/{id}") + public void deleteRestaurantV1(@PathVariable Long id) { + restaurantService.remove(id); + } +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/restaurant/domain/Restaurant.java b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/domain/Restaurant.java new file mode 100644 index 00000000..2963b8d3 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/domain/Restaurant.java @@ -0,0 +1,46 @@ +package com.example.goodnight.domain.restaurant.domain; + +import com.example.goodnight.domain.review.domain.Review; +import com.example.goodnight.global.entity.BaseEntity; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@NoArgsConstructor + +public class Restaurant extends BaseEntity { + @Id @GeneratedValue + @Column(name = "restaurant_id") + private Long id; + + @Column(name = "restaurant_name") + private String restaurantName; + + @Column(name = "category") + private String category; + + @Column(name = "is_activated", nullable = false) + private boolean isActivated; + + @OneToMany(mappedBy = "restaurant") + private List reviewList = new ArrayList<>(); + + @Builder + public Restaurant(String restaurantName, String category, List reviews) { + this.restaurantName = restaurantName; + this.category = category; + this.reviewList = reviews; + this.isActivated = true; + } + public void update(String category) {this.category = category;} + public void delete() { + this.isActivated = false; + } + +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/restaurant/dto/request/RestaurantDto.java b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/dto/request/RestaurantDto.java new file mode 100644 index 00000000..19e69914 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/dto/request/RestaurantDto.java @@ -0,0 +1,9 @@ +package com.example.goodnight.domain.restaurant.dto.request; + +import lombok.Getter; + +@Getter +public class RestaurantDto { + private String restaurantName; + private String category; +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/restaurant/dto/request/RestaurantReqDto.java b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/dto/request/RestaurantReqDto.java new file mode 100644 index 00000000..ef3fe5b3 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/dto/request/RestaurantReqDto.java @@ -0,0 +1,10 @@ +package com.example.goodnight.domain.restaurant.dto.request; + +import lombok.Builder; +import lombok.Getter; + +@Getter +public class RestaurantReqDto { + private Long id; + private String category; +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/restaurant/dto/response/RestaurantResDto.java b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/dto/response/RestaurantResDto.java new file mode 100644 index 00000000..961013c7 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/dto/response/RestaurantResDto.java @@ -0,0 +1,14 @@ +package com.example.goodnight.domain.restaurant.dto.response; + +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; + +@Getter +@Builder +public class RestaurantResDto { + private String restaurantName; + private String category; + private LocalDateTime createdAt; +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/restaurant/repository/RestaurantRepository.java b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/repository/RestaurantRepository.java new file mode 100644 index 00000000..5e435a8c --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/repository/RestaurantRepository.java @@ -0,0 +1,20 @@ +package com.example.goodnight.domain.restaurant.repository; + +import com.example.goodnight.domain.restaurant.domain.Restaurant; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; +import java.util.Optional; + +public interface RestaurantRepository extends JpaRepository { + @Query(value = "select r from Restaurant r where r.category = :category and r.isActivated = true") + List findAllByCategory(@Param("category") String category); + + @Query(value = "select r from Restaurant r where r.isActivated = true") + List findAll(); + + @Query(value = "select r from Restaurant r where r.id = :id and r.isActivated = true") + Optional findById(@Param("id") Long id); +} \ No newline at end of file diff --git a/goodnight/src/main/java/com/example/goodnight/domain/restaurant/service/RestaurantService.java b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/service/RestaurantService.java new file mode 100644 index 00000000..d29442fa --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/restaurant/service/RestaurantService.java @@ -0,0 +1,60 @@ +package com.example.goodnight.domain.restaurant.service; + +import com.example.goodnight.domain.restaurant.domain.Restaurant; +import com.example.goodnight.domain.restaurant.dto.request.RestaurantDto; +import com.example.goodnight.domain.restaurant.dto.response.RestaurantResDto; +import com.example.goodnight.domain.restaurant.repository.RestaurantRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional +@RequiredArgsConstructor +public class RestaurantService { + private final RestaurantRepository restaurantRepository; + + public RestaurantResDto find(Long id) { + Restaurant restaurant = restaurantRepository.findById(id).orElseThrow(null); + RestaurantResDto dto = RestaurantResDto.builder() + .restaurantName(restaurant.getRestaurantName()) + .category(restaurant.getCategory()) + .createdAt(restaurant.getCreatedAt()) + .build(); + return dto; + } + + public Restaurant findById(Long id) { + Restaurant restaurant = restaurantRepository.findById(id).orElseThrow(null); + return restaurant; + } + + public List findAll() { + return restaurantRepository.findAll(); + } + + public List findAllByCategory(String category) { + return restaurantRepository.findAllByCategory(category); + } + + public void registration(RestaurantDto dto) { + Restaurant restaurant = Restaurant.builder() + .restaurantName(dto.getRestaurantName()) + .category(dto.getCategory()) + .build(); + restaurantRepository.save(restaurant); + } + + public void remove(Long id) { + Restaurant restaurant = restaurantRepository.findById(id).orElseThrow(null); + restaurant.delete(); + } + + public void update(Long id, String category) { + Restaurant restaurant = restaurantRepository.findById(id).orElseThrow(null); + restaurant.update(category); + } + +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/review/controller/ReviewController.java b/goodnight/src/main/java/com/example/goodnight/domain/review/controller/ReviewController.java new file mode 100644 index 00000000..64b6c3d6 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/review/controller/ReviewController.java @@ -0,0 +1,44 @@ +package com.example.goodnight.domain.review.controller; + +import com.example.goodnight.domain.review.domain.Review; +import com.example.goodnight.domain.review.dto.request.ReviewDto; +import com.example.goodnight.domain.review.dto.request.ReviewReqDto; +import com.example.goodnight.domain.review.dto.response.ReviewAllResDto; +import com.example.goodnight.domain.review.dto.response.ReviewResDto; +import com.example.goodnight.domain.review.service.ReviewService; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +public class ReviewController { + private final ReviewService reviewService; + + @GetMapping("/api/v1/reviews") + public List getAllReviews(@RequestParam(value = "title") String title, @RequestParam(value = "content") String content, @RequestParam(value = "orderType") int orderType) { + return reviewService.getReviews(title, content, orderType); + } + + + @GetMapping("/api/v1/reviews/{id}") + public ReviewResDto getReview(@PathVariable Long id) { + return reviewService.getReview(id); + } + + @PostMapping("/api/v1/reviews") + public void createReview(@RequestBody ReviewDto dto) { + reviewService.addReview(dto); + } + + @PutMapping("/api/v1/reviews") + public void updateReview(@RequestBody ReviewReqDto dto) { + reviewService.updateReview(dto.getId(), dto.getTitle(), dto.getContent()); + } + @DeleteMapping("/api/v1/reviews/{id}") + public void deleteReview(@PathVariable Long id) { + reviewService.removeReview(id); + } +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/review/domain/Review.java b/goodnight/src/main/java/com/example/goodnight/domain/review/domain/Review.java new file mode 100644 index 00000000..58f731cb --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/review/domain/Review.java @@ -0,0 +1,45 @@ +package com.example.goodnight.domain.review.domain; + +import com.example.goodnight.domain.restaurant.domain.Restaurant; +import com.example.goodnight.global.entity.BaseEntity; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Entity +@Getter +@NoArgsConstructor +@Table(name = "review") +public class Review extends BaseEntity implements Comparable{ + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "title") + private String title; + + @Column(name = "content") + private String content; + + @ManyToOne(targetEntity = Restaurant.class, fetch = FetchType.LAZY) + @JoinColumn(name = "restaurant_id") + private Restaurant restaurant; + + public void update(String title, String content) { + this.title = title; + this.content = content; + } + @Builder + public Review(String title, String content, Restaurant restaurant) { + this.title = title; + this.content = content; + this.restaurant = restaurant; + } + + @Override + public int compareTo(Review o) { + return 0; + } +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/review/dto/request/ReviewDto.java b/goodnight/src/main/java/com/example/goodnight/domain/review/dto/request/ReviewDto.java new file mode 100644 index 00000000..f147fdf6 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/review/dto/request/ReviewDto.java @@ -0,0 +1,10 @@ +package com.example.goodnight.domain.review.dto.request; + +import lombok.Getter; + +@Getter +public class ReviewDto { + private String title; + private String content; + private Long restaurantId; +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/review/dto/request/ReviewReqDto.java b/goodnight/src/main/java/com/example/goodnight/domain/review/dto/request/ReviewReqDto.java new file mode 100644 index 00000000..21375829 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/review/dto/request/ReviewReqDto.java @@ -0,0 +1,10 @@ +package com.example.goodnight.domain.review.dto.request; + +import lombok.Getter; + +@Getter +public class ReviewReqDto { + private Long id; + private String title; + private String content; +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/review/dto/response/ReviewAllResDto.java b/goodnight/src/main/java/com/example/goodnight/domain/review/dto/response/ReviewAllResDto.java new file mode 100644 index 00000000..fecbb2c2 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/review/dto/response/ReviewAllResDto.java @@ -0,0 +1,16 @@ +package com.example.goodnight.domain.review.dto.response; + +import com.example.goodnight.domain.review.domain.Review; +import lombok.Builder; +import lombok.Getter; + +import java.util.ArrayList; +import java.util.List; + +@Getter +@Builder +public class ReviewAllResDto { + private String restaurantName; + private String title; + private String content; +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/review/dto/response/ReviewResDto.java b/goodnight/src/main/java/com/example/goodnight/domain/review/dto/response/ReviewResDto.java new file mode 100644 index 00000000..880bcc35 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/review/dto/response/ReviewResDto.java @@ -0,0 +1,12 @@ +package com.example.goodnight.domain.review.dto.response; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class ReviewResDto { + private String restaurantName; + private String title; + private String content; +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/review/repository/ReviewRepository.java b/goodnight/src/main/java/com/example/goodnight/domain/review/repository/ReviewRepository.java new file mode 100644 index 00000000..bcd7cf81 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/review/repository/ReviewRepository.java @@ -0,0 +1,15 @@ +package com.example.goodnight.domain.review.repository; + +import com.example.goodnight.domain.review.domain.Review; +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 java.util.List; + +public interface ReviewRepository extends JpaRepository { + @Query("select r from Review r where r.title like %:title% or r.content like %:content%") + Page findAllByTitleOrContent(Pageable pageable, @Param("title") String title, @Param("content") String content); +} diff --git a/goodnight/src/main/java/com/example/goodnight/domain/review/service/ReviewService.java b/goodnight/src/main/java/com/example/goodnight/domain/review/service/ReviewService.java new file mode 100644 index 00000000..c4368484 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/domain/review/service/ReviewService.java @@ -0,0 +1,76 @@ +package com.example.goodnight.domain.review.service; + +import com.example.goodnight.domain.restaurant.domain.Restaurant; +import com.example.goodnight.domain.restaurant.service.RestaurantService; +import com.example.goodnight.domain.review.domain.Review; +import com.example.goodnight.domain.review.dto.request.ReviewDto; +import com.example.goodnight.domain.review.dto.request.ReviewReqDto; +import com.example.goodnight.domain.review.dto.response.ReviewAllResDto; +import com.example.goodnight.domain.review.dto.response.ReviewResDto; +import com.example.goodnight.domain.review.repository.ReviewRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +@Service +@Transactional +@RequiredArgsConstructor +public class ReviewService { + private final RestaurantService restaurantService; + private final ReviewRepository reviewRepository; + + public ReviewResDto getReview(Long id) { + Review review = reviewRepository.findById(id).orElseThrow(null); + Restaurant restaurant = review.getRestaurant(); + ReviewResDto dto = ReviewResDto.builder() + .restaurantName(restaurant.getRestaurantName()) + .content(review.getContent()) + .title(review.getTitle()) + .build(); + return dto; + } + + public List getReviews(String title, String content, int orderType) { + PageRequest pageRequest = PageRequest.of(0, 20); + List result; + result = orderType == 0 ? reviewRepository.findAllByTitleOrContent(pageRequest,title, content).stream().sorted(Comparator.comparing(Review::getCreatedAt)).map(this::mapReviewEntityToReviewAllResDto).collect(Collectors.toList()) : reviewRepository.findAllByTitleOrContent(pageRequest,title, content).stream().sorted(Comparator.comparing(Review::getCreatedAt).reversed()).map(this::mapReviewEntityToReviewAllResDto).collect(Collectors.toList()); + return result; + } + + + public void addReview(ReviewDto dto) { + Restaurant restaurant = restaurantService.findById(dto.getRestaurantId()); + Review review = Review.builder() + .title(dto.getTitle()) + .content(dto.getContent()) + .restaurant(restaurant) + .build(); + reviewRepository.save(review); + } + + public void removeReview(Long id) { + Review review = reviewRepository.findById(id).orElseThrow(null); + reviewRepository.delete(review); + } + + public void updateReview(Long id, String title, String content) { + Review review = reviewRepository.findById(id).orElseThrow(null); + review.update(title,content); + } + + public ReviewAllResDto mapReviewEntityToReviewAllResDto(Review review) { + return ReviewAllResDto.builder() + .restaurantName(review.getRestaurant().getRestaurantName()) + .title(review.getTitle()) + .content(review.getContent()) + .build(); + } +} diff --git a/goodnight/src/main/java/com/example/goodnight/global/config/JpaAuditingConfig.java b/goodnight/src/main/java/com/example/goodnight/global/config/JpaAuditingConfig.java new file mode 100644 index 00000000..e45b9456 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/global/config/JpaAuditingConfig.java @@ -0,0 +1,8 @@ +package com.example.goodnight.global.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@EnableJpaAuditing +@Configuration +public class JpaAuditingConfig {} \ No newline at end of file diff --git a/goodnight/src/main/java/com/example/goodnight/global/config/SwaggerConfig.java b/goodnight/src/main/java/com/example/goodnight/global/config/SwaggerConfig.java new file mode 100644 index 00000000..2fdac8e7 --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/global/config/SwaggerConfig.java @@ -0,0 +1,34 @@ +package com.example.goodnight.global.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; + +@Configuration +@EnableWebMvc +//http://localhost:8080/swagger-ui/index.html +public class SwaggerConfig { + @Bean + public Docket api(){ + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("com.example.goodnight")) + .paths(PathSelectors.any()) + .build(); + } + + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("goodnight") + .description("API 명세서 입니다.") + .version("0.0.1") + .build(); + } +} diff --git a/goodnight/src/main/java/com/example/goodnight/global/entity/BaseEntity.java b/goodnight/src/main/java/com/example/goodnight/global/entity/BaseEntity.java new file mode 100644 index 00000000..c537f7cd --- /dev/null +++ b/goodnight/src/main/java/com/example/goodnight/global/entity/BaseEntity.java @@ -0,0 +1,24 @@ +package com.example.goodnight.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.EntityListeners; +import javax.persistence.MappedSuperclass; +import java.time.LocalDateTime; + +@Getter +@EntityListeners(value = {AuditingEntityListener.class}) +@MappedSuperclass +public abstract class BaseEntity { + + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedDate; +} + diff --git a/goodnight/src/main/resources/application.properties b/goodnight/src/main/resources/application.properties new file mode 100644 index 00000000..51f79ff9 --- /dev/null +++ b/goodnight/src/main/resources/application.properties @@ -0,0 +1,11 @@ +spring.datasource.url=jdbc:h2:tcp://localhost/~/goodnight; +spring.datasource.driverClassName=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password= +spring.jpa.database-platform=org.hibernate.dialect.H2Dialect +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.H2Dialect + + +spring.jpa.properties.hibernate.format_sql=true +spring.jpa.properties.hibernate.show_sql=true +spring.jpa.hibernate.ddl-auto=create \ No newline at end of file diff --git a/goodnight/src/main/resources/h2/schema.sql b/goodnight/src/main/resources/h2/schema.sql new file mode 100644 index 00000000..be3dfdbb --- /dev/null +++ b/goodnight/src/main/resources/h2/schema.sql @@ -0,0 +1,20 @@ +drop table if exits Restaurant +create table Restaurant ( + id long PRIMARY KEY AUTO_INCREMENT not null, + name varchar(25) not null, + category varchar(25) not null, + isActivated bool DEFAULT True, + createdAt DATE, + updatedDate DATE +); + +drop table if exits Review +create table Review ( + id long PRIMARY KEY AUTO_INCREMENT not null, + title varchar(45) not null, + content varchar(200) not null, + createdAt DATE, + updatedDate DATE, + restaurant_id long not null, + foreign key (restaurant_id) references Restaurant(id) +); \ No newline at end of file diff --git a/goodnight/src/test/java/com/example/goodnight/GoodnightApplicationTests.java b/goodnight/src/test/java/com/example/goodnight/GoodnightApplicationTests.java new file mode 100644 index 00000000..636d278e --- /dev/null +++ b/goodnight/src/test/java/com/example/goodnight/GoodnightApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.goodnight; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class GoodnightApplicationTests { + + @Test + void contextLoads() { + } + +}