diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..1375905d --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1677335231195 + + + + + + \ No newline at end of file diff --git a/GiHwan/.gitignore b/GiHwan/.gitignore new file mode 100644 index 00000000..c2065bc2 --- /dev/null +++ b/GiHwan/.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/GiHwan/build.gradle b/GiHwan/build.gradle new file mode 100644 index 00000000..526021fe --- /dev/null +++ b/GiHwan/build.gradle @@ -0,0 +1,34 @@ +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 = '17' + +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' + implementation 'org.springdoc:springdoc-openapi-ui:1.6.6' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + runtimeOnly 'com.mysql:mysql-connector-j' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/GiHwan/gradle/wrapper/gradle-wrapper.jar b/GiHwan/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..249e5832 Binary files /dev/null and b/GiHwan/gradle/wrapper/gradle-wrapper.jar differ diff --git a/GiHwan/gradle/wrapper/gradle-wrapper.properties b/GiHwan/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..070cb702 --- /dev/null +++ b/GiHwan/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/GiHwan/gradlew b/GiHwan/gradlew new file mode 100755 index 00000000..a69d9cb6 --- /dev/null +++ b/GiHwan/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/GiHwan/gradlew.bat b/GiHwan/gradlew.bat new file mode 100644 index 00000000..53a6b238 --- /dev/null +++ b/GiHwan/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/GiHwan/settings.gradle b/GiHwan/settings.gradle new file mode 100644 index 00000000..0a383dd8 --- /dev/null +++ b/GiHwan/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'demo' diff --git a/GiHwan/src/main/java/com/example/demo/DemoApplication.java b/GiHwan/src/main/java/com/example/demo/DemoApplication.java new file mode 100644 index 00000000..04dcb9c5 --- /dev/null +++ b/GiHwan/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.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +public class DemoApplication { + + public static void main(String[] args) { + SpringApplication.run(DemoApplication.class, args); + } + +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/restaurant/controller/RestaurantController.java b/GiHwan/src/main/java/com/example/demo/domain/restaurant/controller/RestaurantController.java new file mode 100644 index 00000000..eb4b9c72 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/restaurant/controller/RestaurantController.java @@ -0,0 +1,63 @@ +package com.example.demo.domain.restaurant.controller; + +import com.example.demo.domain.restaurant.dto.RestaurantCreateRequest; +import com.example.demo.domain.restaurant.dto.RestaurantInfo; +import com.example.demo.domain.restaurant.dto.RestaurantUpdateRequest; +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.restaurant.entity.RestaurantCategory; +import com.example.demo.domain.restaurant.service.RestaurantService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RequestMapping("/api") +@RequiredArgsConstructor +@RestController +public class RestaurantController { + private final RestaurantService restaurantService; + + @PostMapping("/restaurant") + public ResponseEntity createRestaurant(@RequestBody RestaurantCreateRequest restaurantCreateRequest){ + restaurantService.createRestaurant(restaurantCreateRequest); + return ResponseEntity.ok(RestaurantInfo.builder() + .createdDate(restaurantCreateRequest.getCreateDate()) + .category(restaurantCreateRequest.getCategory()) + .name(restaurantCreateRequest.getName()) + .build()); + } + + @PutMapping("/restaurant") + public ResponseEntity updateRestaurant(@RequestBody RestaurantUpdateRequest restaurantUpdateRequest){ + RestaurantInfo restaurantInfo = restaurantService.updateRestaurant(restaurantUpdateRequest); + return ResponseEntity.ok(restaurantInfo); + } + + @GetMapping("/restaurants/{id}") + public ResponseEntity getRestaurant(@PathVariable Long id){ + RestaurantInfo restaurantInfo = restaurantService.getRestaurantDetail(id); + + return ResponseEntity.ok(restaurantInfo); + } + + @GetMapping("/restaurants/list") + public ResponseEntity> getRestaurantsList(){ + List restaurantInfoList = restaurantService.getRestaurantList(); + return ResponseEntity.ok(restaurantInfoList); + } + + @GetMapping("/restaurants/category_list") + public ResponseEntity> getRestaurantsListCategory( + @RequestParam RestaurantCategory category + ){ + List restaurantInfoList = restaurantService.getRestaurantListCategory(category); + return ResponseEntity.ok(restaurantInfoList); + } + + @DeleteMapping("/restaurants/{id}") + public ResponseEntity deleteRestaurant(@PathVariable Long id){ + restaurantService.deleteRestaurant(id); + return ResponseEntity.ok("레스토랑이 삭제되었습니다."); + } +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/restaurant/dao/RestaurantRepository.java b/GiHwan/src/main/java/com/example/demo/domain/restaurant/dao/RestaurantRepository.java new file mode 100644 index 00000000..1164a7d1 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/restaurant/dao/RestaurantRepository.java @@ -0,0 +1,21 @@ +package com.example.demo.domain.restaurant.dao; +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.restaurant.entity.RestaurantCategory; +import org.springframework.data.domain.Page; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.awt.print.Pageable; +import java.util.List; +import java.util.Optional; +public interface RestaurantRepository extends JpaRepository { + @Query("select r from Restaurant r where r.id = :id and r.isActive = true") + Optional findById(@Param("id") Long id); + + @Query("select r from Restaurant r where r.isActive is true") + List findAll(); + + @Query("select r from Restaurant r where r.category = :category and r.isActive is true") + List findAllByCategory(RestaurantCategory category); +} \ No newline at end of file diff --git a/GiHwan/src/main/java/com/example/demo/domain/restaurant/dto/RestaurantCreateRequest.java b/GiHwan/src/main/java/com/example/demo/domain/restaurant/dto/RestaurantCreateRequest.java new file mode 100644 index 00000000..8b38de62 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/restaurant/dto/RestaurantCreateRequest.java @@ -0,0 +1,17 @@ +package com.example.demo.domain.restaurant.dto; + +import com.example.demo.domain.restaurant.entity.RestaurantCategory; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; + +@Getter +@Builder +@AllArgsConstructor +public class RestaurantCreateRequest { + private final LocalDateTime createDate; + private final String name; + private final RestaurantCategory category; +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/restaurant/dto/RestaurantInfo.java b/GiHwan/src/main/java/com/example/demo/domain/restaurant/dto/RestaurantInfo.java new file mode 100644 index 00000000..7ba334d7 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/restaurant/dto/RestaurantInfo.java @@ -0,0 +1,17 @@ +package com.example.demo.domain.restaurant.dto; + +import com.example.demo.domain.restaurant.entity.RestaurantCategory; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; + +@Builder +@Getter +@AllArgsConstructor +public class RestaurantInfo { + private String name; + private RestaurantCategory category; + private LocalDateTime createdDate; +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/restaurant/dto/RestaurantUpdateRequest.java b/GiHwan/src/main/java/com/example/demo/domain/restaurant/dto/RestaurantUpdateRequest.java new file mode 100644 index 00000000..090c856e --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/restaurant/dto/RestaurantUpdateRequest.java @@ -0,0 +1,14 @@ +package com.example.demo.domain.restaurant.dto; + +import com.example.demo.domain.restaurant.entity.RestaurantCategory; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@AllArgsConstructor +public class RestaurantUpdateRequest { + private final Long id; + private final RestaurantCategory category; +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/restaurant/entity/Restaurant.java b/GiHwan/src/main/java/com/example/demo/domain/restaurant/entity/Restaurant.java new file mode 100644 index 00000000..f2a7b001 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/restaurant/entity/Restaurant.java @@ -0,0 +1,48 @@ +package com.example.demo.domain.restaurant.entity; + +import com.example.demo.domain.restaurant.dto.RestaurantCreateRequest; +import com.example.demo.domain.restaurant.dto.RestaurantUpdateRequest; +import com.example.demo.domain.restaurant.entity.RestaurantCategory; +import com.example.demo.global.common.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Getter +@Entity +@AllArgsConstructor +@NoArgsConstructor +@Table(name="restaurant") +public class Restaurant extends BaseEntity { + + @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 RestaurantCategory category; + +// @OneToMany(mappedBy = "id") +// @Builder.Default +// private List reviewList = new ArrayList<>(); + + @Builder + public Restaurant(String name, RestaurantCategory category) { + this.name = name; + this.category = category; + } + + public void update(RestaurantCategory category){ + this.category = category; + } + public void deleteRestaurant() { + this.delete(); + } +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/restaurant/entity/RestaurantCategory.java b/GiHwan/src/main/java/com/example/demo/domain/restaurant/entity/RestaurantCategory.java new file mode 100644 index 00000000..93905dc4 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/restaurant/entity/RestaurantCategory.java @@ -0,0 +1,8 @@ + +package com.example.demo.domain.restaurant.entity; + +public enum RestaurantCategory { + 한식, + 중식, + 일식, +} \ No newline at end of file diff --git a/GiHwan/src/main/java/com/example/demo/domain/restaurant/service/RestaurantService.java b/GiHwan/src/main/java/com/example/demo/domain/restaurant/service/RestaurantService.java new file mode 100644 index 00000000..df66eefa --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/restaurant/service/RestaurantService.java @@ -0,0 +1,87 @@ +package com.example.demo.domain.restaurant.service; + +import com.example.demo.domain.restaurant.dao.RestaurantRepository; +import com.example.demo.domain.restaurant.dto.RestaurantCreateRequest; +import com.example.demo.domain.restaurant.dto.RestaurantInfo; +import com.example.demo.domain.restaurant.dto.RestaurantUpdateRequest; +import com.example.demo.domain.restaurant.entity.RestaurantCategory; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import com.example.demo.domain.restaurant.entity.Restaurant; + +import javax.persistence.EntityNotFoundException; +import java.util.List; +import java.util.stream.Collectors; + +@RequiredArgsConstructor +@Service +public class RestaurantService { + + private final RestaurantRepository restaurantRepository; + + @Transactional + public void createRestaurant(RestaurantCreateRequest restaurantCreateRequest) { + Restaurant restaurant = mapRestaurantEntityCreateRequestToRestaurant(restaurantCreateRequest); + restaurantRepository.save(restaurant); + } + + @Transactional + public RestaurantInfo updateRestaurant(RestaurantUpdateRequest restaurantUpdateRequest){ + Restaurant restaurant = restaurantRepository.findById(restaurantUpdateRequest.getId()) + .orElseThrow(EntityNotFoundException::new); + + restaurant.update(restaurantUpdateRequest.getCategory()); + + Restaurant savedRestaurant = restaurantRepository.save(restaurant); + + return mapRestaurantEntityToRestaurantInfo(savedRestaurant); + } + + @Transactional(readOnly = true) + public RestaurantInfo getRestaurantDetail(Long id){ + Restaurant restaurant = restaurantRepository.findById(id) + .orElseThrow(EntityNotFoundException::new); + + return mapRestaurantEntityToRestaurantInfo(restaurant); + } + + @Transactional(readOnly = true) + public List getRestaurantList(){ + return restaurantRepository.findAll().stream() + .map(this::mapRestaurantEntityToRestaurantInfo) + .collect(Collectors.toList()); + } + + @Transactional(readOnly = true) + public List getRestaurantListCategory(RestaurantCategory category){ + return restaurantRepository.findAllByCategory(category).stream() + .map(this::mapRestaurantEntityToRestaurantInfo) + .collect(Collectors.toList()); + } + + @Transactional + public void deleteRestaurant(Long id){ + Restaurant restaurant = restaurantRepository.findById(id) + .orElseThrow(EntityNotFoundException::new); + restaurant.deleteRestaurant(); + restaurantRepository.save(restaurant); + } + + + public RestaurantInfo mapRestaurantEntityToRestaurantInfo(Restaurant restaurant){ + return RestaurantInfo.builder() + .createdDate(restaurant.getCreatedAt()) + .category(restaurant.getCategory()) + .name(restaurant.getName()) + .build(); + } + + public Restaurant mapRestaurantEntityCreateRequestToRestaurant(RestaurantCreateRequest restaurantCreateRequest) { + return Restaurant.builder() + .category(restaurantCreateRequest.getCategory()) + .name(restaurantCreateRequest.getName()) + .build(); + } + +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/review/controller/ReviewController.java b/GiHwan/src/main/java/com/example/demo/domain/review/controller/ReviewController.java new file mode 100644 index 00000000..141d2aa6 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/review/controller/ReviewController.java @@ -0,0 +1,45 @@ +package com.example.demo.domain.review.controller; + +import com.example.demo.domain.restaurant.dao.RestaurantRepository; +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.review.dto.ReviewCreateResponse; +import com.example.demo.domain.review.dto.ReviewInfo; +import com.example.demo.domain.review.dto.ReviewUpdateRequest; +import com.example.demo.domain.review.service.ReviewService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.persistence.EntityNotFoundException; + +@RequestMapping("/api") +@RequiredArgsConstructor +@RestController +public class ReviewController { + private final ReviewService reviewService; + + + @PostMapping("/reviews") + public ResponseEntity createReview(@RequestBody ReviewCreateResponse reviewCreateResponse){ + ReviewCreateResponse createResponse = reviewService.createReview(reviewCreateResponse); + return ResponseEntity.ok(createResponse); + } + + @GetMapping("/reviews/{id}") + public ResponseEntity getReviewDetail(@PathVariable Long id){ + ReviewInfo reviewInfo = reviewService.getReviewDetail(id); + return ResponseEntity.ok(reviewInfo); + } + + @PutMapping("/reviews") + public ResponseEntity updateReview(@RequestBody ReviewUpdateRequest reviewUpdateRequest){ + ReviewInfo reviewInfo = reviewService.updateReview(reviewUpdateRequest); + return ResponseEntity.ok(reviewInfo); + } + + @DeleteMapping("/reviews/{id}") + public ResponseEntity deleteReview(@PathVariable Long id){ + reviewService.deleteReview(id); + return ResponseEntity.ok("리뷰가 삭제되었습니다."); + } +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/review/dao/ReviewRepository.java b/GiHwan/src/main/java/com/example/demo/domain/review/dao/ReviewRepository.java new file mode 100644 index 00000000..f25df122 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/review/dao/ReviewRepository.java @@ -0,0 +1,17 @@ +package com.example.demo.domain.review.dao; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.review.entity.Review; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.Optional; + + +public interface ReviewRepository extends JpaRepository { + @Query("select r from Review r where r.id = :id and r.isActive = true") + Optional findById(@Param("id") Long id); + +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/review/dto/ReviewCreateResponse.java b/GiHwan/src/main/java/com/example/demo/domain/review/dto/ReviewCreateResponse.java new file mode 100644 index 00000000..61a017f3 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/review/dto/ReviewCreateResponse.java @@ -0,0 +1,22 @@ +package com.example.demo.domain.review.dto; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + + +import java.time.LocalDateTime; + +@Getter +@Builder +@AllArgsConstructor +public class ReviewCreateResponse { + private final LocalDateTime createdAt; + + private final String title; + + private final String content; + + private final Long restaurantId; +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/review/dto/ReviewInfo.java b/GiHwan/src/main/java/com/example/demo/domain/review/dto/ReviewInfo.java new file mode 100644 index 00000000..8b0d6b19 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/review/dto/ReviewInfo.java @@ -0,0 +1,19 @@ +package com.example.demo.domain.review.dto; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; + +@Getter +@Builder +@AllArgsConstructor +public class ReviewInfo { + private final String title; + + private final String content; + + private final String restaurantName; +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/review/dto/ReviewUpdateRequest.java b/GiHwan/src/main/java/com/example/demo/domain/review/dto/ReviewUpdateRequest.java new file mode 100644 index 00000000..aed2e374 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/review/dto/ReviewUpdateRequest.java @@ -0,0 +1,18 @@ +package com.example.demo.domain.review.dto; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@AllArgsConstructor +public class ReviewUpdateRequest { + + private final Long id; + private final String title; + + private final String content; + +} diff --git a/GiHwan/src/main/java/com/example/demo/domain/review/entity/Review.java b/GiHwan/src/main/java/com/example/demo/domain/review/entity/Review.java new file mode 100644 index 00000000..0dc9dc1b --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/review/entity/Review.java @@ -0,0 +1,47 @@ +package com.example.demo.domain.review.entity; + +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.restaurant.entity.RestaurantCategory; +import com.example.demo.domain.review.dao.ReviewRepository; +import com.example.demo.domain.review.dto.ReviewUpdateRequest; +import com.example.demo.global.common.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.*; + +@Getter +@Entity +@AllArgsConstructor +@NoArgsConstructor +@Table(name="review") +public class Review extends BaseEntity { + @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/GiHwan/src/main/java/com/example/demo/domain/review/service/ReviewService.java b/GiHwan/src/main/java/com/example/demo/domain/review/service/ReviewService.java new file mode 100644 index 00000000..9fb0f155 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/domain/review/service/ReviewService.java @@ -0,0 +1,75 @@ +package com.example.demo.domain.review.service; + +import com.example.demo.domain.restaurant.dao.RestaurantRepository; +import com.example.demo.domain.restaurant.entity.Restaurant; +import com.example.demo.domain.review.dao.ReviewRepository; +import com.example.demo.domain.review.dto.ReviewCreateResponse; +import com.example.demo.domain.review.dto.ReviewInfo; +import com.example.demo.domain.review.dto.ReviewUpdateRequest; +import com.example.demo.domain.review.entity.Review; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.persistence.EntityNotFoundException; + +@RequiredArgsConstructor +@Service +public class ReviewService { + private final ReviewRepository reviewRepository; + private final RestaurantRepository restaurantRepository; + + @Transactional + public ReviewCreateResponse createReview(ReviewCreateResponse reviewCreateResponse){ + Restaurant restaurant = restaurantRepository.findById(reviewCreateResponse.getRestaurantId()) + .orElseThrow(EntityNotFoundException::new); + Review review = mapReviewEntityReviewCreateResponseToReview(reviewCreateResponse,restaurant); + reviewRepository.save(review); + + return reviewCreateResponse.builder() + .createdAt(review.getCreatedAt()) + .title(review.getTitle()) + .content(review.getContent()) + .restaurantId(review.getRestaurant().getId()) + .build(); + } + + @Transactional(readOnly = true) + public ReviewInfo getReviewDetail(Long id){ + Review review = reviewRepository.findById(id) + .orElseThrow(EntityNotFoundException::new); + return mapReviewEntityToReviewInfo(review); + } + + @Transactional + public ReviewInfo updateReview(ReviewUpdateRequest reviewUpdateRequest){ + Review review = reviewRepository.findById(reviewUpdateRequest.getId()) + .orElseThrow(EntityNotFoundException::new); + review.update(reviewUpdateRequest); + reviewRepository.save(review); + return mapReviewEntityToReviewInfo(review); + } + + @Transactional + public void deleteReview(Long id){ + Review review = reviewRepository.findById(id) + .orElseThrow(EntityNotFoundException::new); + reviewRepository.delete(review); + } + + + public ReviewInfo mapReviewEntityToReviewInfo(Review review){ + return ReviewInfo.builder() + .title(review.getTitle()) + .content(review.getContent()) + .restaurantName(review.getRestaurant().getName()) + .build(); + } + public Review mapReviewEntityReviewCreateResponseToReview(ReviewCreateResponse reviewCreateResponse, Restaurant restaurant){ + return Review.builder() + .title(reviewCreateResponse.getTitle()) + .content(reviewCreateResponse.getContent()) + .restaurant(restaurant) + .build(); + } +} diff --git a/GiHwan/src/main/java/com/example/demo/global/common/BaseEntity.java b/GiHwan/src/main/java/com/example/demo/global/common/BaseEntity.java new file mode 100644 index 00000000..2b5cb184 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/global/common/BaseEntity.java @@ -0,0 +1,36 @@ +package com.example.demo.global.common; + +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 javax.persistence.PrePersist; +import java.time.LocalDateTime; + +@Getter +@EntityListeners(value = {AuditingEntityListener.class}) +@MappedSuperclass +public abstract class BaseEntity { + @Column(name = "is_active", nullable = false) + private Boolean isActive; + + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; + + @PrePersist + public void prePersist() { + this.isActive = this.isActive == null ? true : this.isActive; + } + + protected void delete() { + this.isActive = false; + } +} diff --git a/GiHwan/src/main/java/com/example/demo/global/config/JpaAuditingConfig.java b/GiHwan/src/main/java/com/example/demo/global/config/JpaAuditingConfig.java new file mode 100644 index 00000000..e193cd63 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/global/config/JpaAuditingConfig.java @@ -0,0 +1,9 @@ +package com.example.demo.global.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@EnableJpaAuditing +@Configuration +public class JpaAuditingConfig { +} diff --git a/GiHwan/src/main/java/com/example/demo/global/config/SwaggerConfig.java b/GiHwan/src/main/java/com/example/demo/global/config/SwaggerConfig.java new file mode 100644 index 00000000..8e4bfdb0 --- /dev/null +++ b/GiHwan/src/main/java/com/example/demo/global/config/SwaggerConfig.java @@ -0,0 +1,25 @@ +package com.example.demo.global.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import org.springdoc.core.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + @Bean + public GroupedOpenApi publicApi() { + return GroupedOpenApi.builder() + .group("v1-definition") + .pathsToMatch("/api/**") + .build(); + } + @Bean + public OpenAPI springShopOpenAPI() { + return new OpenAPI() + .info(new Info().title("Hackathon API") + .description("Hackathon API 명세서입니다.") + .version("v0.0.1")); + } +} diff --git a/GiHwan/src/main/resources/application.yml b/GiHwan/src/main/resources/application.yml new file mode 100644 index 00000000..722389dc --- /dev/null +++ b/GiHwan/src/main/resources/application.yml @@ -0,0 +1,15 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/hackaton + username: root + password: 12345678 + driver-class-name: com.mysql.cj.jdbc.Driver + jpa: + show-sql: true + generate-ddl: true + open-in-view: false + properties.hibernate: + format_sql: true + hbm2ddl.auto: update + url: + base: http://localhost:8080 \ No newline at end of file diff --git a/GiHwan/src/test/java/com/example/demo/DemoApplicationTests.java b/GiHwan/src/test/java/com/example/demo/DemoApplicationTests.java new file mode 100644 index 00000000..2778a6a7 --- /dev/null +++ b/GiHwan/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() { + } + +}