diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/Good-Night-Hackathon-SpringBoot.iml b/.idea/Good-Night-Hackathon-SpringBoot.iml new file mode 100644 index 00000000..d6ebd480 --- /dev/null +++ b/.idea/Good-Night-Hackathon-SpringBoot.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..af286dd4 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 00000000..9c5b8604 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,12 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://localhost:3306 + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..2e70369b --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..fdc392fe --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..b6330f13 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..fb1fdf94 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/hackathon.main.iml b/.idea/modules/hackathon.main.iml new file mode 100644 index 00000000..92764430 --- /dev/null +++ b/.idea/modules/hackathon.main.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb new file mode 100644 index 00000000..e69de29b diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 00000000..2b63946d --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/hackathon/.gitignore b/hackathon/.gitignore new file mode 100644 index 00000000..c2065bc2 --- /dev/null +++ b/hackathon/.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/hackathon/build.gradle b/hackathon/build.gradle new file mode 100644 index 00000000..68f811bc --- /dev/null +++ b/hackathon/build.gradle @@ -0,0 +1,51 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '2.7.9' + id 'io.spring.dependency-management' version '1.0.15.RELEASE' +} + +group = 'com.techeer' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '11' + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + +// implementation "com.querydsl:querydsl-jpa:${queryDslVersion}" +// annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}" +} + +tasks.named('test') { + useJUnitPlatform() +} + +//def querydslDir = "$buildDir/generated/querydsl" +//querydsl { +// jpa = true +// querydslSourcesDir = querydslDir +//} +//sourceSets { +// main.java.srcDir querydslDir +//} +//configurations { +// querydsl.extendsFrom compileClasspath +//} +//compileQuerydsl { +// options.annotationProcessorPath = configurations.querydsl +//} diff --git a/hackathon/gradle/wrapper/gradle-wrapper.jar b/hackathon/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..249e5832 Binary files /dev/null and b/hackathon/gradle/wrapper/gradle-wrapper.jar differ diff --git a/hackathon/gradle/wrapper/gradle-wrapper.properties b/hackathon/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..070cb702 --- /dev/null +++ b/hackathon/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/hackathon/gradlew b/hackathon/gradlew new file mode 100755 index 00000000..a69d9cb6 --- /dev/null +++ b/hackathon/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/hackathon/gradlew.bat b/hackathon/gradlew.bat new file mode 100644 index 00000000..f127cfd4 --- /dev/null +++ b/hackathon/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/hackathon/settings.gradle b/hackathon/settings.gradle new file mode 100644 index 00000000..d6cc5f66 --- /dev/null +++ b/hackathon/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'hackathon' diff --git a/hackathon/src/main/java/com/techeer/hackathon/HackathonApplication.java b/hackathon/src/main/java/com/techeer/hackathon/HackathonApplication.java new file mode 100644 index 00000000..26dc8ef3 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/HackathonApplication.java @@ -0,0 +1,13 @@ +package com.techeer.hackathon; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class HackathonApplication { + + public static void main(String[] args) { + SpringApplication.run(HackathonApplication.class, args); + } + +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/controller/RestaurantController.java b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/controller/RestaurantController.java new file mode 100644 index 00000000..d369b16a --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/controller/RestaurantController.java @@ -0,0 +1,62 @@ +package com.techeer.hackathon.domain.restaurant.controller; + +import com.techeer.hackathon.domain.restaurant.domain.entity.Restaurant; +import com.techeer.hackathon.domain.restaurant.dto.RestaurantCreateRequestDto; +import com.techeer.hackathon.domain.restaurant.dto.RestaurantResponseDto; +import com.techeer.hackathon.domain.restaurant.service.RestaurantService; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RequestMapping("/api/v1/restaurants") +@RequiredArgsConstructor +@RestController +public class RestaurantController { + private final RestaurantService restaurantService; + + @PostMapping("/create") + public ResponseEntity createRestaurant(@RequestBody RestaurantCreateRequestDto restaurantCreateRequestDto) { + restaurantService.createRestaurant(restaurantCreateRequestDto); + return ResponseEntity.ok(RestaurantResponseDto.builder() + .name(restaurantCreateRequestDto.getName()) + .category(restaurantCreateRequestDto.getCategory()) + .build()); + } + + @GetMapping("/{RestaurantId}") + + + //READ +// @GetMapping("/{id}") +// public ResponseEntity getRestaurant(@PathVariable Long id) { +// return restaurantService.getRestaurant(id); +// } +// +// //UPDATE +// @PutMapping("/{id}") +// public ResponseEntity updateRestaurant(@PathVariable Long id, @RequestBody RestaurantUpdateRequest restaurantUpdateRequest) { +// return restaurantService.updateRestaurant(id, restaurantUpdateRequest); +// } +// +// //DELETE +// @DeleteMapping("/{id}") +// public void deleteRestaurant(@PathVariable Long id) { +// restaurantService.deleteRestaurant(id); +// } +// +// // READ ALL RESTAURANTS +// @GetMapping("/all") +// public List getAllRestaurants() +// { +// return restaurantService.getAllRestaurants(); +// } +// +// @GetMapping() +// public List getAllRestaurantsByCategory(@RequestParam String category) +// { +// return restaurantService.getAllRestaurantsByCategory(category); +// } +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/domain/entity/Restaurant.java b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/domain/entity/Restaurant.java new file mode 100644 index 00000000..1b26e4d3 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/domain/entity/Restaurant.java @@ -0,0 +1,48 @@ +package com.techeer.hackathon.domain.restaurant.domain.entity; + +import com.techeer.hackathon.domain.restaurant.dto.RestaurantResponseDto; +import com.techeer.hackathon.domain.review.domain.entity.Review; +import com.techeer.hackathon.global.entity.BaseTimeEntity; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import java.util.*; + +@Getter +@NoArgsConstructor +@Entity +@Table(name = "restaurant") +public class Restaurant extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + //레스토랑 명 + @Column(name = "name", nullable = false) + private String name; + + //카테고리 + @Column(name = "category", nullable = false) + private String category; + + //soft delete + @Column(name = "is_deleted", nullable = false) + private boolean isDeleted; + + @OneToMany(mappedBy = "restaurant") + private List restaurantReviews = new ArrayList<>(); + + @Builder + public Restaurant(String name, String category) { + this.name = name; + this.category = category; + this.isDeleted = false; + } + + //soft delete + public void deleteBoard() { + this.isDeleted = true; + } +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/domain/repository/RestaurantRepository.java b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/domain/repository/RestaurantRepository.java new file mode 100644 index 00000000..168b6c20 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/domain/repository/RestaurantRepository.java @@ -0,0 +1,13 @@ +package com.techeer.hackathon.domain.restaurant.domain.repository; + +import com.techeer.hackathon.domain.restaurant.domain.entity.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.Optional; + +public interface RestaurantRepository extends JpaRepository { + @Query("select r from Restaurant r where r.id = :restaurantId and r.isDeleted = true") + Optional findByRestaurantId(Long restaurantId); +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RestaurantCreateRequestDto.java b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RestaurantCreateRequestDto.java new file mode 100644 index 00000000..2d405271 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RestaurantCreateRequestDto.java @@ -0,0 +1,19 @@ +package com.techeer.hackathon.domain.restaurant.dto; + +import com.techeer.hackathon.domain.restaurant.domain.entity.Restaurant; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Builder +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class RestaurantCreateRequestDto { + private String name; + private String category; + +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RestaurantResponseDto.java b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RestaurantResponseDto.java new file mode 100644 index 00000000..e59e9a77 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RestaurantResponseDto.java @@ -0,0 +1,16 @@ +package com.techeer.hackathon.domain.restaurant.dto; + +import lombok.*; + +import java.time.LocalDateTime; + +@Builder +@Getter +@Setter +@AllArgsConstructor +@NoArgsConstructor +public class RestaurantResponseDto { + private String name; + private String category; + private LocalDateTime createdDate; +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RestaurantUpdateRequestDto.java b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RestaurantUpdateRequestDto.java new file mode 100644 index 00000000..ed6024fe --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/dto/RestaurantUpdateRequestDto.java @@ -0,0 +1,10 @@ +package com.techeer.hackathon.domain.restaurant.dto; + +import lombok.*; + + +@Getter +@Setter +public class RestaurantUpdateRequestDto { + private String category; +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/service/RestaurantService.java b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/service/RestaurantService.java new file mode 100644 index 00000000..75da8283 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/restaurant/service/RestaurantService.java @@ -0,0 +1,34 @@ +package com.techeer.hackathon.domain.restaurant.service; + +import com.techeer.hackathon.domain.restaurant.domain.entity.Restaurant; +import com.techeer.hackathon.domain.restaurant.domain.repository.RestaurantRepository; +import com.techeer.hackathon.domain.restaurant.dto.RestaurantCreateRequestDto; +import com.techeer.hackathon.domain.restaurant.dto.RestaurantResponseDto; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import javax.transaction.Transactional; + +@Service +@RequiredArgsConstructor +public class RestaurantService { + private final RestaurantRepository restaurantRepository; + + @Transactional + public RestaurantResponseDto createRestaurant(RestaurantCreateRequestDto restaurantCreateRequestDto) { + final Restaurant newRestaurant = + Restaurant.builder() + .name(restaurantCreateRequestDto.getName()) + .category(restaurantCreateRequestDto.getCategory()) + .build(); + restaurantRepository.save(newRestaurant); + + return RestaurantResponseDto.builder() + .name(newRestaurant.getName()) + .category(newRestaurant.getCategory()) + .createdDate(newRestaurant.getCreatedDate()) + .build(); + } + + +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/controller/ReviewController.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/controller/ReviewController.java new file mode 100644 index 00000000..84b055fa --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/controller/ReviewController.java @@ -0,0 +1,4 @@ +package com.techeer.hackathon.domain.review.controller; + +public class ReviewController { +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/domain/entity/Review.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/domain/entity/Review.java new file mode 100644 index 00000000..5118fde2 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/domain/entity/Review.java @@ -0,0 +1,59 @@ +package com.techeer.hackathon.domain.review.domain.entity; + +import com.techeer.hackathon.domain.restaurant.domain.entity.Restaurant; +import com.techeer.hackathon.domain.review.domain.repository.ReviewRepository; +import com.techeer.hackathon.domain.review.dto.ReviewUpdateRequestDto; +import com.techeer.hackathon.global.entity.BaseTimeEntity; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.SQLDelete; + +import javax.persistence.*; + +@Getter +@NoArgsConstructor +@Entity +@Table(name = "review") +@SQLDelete(sql = "UPDATE review SET is_Deleted = true WHERE id = ?") +public class Review extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + // 리뷰 제목 + @Column(name = "title", nullable = false) + private String title; + + // 리뷰 내용 + @Lob //엄청나게 긴 text + @Column(name = "content", nullable = false) + private String content; + + // 레스토랑 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "restaurant_id") + private Restaurant restaurant; + + @Column(name = "is_activated", nullable = false) + private boolean isActivated; + + @Builder + public Review(String title, String content, Restaurant restaurant){ + this.title = title; + this.content = content; + this.restaurant = restaurant; + this.isActivated = true; + } + + public void deleteReview() { + this.isActivated = false; + } + + public Review updatdReview(ReviewUpdateRequestDto request) { + this.title = request.getTitle(); + this.content = request.getContent(); + return this; + } + +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/domain/repository/ReviewRepository.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/domain/repository/ReviewRepository.java new file mode 100644 index 00000000..c7f1df57 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/domain/repository/ReviewRepository.java @@ -0,0 +1,17 @@ +package com.techeer.hackathon.domain.review.domain.repository; + +import com.techeer.hackathon.domain.review.domain.entity.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 java.util.Optional; + +public interface ReviewRepository extends JpaRepository , ReviewRepositoryQuerydsl{ + @Query("select r from Review r where r.isActivated is true") + Page findReviewWithPagination(Pageable pageable); + + @Query("select r from Review r where r.id = :ReviewId and r.isActivated = true") + Optional findReviewById(Long id); +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/domain/repository/ReviewRepositoryQuerydsl.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/domain/repository/ReviewRepositoryQuerydsl.java new file mode 100644 index 00000000..6daeeccc --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/domain/repository/ReviewRepositoryQuerydsl.java @@ -0,0 +1,14 @@ +package com.techeer.hackathon.domain.review.domain.repository; + +import com.techeer.hackathon.domain.review.dto.ReviewPreviewInfo; +import org.springframework.data.domain.Pageable; + +import java.util.*; + +public interface ReviewRepositoryQuerydsl { + List findReviewPreviewInfoListPage(Pageable pageable, boolean isTimeReserved); + + List getReviewListSearchTitleOrContent( + Pageable pageable, boolean isTimeReserved, String keyword + ); +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewDetailResponseDto.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewDetailResponseDto.java new file mode 100644 index 00000000..c7b7ecd1 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewDetailResponseDto.java @@ -0,0 +1,19 @@ +package com.techeer.hackathon.domain.review.dto; + +import lombok.*; + +@Getter +@Setter +@Builder +@NoArgsConstructor +public class ReviewDetailResponseDto { + private String title; + private String restaurantName; + private String content; + + public ReviewDetailResponseDto(String title, String restaurantName, String content) { + this.title = title; + this.restaurantName = restaurantName; + this.content = content; + } +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewListResponseDto.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewListResponseDto.java new file mode 100644 index 00000000..7f1f70d2 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewListResponseDto.java @@ -0,0 +1,16 @@ +package com.techeer.hackathon.domain.review.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.*; + +@Builder +@Getter +@AllArgsConstructor +@NoArgsConstructor +public class ReviewListResponseDto { + private List reviewPreviewInfoList = new ArrayList<>(); +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewPreviewInfo.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewPreviewInfo.java new file mode 100644 index 00000000..b13ca759 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewPreviewInfo.java @@ -0,0 +1,20 @@ +package com.techeer.hackathon.domain.review.dto; + +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class ReviewPreviewInfo { + private String restaurantName; + private String title; + + @Builder + public ReviewPreviewInfo(String restaurantName, String title) { + this.restaurantName = restaurantName; + this.title = title; + } +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewRequestDto.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewRequestDto.java new file mode 100644 index 00000000..448d9647 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewRequestDto.java @@ -0,0 +1,15 @@ +package com.techeer.hackathon.domain.review.dto; + +import lombok.Getter; +import lombok.Setter; + + +@Setter +@Getter +public class ReviewRequestDto { + private String title; + + private String content; + + private Long restaurantId; +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewUpdateRequestDto.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewUpdateRequestDto.java new file mode 100644 index 00000000..7951f6e3 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/dto/ReviewUpdateRequestDto.java @@ -0,0 +1,12 @@ +package com.techeer.hackathon.domain.review.dto; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ReviewUpdateRequestDto { + private String title; + private String content; + private Long restaurantId; +} diff --git a/hackathon/src/main/java/com/techeer/hackathon/domain/review/service/ReviewService.java b/hackathon/src/main/java/com/techeer/hackathon/domain/review/service/ReviewService.java new file mode 100644 index 00000000..bcffcab7 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/domain/review/service/ReviewService.java @@ -0,0 +1,77 @@ +//package com.techeer.hackathon.domain.review.service; +// +//import com.techeer.hackathon.domain.restaurant.domain.entity.Restaurant; +//import com.techeer.hackathon.domain.restaurant.domain.repository.RestaurantRepository; +//import com.techeer.hackathon.domain.review.domain.entity.Review; +//import com.techeer.hackathon.domain.review.domain.repository.ReviewRepository; +//import com.techeer.hackathon.domain.review.dto.*; +//import lombok.RequiredArgsConstructor; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.data.domain.PageRequest; +//import org.springframework.data.domain.Pageable; +//import org.springframework.stereotype.Service; +// +//import javax.transaction.Transactional; +//import java.util.*; +// +//@Slf4j +//@Service +//@RequiredArgsConstructor +//public class ReviewService { +// private final ReviewRepository reviewRepository; +// private final RestaurantRepository restaurantRepository; +// +// @Transactional +// public ReviewDetailResponseDto create(ReviewRequestDto reviewRequestDto) { +// final Restaurant restaurant = loadRestaurantInfoWithId(reviewRequestDto.getRestaurantId()); +// final Review newReview = +// Review.builder() +// .title(reviewRequestDto.getTitle()) +// .content(reviewRequestDto.getContent()) +// .restaurant(restaurant) +// .build(); +// reviewRepository.save(newReview); +// +// return ReviewDetailResponseDto.builder() +// .restaurantName(restaurant.getName()) +// .title(newReview.getTitle()) +// .content(newReview.getContent()) +// .build(); +// } +// +// public ReviewDetailResponseDto getReviewDetail(Long ReviewId) { +// Optional review = reviewRepository.findReviewById(ReviewId); +// return ReviewDetailResponseDto.builder() +// .title(review.get().getTitle()) +// .content(review.get().getContent()) +// .restaurantName(review.get().getRestaurant().getName()) +// .build(); +// } +// +// public ReviewListResponseDto getReviewListPage(int page, int size, boolean isTimeReserved) { +// final Pageable pageable = PageRequest.of(page, size); +// List reviewPreviewInfoList = +// reviewRepository.findReviewPreviewInfoListPage(pageable, isTimeReserved); +// +// return new ReviewListResponseDto(reviewPreviewInfoList); +// } +// +// public ReviewListResponseDto searchReviewWithTitleOrContent( +// int page, int size, boolean isTimeReserved, String keyword) { +// final Pageable pageable = PageRequest.of(page, size); +// List reviewPreviewInfoList = reviewRepository.getReviewListSearchTitleOrContent( +// pageable, isTimeReserved, keyword); +// +// return new ReviewListResponseDto(reviewPreviewInfoList); +// } +// +// @Transactional +// public ReviewDetailResponseDto updateReview(ReviewUpdateRequestDto updateRequest){ +// +// } +// +// +// private Restaurant loadRestaurantInfoWithId(Long restaurantId) { +// return RestaurantRepository.findByRestaurantId(restaurantId); +// } +//} diff --git a/hackathon/src/main/java/com/techeer/hackathon/global/entity/BaseTimeEntity.java b/hackathon/src/main/java/com/techeer/hackathon/global/entity/BaseTimeEntity.java new file mode 100644 index 00000000..56ff80a8 --- /dev/null +++ b/hackathon/src/main/java/com/techeer/hackathon/global/entity/BaseTimeEntity.java @@ -0,0 +1,21 @@ +package com.techeer.hackathon.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 BaseTimeEntity { + @CreatedDate + private LocalDateTime createdDate; + + @LastModifiedDate + private LocalDateTime updatedDate; +} diff --git a/hackathon/src/main/resources/application.yml b/hackathon/src/main/resources/application.yml new file mode 100644 index 00000000..0dcfaae7 --- /dev/null +++ b/hackathon/src/main/resources/application.yml @@ -0,0 +1,16 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/hackathon?serverTimezone=Asia/Seoul + username: root + password: 1234 + driver-class-name: com.mysql.cj.jdbc.Driver + jpa: + database: mysql + 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/hackathon/src/test/java/com/techeer/hackathon/HackathonApplicationTests.java b/hackathon/src/test/java/com/techeer/hackathon/HackathonApplicationTests.java new file mode 100644 index 00000000..9cabab03 --- /dev/null +++ b/hackathon/src/test/java/com/techeer/hackathon/HackathonApplicationTests.java @@ -0,0 +1,13 @@ +package com.techeer.hackathon; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class HackathonApplicationTests { + + @Test + void contextLoads() { + } + +}