From 3642f9b75b4b6fd6c16454a7f56aade954b00774 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 20 Apr 2021 16:45:40 +0900 Subject: [PATCH 01/38] =?UTF-8?q?Chore=20:=20=EB=B0=B1=EC=97=94=EB=93=9C?= =?UTF-8?q?=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EC=9D=84=20=EC=83=9D=EC=84=B1=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/sidedish/.gitignore | 38 ++++ backend/sidedish/build.gradle | 22 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + backend/sidedish/gradlew | 185 ++++++++++++++++++ backend/sidedish/gradlew.bat | 89 +++++++++ backend/sidedish/settings.gradle | 1 + .../team17/sidedish/SidedishApplication.java | 13 ++ .../src/main/resources/application.properties | 1 + .../sidedish/SidedishApplicationTests.java | 13 ++ 10 files changed, 367 insertions(+) create mode 100644 backend/sidedish/.gitignore create mode 100644 backend/sidedish/build.gradle create mode 100644 backend/sidedish/gradle/wrapper/gradle-wrapper.jar create mode 100644 backend/sidedish/gradle/wrapper/gradle-wrapper.properties create mode 100755 backend/sidedish/gradlew create mode 100644 backend/sidedish/gradlew.bat create mode 100644 backend/sidedish/settings.gradle create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/SidedishApplication.java create mode 100644 backend/sidedish/src/main/resources/application.properties create mode 100644 backend/sidedish/src/test/java/codsquad/team17/sidedish/SidedishApplicationTests.java diff --git a/backend/sidedish/.gitignore b/backend/sidedish/.gitignore new file mode 100644 index 000000000..735dd5dd8 --- /dev/null +++ b/backend/sidedish/.gitignore @@ -0,0 +1,38 @@ + +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/backend/sidedish/build.gradle b/backend/sidedish/build.gradle new file mode 100644 index 000000000..f69c20b2a --- /dev/null +++ b/backend/sidedish/build.gradle @@ -0,0 +1,22 @@ +plugins { + id 'org.springframework.boot' version '2.4.5' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' +} + +group = 'codsquad.team17' +version = '0.0.1-SNAPSHOT' +sourceCompatibility = '1.8' + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +test { + useJUnitPlatform() +} diff --git a/backend/sidedish/gradle/wrapper/gradle-wrapper.jar b/backend/sidedish/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/backend/sidedish/gradle/wrapper/gradle-wrapper.properties b/backend/sidedish/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..442d9132e --- /dev/null +++ b/backend/sidedish/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/backend/sidedish/gradlew b/backend/sidedish/gradlew new file mode 100755 index 000000000..4f906e0c8 --- /dev/null +++ b/backend/sidedish/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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 "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/backend/sidedish/gradlew.bat b/backend/sidedish/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/backend/sidedish/gradlew.bat @@ -0,0 +1,89 @@ +@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%" == "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%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/backend/sidedish/settings.gradle b/backend/sidedish/settings.gradle new file mode 100644 index 000000000..faefa2281 --- /dev/null +++ b/backend/sidedish/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'sidedish' diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/SidedishApplication.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/SidedishApplication.java new file mode 100644 index 000000000..b45cf582c --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/SidedishApplication.java @@ -0,0 +1,13 @@ +package codsquad.team17.sidedish; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SidedishApplication { + + public static void main(String[] args) { + SpringApplication.run(SidedishApplication.class, args); + } + +} diff --git a/backend/sidedish/src/main/resources/application.properties b/backend/sidedish/src/main/resources/application.properties new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/backend/sidedish/src/main/resources/application.properties @@ -0,0 +1 @@ + diff --git a/backend/sidedish/src/test/java/codsquad/team17/sidedish/SidedishApplicationTests.java b/backend/sidedish/src/test/java/codsquad/team17/sidedish/SidedishApplicationTests.java new file mode 100644 index 000000000..db4339bf9 --- /dev/null +++ b/backend/sidedish/src/test/java/codsquad/team17/sidedish/SidedishApplicationTests.java @@ -0,0 +1,13 @@ +package codsquad.team17.sidedish; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SidedishApplicationTests { + + @Test + void contextLoads() { + } + +} From 0b2600b37fa26b3a3a33d97d4f06993a1b102fcd Mon Sep 17 00:00:00 2001 From: malaheaven Date: Wed, 21 Apr 2021 16:57:05 +0900 Subject: [PATCH 02/38] =?UTF-8?q?Feat:=20=EC=8A=A4=ED=94=84=EB=A7=81=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20jdbc=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=85=8B=ED=8C=85=ED=95=98=EB=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 스프링 부트와 mysql을 연동해라 - 반찬 item, image, best_category, dish_category 테이블을 생성해라 --- backend/sidedish/build.gradle | 2 ++ .../src/main/resources/application.properties | 6 +++- .../sidedish/src/main/resources/schema.sql | 35 +++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 backend/sidedish/src/main/resources/schema.sql diff --git a/backend/sidedish/build.gradle b/backend/sidedish/build.gradle index f69c20b2a..b7bab442e 100644 --- a/backend/sidedish/build.gradle +++ b/backend/sidedish/build.gradle @@ -15,6 +15,8 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + runtimeOnly 'mysql:mysql-connector-java' } test { diff --git a/backend/sidedish/src/main/resources/application.properties b/backend/sidedish/src/main/resources/application.properties index 8b1378917..d74e61ff0 100644 --- a/backend/sidedish/src/main/resources/application.properties +++ b/backend/sidedish/src/main/resources/application.properties @@ -1 +1,5 @@ - +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.url=jdbc:mysql://localhost:3306/sidedish_db?serverTimezone=UTC&characterEncoding=UTF-8 +spring.datasource.username=sidedish +spring.datasource.password=team17 +spring.datasource.initialization-mode=always diff --git a/backend/sidedish/src/main/resources/schema.sql b/backend/sidedish/src/main/resources/schema.sql new file mode 100644 index 000000000..89f2afd66 --- /dev/null +++ b/backend/sidedish/src/main/resources/schema.sql @@ -0,0 +1,35 @@ +DROP TABLE IF EXISTS item, dish_category, best_category, image; + +CREATE TABLE IF NOT EXISTS dish_category( + dish_category_id int auto_increment primary key, + dish_category_name varchar(45) +); + +CREATE TABLE IF NOT EXISTS best_category( + best_category_id int auto_increment primary key, + best_category_name varchar(45) +); + + +CREATE TABLE IF NOT EXISTS image( + image_id int auto_increment primary key, + url varchar(300) +); + + +CREATE TABLE IF NOT EXISTS item( + item_id int auto_increment primary key, + title varchar(500), + description varchar(700), + n_price DECIMAL(10,2), + s_price DECIMAL(10,2), + dish_category_id int, + best_category_id int, + stock int, + badge varchar(45), + image_id int, + foreign key (image_id) references image(image_id) ON UPDATE CASCADE, + foreign key (best_category_id) references best_category(best_category_id) ON UPDATE CASCADE, + foreign key (dish_category_id) references dish_category(dish_category_id) ON UPDATE CASCADE +); + From 41d119b05da2c14e1f29b7902dd9167f549e9f04 Mon Sep 17 00:00:00 2001 From: malaheaven Date: Wed, 21 Apr 2021 17:40:04 +0900 Subject: [PATCH 03/38] =?UTF-8?q?Feat:=20domain=EC=9D=84=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=ED=95=B4=EB=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Item domain을 생성해라 - Image domain을 생성해라 - DishCategory domain을 생성해라 - BestCategory domain을 생성해라 --- .../team17/sidedish/domain/BestCategory.java | 19 +++++++++ .../team17/sidedish/domain/DishCategory.java | 18 ++++++++ .../team17/sidedish/domain/Image.java | 18 ++++++++ .../codsquad/team17/sidedish/domain/Item.java | 41 +++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java new file mode 100644 index 000000000..30f65e6e3 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java @@ -0,0 +1,19 @@ +package codsquad.team17.sidedish.domain; + +import org.springframework.data.annotation.Id; + +public class BestCategory { + + @Id + private Long bestCategoryId; + private String bestCategoryName; + + public BestCategory() { + + } + + public BestCategory(Long bestCategoryId, String bestCategoryName) { + this.bestCategoryId = bestCategoryId; + this.bestCategoryName = bestCategoryName; + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java new file mode 100644 index 000000000..fbb7409a4 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java @@ -0,0 +1,18 @@ +package codsquad.team17.sidedish.domain; + +import org.springframework.data.annotation.Id; + +public class DishCategory { + + @Id + private Long dishCategoryId; + private String dishCategoryName; + + public DishCategory() { + } + + public DishCategory(Long dishCategoryId, String dishCategoryName) { + this.dishCategoryId = dishCategoryId; + this.dishCategoryName = dishCategoryName; + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java new file mode 100644 index 000000000..7df811b0f --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java @@ -0,0 +1,18 @@ +package codsquad.team17.sidedish.domain; + +import org.springframework.data.annotation.Id; + +public class Image { + + @Id + private Long imageId; + private String url; + + public Image() { + } + + public Image(Long imageId, String url) { + this.imageId = imageId; + this.url = url; + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java new file mode 100644 index 000000000..77b60c97d --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java @@ -0,0 +1,41 @@ +package codsquad.team17.sidedish.domain; + +import org.springframework.data.annotation.Id; + +import java.math.BigDecimal; + +public class Item { + + @Id + private Long itemId; + private String title; + + private String discription; + + private String badge; + private BigDecimal nPrice; + + private BigDecimal sPrice; + private int stock; + private Long dishCategoryId; + + private Long bestCategoryId; + private Long imageId; + + public Item() { + } + + public Item(Long itemId, String title, String discription, String badge, BigDecimal nPrice, BigDecimal sPrice, int stock, Long dishCategoryId, Long bestCategoryId, Long imageId) { + this.itemId = itemId; + this.title = title; + this.discription = discription; + this.badge = badge; + this.nPrice = nPrice; + this.sPrice = sPrice; + this.stock = stock; + this.dishCategoryId = dishCategoryId; + this.bestCategoryId = bestCategoryId; + this.imageId = imageId; + } + +} From 5849e546e42db0c35133e4fba40c7ba27a6d35d7 Mon Sep 17 00:00:00 2001 From: malaheaven Date: Wed, 21 Apr 2021 18:16:01 +0900 Subject: [PATCH 04/38] =?UTF-8?q?Feat:=20repository=EB=A5=BC=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=ED=95=B4=EB=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ItemRepository를 생성해라 - ImageRepository를 생성해라 - DishCategoryRepository를 생성해라 - BestCategoryRepository를 생성해라 --- .../sidedish/repository/BestCategoryRepository.java | 8 ++++++++ .../sidedish/repository/DishCategoryRepository.java | 7 +++++++ .../team17/sidedish/repository/ImageRepository.java | 7 +++++++ .../team17/sidedish/repository/ItemRepository.java | 7 +++++++ 4 files changed, 29 insertions(+) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/BestCategoryRepository.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/DishCategoryRepository.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/BestCategoryRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/BestCategoryRepository.java new file mode 100644 index 000000000..906dc4f0f --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/BestCategoryRepository.java @@ -0,0 +1,8 @@ +package codsquad.team17.sidedish.repository; + + +import codsquad.team17.sidedish.domain.BestCategory; +import org.springframework.data.repository.CrudRepository; + +public interface BestCategoryRepository extends CrudRepository { +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/DishCategoryRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/DishCategoryRepository.java new file mode 100644 index 000000000..8b8e7f7e8 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/DishCategoryRepository.java @@ -0,0 +1,7 @@ +package codsquad.team17.sidedish.repository; + +import codsquad.team17.sidedish.domain.DishCategory; +import org.springframework.data.repository.CrudRepository; + +public interface DishCategoryRepository extends CrudRepository { +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java new file mode 100644 index 000000000..e3a8aff9c --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java @@ -0,0 +1,7 @@ +package codsquad.team17.sidedish.repository; + +import codsquad.team17.sidedish.domain.Image; +import org.springframework.data.repository.CrudRepository; + +public interface ImageRepository extends CrudRepository { +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java new file mode 100644 index 000000000..c00b0ad29 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -0,0 +1,7 @@ +package codsquad.team17.sidedish.repository; + +import codsquad.team17.sidedish.domain.Item; +import org.springframework.data.repository.CrudRepository; + +public interface ItemRepository extends CrudRepository { +} From 16d4c02ac0d3fce6ca430cd6c1edf597865548da Mon Sep 17 00:00:00 2001 From: malaheaven Date: Thu, 22 Apr 2021 11:02:33 +0900 Subject: [PATCH 05/38] =?UTF-8?q?Fix=20:=20DB=20=EC=8A=A4=ED=82=A4?= =?UTF-8?q?=EB=A7=88=20=EB=B3=80=EA=B2=BD=ED=95=98=EB=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 변경된 image, item 컬럼에 따라 domain 변경 - best_category 및 dish_category 에 대한 insert구문 추가 --- .../team17/sidedish/domain/Image.java | 4 +- .../codsquad/team17/sidedish/domain/Item.java | 8 ++- backend/sidedish/src/main/resources/data.sql | 14 +++++ .../sidedish/src/main/resources/schema.sql | 52 +++++++++---------- 4 files changed, 45 insertions(+), 33 deletions(-) create mode 100644 backend/sidedish/src/main/resources/data.sql diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java index 7df811b0f..c6f44314c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java @@ -7,12 +7,14 @@ public class Image { @Id private Long imageId; private String url; + private Long itemId; public Image() { } - public Image(Long imageId, String url) { + public Image(Long imageId, String url, Long itemId) { this.imageId = imageId; this.url = url; + this.itemId = itemId; } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java index 77b60c97d..d7d8bfe87 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java @@ -17,15 +17,15 @@ public class Item { private BigDecimal sPrice; private int stock; - private Long dishCategoryId; + private Long dishCategoryId; private Long bestCategoryId; - private Long imageId; + public Item() { } - public Item(Long itemId, String title, String discription, String badge, BigDecimal nPrice, BigDecimal sPrice, int stock, Long dishCategoryId, Long bestCategoryId, Long imageId) { + public Item(Long itemId, String title, String discription, String badge, BigDecimal nPrice, BigDecimal sPrice, int stock, Long dishCategoryId, Long bestCategoryId) { this.itemId = itemId; this.title = title; this.discription = discription; @@ -35,7 +35,5 @@ public Item(Long itemId, String title, String discription, String badge, BigDeci this.stock = stock; this.dishCategoryId = dishCategoryId; this.bestCategoryId = bestCategoryId; - this.imageId = imageId; } - } diff --git a/backend/sidedish/src/main/resources/data.sql b/backend/sidedish/src/main/resources/data.sql new file mode 100644 index 000000000..8b88b44a7 --- /dev/null +++ b/backend/sidedish/src/main/resources/data.sql @@ -0,0 +1,14 @@ +--best_category + +INSERT INTO best_category(best_category_name) VALUES ("할인특가 세트상품"); +INSERT INTO best_category(best_category_name) VALUES ("풍성한 고기반찬"); +INSERT INTO best_category(best_category_name) VALUES ("편리한 반찬세트"); +INSERT INTO best_category(best_category_name) VALUES ("간편한 덮밥요리"); +INSERT INTO best_category(best_category_name) VALUES ("우리아이 영양반찬"); +INSERT INTO best_category(best_category_name) VALUES ("해당없음"); + + +--dish_category +INSERT INTO dish_category(dish_category_name) VALUES ("든든한 메인요리"); +INSERT INTO dish_category(dish_category_name) VALUES ("뜨끈한 국물요리"); +INSERT INTO dish_category(dish_category_name) VALUES ("정갈한 밑찬반"); diff --git a/backend/sidedish/src/main/resources/schema.sql b/backend/sidedish/src/main/resources/schema.sql index 89f2afd66..49b733c10 100644 --- a/backend/sidedish/src/main/resources/schema.sql +++ b/backend/sidedish/src/main/resources/schema.sql @@ -1,35 +1,33 @@ -DROP TABLE IF EXISTS item, dish_category, best_category, image; +DROP TABLE IF EXISTS image, item, dish_category, best_category; CREATE TABLE IF NOT EXISTS dish_category( - dish_category_id int auto_increment primary key, - dish_category_name varchar(45) -); + dish_category_id int auto_increment primary key, + dish_category_name varchar(45) +)DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS best_category( - best_category_id int auto_increment primary key, - best_category_name varchar(45) -); - - -CREATE TABLE IF NOT EXISTS image( - image_id int auto_increment primary key, - url varchar(300) -); + best_category_id int auto_increment primary key, + best_category_name varchar(45) +)DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS item( - item_id int auto_increment primary key, - title varchar(500), - description varchar(700), - n_price DECIMAL(10,2), - s_price DECIMAL(10,2), - dish_category_id int, - best_category_id int, - stock int, - badge varchar(45), - image_id int, - foreign key (image_id) references image(image_id) ON UPDATE CASCADE, - foreign key (best_category_id) references best_category(best_category_id) ON UPDATE CASCADE, - foreign key (dish_category_id) references dish_category(dish_category_id) ON UPDATE CASCADE -); + item_id int auto_increment primary key, + title varchar(500), + description varchar(700), + n_price DECIMAL(10,2), + s_price DECIMAL(10,2), + dish_category_id int, + best_category_id int, + stock int, + badge varchar(45), + foreign key (best_category_id) references best_category(best_category_id) ON UPDATE CASCADE, + foreign key (dish_category_id) references dish_category(dish_category_id) ON UPDATE CASCADE +)DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS image( + image_id int auto_increment primary key, + url varchar(300), + item_id int, + foreign key (item_id) references item(item_id) ON UPDATE CASCADE +)DEFAULT CHARSET=utf8; From b970e665fb57917371fad10d29ac0fef776bff52 Mon Sep 17 00:00:00 2001 From: malaheaven Date: Thu, 22 Apr 2021 12:18:14 +0900 Subject: [PATCH 06/38] =?UTF-8?q?Feat:=20controller=EB=A5=BC=20=EB=A7=8C?= =?UTF-8?q?=EB=93=A4=EC=96=B4=EB=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BestCategoryController.java | 31 ++++++++++++++ .../team17/sidedish/dto/BestCategoryDto.java | 19 +++++++++ .../codsquad/team17/sidedish/dto/ItemDto.java | 35 ++++++++++++++++ .../sidedish/repository/ItemRepository.java | 1 + .../sidedish/service/BestCategoryService.java | 4 ++ backend/sidedish/src/main/resources/data.sql | 40 +++++++++++++++++++ 6 files changed, 130 insertions(+) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java new file mode 100644 index 000000000..395d3753c --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java @@ -0,0 +1,31 @@ +package codsquad.team17.sidedish.controller; + +import codsquad.team17.sidedish.domain.Item; +import codsquad.team17.sidedish.repository.ItemRepository; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/best") +public class BestCategoryController { + + private final ItemRepository itemRepository; + + public BestCategoryController (ItemRepository itemRepository){ + this.itemRepository = itemRepository; + } + + + @GetMapping + public ResponseEntity getBestCategoryList(){ + + + + return new ResponseEntity("", HttpStatus.OK); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java new file mode 100644 index 000000000..1cc2c32e3 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java @@ -0,0 +1,19 @@ +package codsquad.team17.sidedish.dto; + +import java.util.List; + +public class BestCategoryDto { + private Long bestCategoryId; + private String bestCategoryName; + private List items; + + private BestCategoryDto(){ + + } + + public BestCategoryDto(Long bestCategoryId, String bestCategoryName, List items) { + this.bestCategoryId = bestCategoryId; + this.bestCategoryName = bestCategoryName; + this.items = items; + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java new file mode 100644 index 000000000..d28d01775 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -0,0 +1,35 @@ +package codsquad.team17.sidedish.dto; + +import java.math.BigDecimal; +import java.util.List; + +public class ItemDto { + private Long itemId; + private String title; + private String discription; + + private BigDecimal n_price; + private BigDecimal s_price; + + private List badge; + private String image; + + private Long dishCategory; + + public ItemDto(){ + + } + + public ItemDto(Long itemId, String title, String discription, BigDecimal n_price, BigDecimal s_price, List badge, String image, Long dishCategory) { + this.itemId = itemId; + this.title = title; + this.discription = discription; + this.n_price = n_price; + this.s_price = s_price; + this.badge = badge; + this.image = image; + this.dishCategory = dishCategory; + } + + +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java index c00b0ad29..479ae2ed8 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -4,4 +4,5 @@ import org.springframework.data.repository.CrudRepository; public interface ItemRepository extends CrudRepository { + } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java new file mode 100644 index 000000000..45aed28b7 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java @@ -0,0 +1,4 @@ +package codsquad.team17.sidedish.service; + +public class BestCategoryService { +} diff --git a/backend/sidedish/src/main/resources/data.sql b/backend/sidedish/src/main/resources/data.sql index 8b88b44a7..5cf4e9b68 100644 --- a/backend/sidedish/src/main/resources/data.sql +++ b/backend/sidedish/src/main/resources/data.sql @@ -12,3 +12,43 @@ INSERT INTO best_category(best_category_name) VALUES ("해당없음"); INSERT INTO dish_category(dish_category_name) VALUES ("든든한 메인요리"); INSERT INTO dish_category(dish_category_name) VALUES ("뜨끈한 국물요리"); INSERT INTO dish_category(dish_category_name) VALUES ("정갈한 밑찬반"); + + +--item +INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) + VALUES ("[소중한식사] 경상도 한상차림", "오늘 저녁은 이상하게 안주빨을 세워보고 싶다!", 39000, 31200,1, 1, 20, "이벤트 특가"); +INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) + VALUES ("[집밥의완성]초여름보양세트", "무더위에 대비하는 6월 한상차림 초여름 보양세트", 26000, 18200, 2, 2, 20, "이벤트 특가"); +INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) + VALUES ("[아내의쉐프] 아쉐찜닭", "아내의쉐프가 자신 있게 만들어서 이름도 '아쉐찜닭'입니다", 11900, 10700, 2, 3, 20, "이벤트 특가"); +INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) + VALUES ("[애슐리투고] 로스트 콤보 450g", "립과 치킨이 만나 더욱 맛있게", 10900, 10900, 2, 4, 20, "이벤트 특가"); +INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) + VALUES ("title5", "discription5", 50000, 40000, 2, 5, 20, "이벤트 특가"); + + +--image +--경상도 한상 차림 +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H9881/f2a7b4df359c850b1a9eb57e17ddf6fc.jpg',1); +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H9881/fbf29077698ca16f8050e43476b47f38.jpg',1); +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H9881/c96c6949efc3391148e9b280a2c5ed0b.jpg',1); +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H9881/71411e15d2d961df496f87f08648b345.jpg',1); + +-- 초여름 보양세트 +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H7F20/fc5f385335b5d840be70b0cf612d0740.jpg',2); +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H7F20/fc5f385335b5d840be70b0cf612d0740.jpg',2); +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H7F20/ad8d4ecbdc341c7ff2cf6042e64437fb.jpg',2); +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H7F20/76b6f0595fbdbcf8424406cc65463a2d.jpg',2); + +-- 아쉐찜닭 +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/739d2ed2a9c963dc616db52580de695d.jpg',3); +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/739d2ed2a9c963dc616db52580de695d.jpg',3); +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/9d2d191ddbc0555ae96ed7e8ec4c95e3.jpg',3); +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/f14a921e2abc277c7f2033d34155f372.jpg',3); + +-- 애슐리투고 +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H206E/de61f1b996cb6a0c5e797b55178307f5.jpg',4); + + + + From 5f05a544155af0efba6762392709f48d26aee8e0 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Thu, 22 Apr 2021 14:33:58 +0900 Subject: [PATCH 07/38] =?UTF-8?q?style=20:=20=EB=B3=80=EC=88=98=EB=AA=85?= =?UTF-8?q?=20=EC=98=A4=ED=83=88=EC=9E=90=EB=A5=BC=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - discription -> description으로 변수명을 변경하라. --- .../codsquad/team17/sidedish/domain/Item.java | 6 +++--- .../codsquad/team17/sidedish/dto/ItemDto.java | 17 ++--------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java index d7d8bfe87..20ddd4733 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java @@ -10,7 +10,7 @@ public class Item { private Long itemId; private String title; - private String discription; + private String description; private String badge; private BigDecimal nPrice; @@ -25,10 +25,10 @@ public class Item { public Item() { } - public Item(Long itemId, String title, String discription, String badge, BigDecimal nPrice, BigDecimal sPrice, int stock, Long dishCategoryId, Long bestCategoryId) { + public Item(Long itemId, String title, String description, String badge, BigDecimal nPrice, BigDecimal sPrice, int stock, Long dishCategoryId, Long bestCategoryId) { this.itemId = itemId; this.title = title; - this.discription = discription; + this.description = description; this.badge = badge; this.nPrice = nPrice; this.sPrice = sPrice; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index d28d01775..50cb6a033 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -6,7 +6,7 @@ public class ItemDto { private Long itemId; private String title; - private String discription; + private String description; private BigDecimal n_price; private BigDecimal s_price; @@ -14,22 +14,9 @@ public class ItemDto { private List badge; private String image; - private Long dishCategory; + private Long dishCategoryId; public ItemDto(){ } - - public ItemDto(Long itemId, String title, String discription, BigDecimal n_price, BigDecimal s_price, List badge, String image, Long dishCategory) { - this.itemId = itemId; - this.title = title; - this.discription = discription; - this.n_price = n_price; - this.s_price = s_price; - this.badge = badge; - this.image = image; - this.dishCategory = dishCategory; - } - - } From a34d29c4039fc7e32787ff3e1c973ff684a10880 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Thu, 22 Apr 2021 14:36:27 +0900 Subject: [PATCH 08/38] =?UTF-8?q?feat=20:=20finAll=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 리턴타입을 List로 한 findAll 메서드를 생성하라. --- .../team17/sidedish/controller/BestCategoryController.java | 2 +- .../codsquad/team17/sidedish/repository/ItemRepository.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java index 395d3753c..fe0fca9fd 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java @@ -23,7 +23,7 @@ public BestCategoryController (ItemRepository itemRepository){ @GetMapping public ResponseEntity getBestCategoryList(){ - + List items = itemRepository.findAll(); return new ResponseEntity("", HttpStatus.OK); diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java index 479ae2ed8..205fc6661 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -3,6 +3,8 @@ import codsquad.team17.sidedish.domain.Item; import org.springframework.data.repository.CrudRepository; -public interface ItemRepository extends CrudRepository { +import java.util.List; +public interface ItemRepository extends CrudRepository { + List findAll(); } From 21ef877432db8dd4db90b7c06120be36a1a25996 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Thu, 22 Apr 2021 14:40:06 +0900 Subject: [PATCH 09/38] =?UTF-8?q?feat=20:=20domain=EA=B3=BC=20dto=EC=97=90?= =?UTF-8?q?=20getter=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=B4=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team17/sidedish/domain/BestCategory.java | 8 +++++ .../team17/sidedish/domain/DishCategory.java | 8 +++++ .../team17/sidedish/domain/Image.java | 12 +++++++ .../codsquad/team17/sidedish/domain/Item.java | 36 +++++++++++++++++++ .../team17/sidedish/dto/BestCategoryDto.java | 12 +++++++ .../codsquad/team17/sidedish/dto/ItemDto.java | 32 +++++++++++++++++ 6 files changed, 108 insertions(+) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java index 30f65e6e3..d69465538 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java @@ -16,4 +16,12 @@ public BestCategory(Long bestCategoryId, String bestCategoryName) { this.bestCategoryId = bestCategoryId; this.bestCategoryName = bestCategoryName; } + + public Long getBestCategoryId() { + return bestCategoryId; + } + + public String getBestCategoryName() { + return bestCategoryName; + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java index fbb7409a4..4685e67c9 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java @@ -15,4 +15,12 @@ public DishCategory(Long dishCategoryId, String dishCategoryName) { this.dishCategoryId = dishCategoryId; this.dishCategoryName = dishCategoryName; } + + public Long getDishCategoryId() { + return dishCategoryId; + } + + public String getDishCategoryName() { + return dishCategoryName; + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java index c6f44314c..beef60909 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java @@ -17,4 +17,16 @@ public Image(Long imageId, String url, Long itemId) { this.url = url; this.itemId = itemId; } + + public Long getImageId() { + return imageId; + } + + public String getUrl() { + return url; + } + + public Long getItemId() { + return itemId; + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java index 20ddd4733..3a9729e24 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java @@ -36,4 +36,40 @@ public Item(Long itemId, String title, String description, String badge, BigDeci this.dishCategoryId = dishCategoryId; this.bestCategoryId = bestCategoryId; } + + public Long getItemId() { + return itemId; + } + + public String getTitle() { + return title; + } + + public String getDescription() { + return description; + } + + public String getBadge() { + return badge; + } + + public BigDecimal getnPrice() { + return nPrice; + } + + public BigDecimal getsPrice() { + return sPrice; + } + + public int getStock() { + return stock; + } + + public Long getDishCategoryId() { + return dishCategoryId; + } + + public Long getBestCategoryId() { + return bestCategoryId; + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java index 1cc2c32e3..1c1cef64c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java @@ -16,4 +16,16 @@ public BestCategoryDto(Long bestCategoryId, String bestCategoryName, List getItems() { + return items; + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index 50cb6a033..d68fa1ffe 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -19,4 +19,36 @@ public class ItemDto { public ItemDto(){ } + + public Long getItemId() { + return itemId; + } + + public String getTitle() { + return title; + } + + public String getDescription() { + return description; + } + + public BigDecimal getN_price() { + return n_price; + } + + public BigDecimal getS_price() { + return s_price; + } + + public List getBadge() { + return badge; + } + + public String getImage() { + return image; + } + + public Long getDishCategoryId() { + return dishCategoryId; + } } From 5d7243b565f6ba8d43fd78edb99f530c78648779 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Thu, 22 Apr 2021 18:18:49 +0900 Subject: [PATCH 10/38] =?UTF-8?q?feat=20:=20=EB=B2=A0=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EB=93=A4=EC=9D=84=20=EB=B0=98=ED=99=98?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EB=A9=94=EC=84=9C=EB=93=9C=EB=A5=BC=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BestCategoryController.java | 32 +++++++++++++++++-- .../team17/sidedish/dto/BestCategoryDto.java | 10 ++++-- .../codsquad/team17/sidedish/dto/ItemDto.java | 20 ++++++++++++ .../sidedish/repository/ImageRepository.java | 7 ++++ .../sidedish/repository/ItemRepository.java | 1 + backend/sidedish/src/main/resources/data.sql | 4 +-- 6 files changed, 67 insertions(+), 7 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java index fe0fca9fd..dd9cc7397 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java @@ -1,6 +1,12 @@ package codsquad.team17.sidedish.controller; +import codsquad.team17.sidedish.domain.BestCategory; +import codsquad.team17.sidedish.domain.Image; import codsquad.team17.sidedish.domain.Item; +import codsquad.team17.sidedish.dto.BestCategoryDto; +import codsquad.team17.sidedish.dto.ItemDto; +import codsquad.team17.sidedish.repository.BestCategoryRepository; +import codsquad.team17.sidedish.repository.ImageRepository; import codsquad.team17.sidedish.repository.ItemRepository; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -8,24 +14,46 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; +import java.util.stream.IntStream; @RestController @RequestMapping("/best") public class BestCategoryController { private final ItemRepository itemRepository; + private final ImageRepository imageRepository; + private final BestCategoryRepository bestCategoryRepository; - public BestCategoryController (ItemRepository itemRepository){ + public BestCategoryController (ItemRepository itemRepository,ImageRepository imageRepository,BestCategoryRepository bestCategoryRepository){ this.itemRepository = itemRepository; + this.imageRepository= imageRepository; + this.bestCategoryRepository =bestCategoryRepository; } @GetMapping public ResponseEntity getBestCategoryList(){ + //list -> list + //entity : bestcategoy + //bestcategorydto를 만들어서 + //리스트화 + List items = itemRepository.findAll(); + List itemDtos = new ArrayList<>(); + List result = new ArrayList<>(); + + for(Item item : items){ + Image image = imageRepository.findByItemIdLimit(item.getItemId()).orElseThrow(RuntimeException::new); + ItemDto itemDto = new ItemDto(item,image); + itemDtos.add(itemDto); + BestCategory bestCategory = bestCategoryRepository.findById(item.getBestCategoryId()).orElseThrow(RuntimeException::new); + BestCategoryDto bestCategoryDto = new BestCategoryDto(bestCategory,itemDtos); + result.add(bestCategoryDto); + } - return new ResponseEntity("", HttpStatus.OK); + return new ResponseEntity(result, HttpStatus.OK); } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java index 1c1cef64c..fdf10d89a 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java @@ -1,5 +1,7 @@ package codsquad.team17.sidedish.dto; +import codsquad.team17.sidedish.domain.BestCategory; + import java.util.List; public class BestCategoryDto { @@ -11,12 +13,14 @@ private BestCategoryDto(){ } - public BestCategoryDto(Long bestCategoryId, String bestCategoryName, List items) { - this.bestCategoryId = bestCategoryId; - this.bestCategoryName = bestCategoryName; + public BestCategoryDto(BestCategory entity, List items) { + this.bestCategoryId = entity.getBestCategoryId(); + this.bestCategoryName = entity.getBestCategoryName(); this.items = items; } + + public Long getBestCategoryId() { return bestCategoryId; } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index d68fa1ffe..6ef95363a 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -1,6 +1,10 @@ package codsquad.team17.sidedish.dto; +import codsquad.team17.sidedish.domain.Image; +import codsquad.team17.sidedish.domain.Item; + import java.math.BigDecimal; +import java.util.Arrays; import java.util.List; public class ItemDto { @@ -20,6 +24,22 @@ public ItemDto(){ } + public ItemDto(Item entity, Image image) { + this.itemId = entity.getItemId(); + this.title = entity.getTitle(); + this.description = entity.getDescription(); + this.n_price = entity.getnPrice(); + this.s_price = entity.getsPrice(); + this.badge = parseBadge(entity.getBadge()); + this.image = image.getUrl(); + this.dishCategoryId = entity.getDishCategoryId(); + } + + + private List parseBadge(String badge) { + return Arrays.asList(badge.split(", ")); + } + public Long getItemId() { return itemId; } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java index e3a8aff9c..cf086d23f 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java @@ -1,7 +1,14 @@ package codsquad.team17.sidedish.repository; import codsquad.team17.sidedish.domain.Image; +import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; + +import java.util.Optional; public interface ImageRepository extends CrudRepository { + + @Query("SELECT image_id, url, item_id FROM image WHERE item_id=:itemId LIMIT 1;") + Optional findByItemIdLimit(@Param("itemId") Long itemId); } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java index 205fc6661..824938d68 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -7,4 +7,5 @@ public interface ItemRepository extends CrudRepository { List findAll(); + List findAllByBestCategoryId(Long bestCategoryId); } diff --git a/backend/sidedish/src/main/resources/data.sql b/backend/sidedish/src/main/resources/data.sql index 5cf4e9b68..7df454148 100644 --- a/backend/sidedish/src/main/resources/data.sql +++ b/backend/sidedish/src/main/resources/data.sql @@ -16,11 +16,11 @@ INSERT INTO dish_category(dish_category_name) VALUES ("정갈한 밑찬반"); --item INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) - VALUES ("[소중한식사] 경상도 한상차림", "오늘 저녁은 이상하게 안주빨을 세워보고 싶다!", 39000, 31200,1, 1, 20, "이벤트 특가"); + VALUES ("[소중한식사] 경상도 한상차림", "오늘 저녁은 이상하게 안주빨을 세워보고 싶다!", 39000, 31200,1, 1, 20, "이벤트 특가, 런칭특가"); INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) VALUES ("[집밥의완성]초여름보양세트", "무더위에 대비하는 6월 한상차림 초여름 보양세트", 26000, 18200, 2, 2, 20, "이벤트 특가"); INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) - VALUES ("[아내의쉐프] 아쉐찜닭", "아내의쉐프가 자신 있게 만들어서 이름도 '아쉐찜닭'입니다", 11900, 10700, 2, 3, 20, "이벤트 특가"); + VALUES ("[아내의쉐프] 아쉐찜닭", "아내의쉐프가 자신 있게 만들어서 이름도 '아쉐찜닭'입니다", 11900, 10700, 2, 3, 20, "이벤트 특가, 런칭특가"); INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) VALUES ("[애슐리투고] 로스트 콤보 450g", "립과 치킨이 만나 더욱 맛있게", 10900, 10900, 2, 4, 20, "이벤트 특가"); INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) From e842d9ac3414553b69f14113269c8b9c4de865eb Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Fri, 23 Apr 2021 11:30:36 +0900 Subject: [PATCH 11/38] =?UTF-8?q?feat=20:=20=EB=B2=A0=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=EC=9D=84=20=EC=A1=B0=ED=9A=8C=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 베스트 카테고리 전체 목록을 조회하라. - 베스트 카테고리 세부 목록을 조회하라. --- .../controller/BestCategoryController.java | 61 +++++++++++-------- .../team17/sidedish/dto/BestCategoryDto.java | 2 - .../codsquad/team17/sidedish/dto/ItemDto.java | 8 --- .../sidedish/repository/ImageRepository.java | 2 +- .../sidedish/repository/ItemRepository.java | 4 ++ backend/sidedish/src/main/resources/data.sql | 6 ++ 6 files changed, 46 insertions(+), 37 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java index dd9cc7397..a60cf28d6 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java @@ -1,7 +1,6 @@ package codsquad.team17.sidedish.controller; import codsquad.team17.sidedish.domain.BestCategory; -import codsquad.team17.sidedish.domain.Image; import codsquad.team17.sidedish.domain.Item; import codsquad.team17.sidedish.dto.BestCategoryDto; import codsquad.team17.sidedish.dto.ItemDto; @@ -11,49 +10,59 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; import java.util.List; -import java.util.stream.IntStream; +import java.util.stream.Collectors; +import java.util.stream.LongStream; @RestController @RequestMapping("/best") public class BestCategoryController { +// private static final int BEST_CATEGORY_ID_RANGE = 5; private final ItemRepository itemRepository; private final ImageRepository imageRepository; private final BestCategoryRepository bestCategoryRepository; - public BestCategoryController (ItemRepository itemRepository,ImageRepository imageRepository,BestCategoryRepository bestCategoryRepository){ + public BestCategoryController(ItemRepository itemRepository, ImageRepository imageRepository, + BestCategoryRepository bestCategoryRepository) { this.itemRepository = itemRepository; - this.imageRepository= imageRepository; - this.bestCategoryRepository =bestCategoryRepository; + this.imageRepository = imageRepository; + this.bestCategoryRepository = bestCategoryRepository; } - @GetMapping - public ResponseEntity getBestCategoryList(){ - //list -> list - //entity : bestcategoy - //bestcategorydto를 만들어서 - //리스트화 - - List items = itemRepository.findAll(); - - List itemDtos = new ArrayList<>(); - List result = new ArrayList<>(); - - for(Item item : items){ - Image image = imageRepository.findByItemIdLimit(item.getItemId()).orElseThrow(RuntimeException::new); - ItemDto itemDto = new ItemDto(item,image); - itemDtos.add(itemDto); - BestCategory bestCategory = bestCategoryRepository.findById(item.getBestCategoryId()).orElseThrow(RuntimeException::new); - BestCategoryDto bestCategoryDto = new BestCategoryDto(bestCategory,itemDtos); - result.add(bestCategoryDto); - } + public ResponseEntity getBestCategoryList() { + List distinctBestCategoryList = itemRepository.findDistinctByBestCategoryId(); + +// List result = LongStream.rangeClosed(1, BEST_CATEGORY_ID_RANGE). +// mapToObj(bestCategoryId -> getBestCategoryDto(bestCategoryId)) +// .collect(Collectors.toList()); + + List result = distinctBestCategoryList.stream() + .map(item -> getBestCategoryDto(item.getBestCategoryId())) + .collect(Collectors.toList()); return new ResponseEntity(result, HttpStatus.OK); } + + @GetMapping("/{bestCategoryId}") + public ResponseEntity getBestCategory(@PathVariable Long bestCategoryId) { + return new ResponseEntity(getBestCategoryDto(bestCategoryId), HttpStatus.OK); + } + + private BestCategoryDto getBestCategoryDto(Long bestCategoryId) { + List items = itemRepository.findAllByBestCategoryId(bestCategoryId); + List itemDtos = items.stream() + .map(item -> new ItemDto(item, imageRepository.findByItemIdLimit(item.getItemId()))) + .collect(Collectors.toList()); + + BestCategory bestCategory = bestCategoryRepository.findById(bestCategoryId) + .orElseThrow(RuntimeException::new); //TODO exception handling 하기 + + return new BestCategoryDto(bestCategory, itemDtos); + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java index fdf10d89a..0b559d80e 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java @@ -19,8 +19,6 @@ public BestCategoryDto(BestCategory entity, List items) { this.items = items; } - - public Long getBestCategoryId() { return bestCategoryId; } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index 6ef95363a..bd83e56e0 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -18,8 +18,6 @@ public class ItemDto { private List badge; private String image; - private Long dishCategoryId; - public ItemDto(){ } @@ -32,10 +30,8 @@ public ItemDto(Item entity, Image image) { this.s_price = entity.getsPrice(); this.badge = parseBadge(entity.getBadge()); this.image = image.getUrl(); - this.dishCategoryId = entity.getDishCategoryId(); } - private List parseBadge(String badge) { return Arrays.asList(badge.split(", ")); } @@ -67,8 +63,4 @@ public List getBadge() { public String getImage() { return image; } - - public Long getDishCategoryId() { - return dishCategoryId; - } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java index cf086d23f..f4e52c872 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java @@ -10,5 +10,5 @@ public interface ImageRepository extends CrudRepository { @Query("SELECT image_id, url, item_id FROM image WHERE item_id=:itemId LIMIT 1;") - Optional findByItemIdLimit(@Param("itemId") Long itemId); + Image findByItemIdLimit(@Param("itemId") Long itemId); } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java index 824938d68..cfaecb77a 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -1,6 +1,7 @@ package codsquad.team17.sidedish.repository; import codsquad.team17.sidedish.domain.Item; +import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; import java.util.List; @@ -8,4 +9,7 @@ public interface ItemRepository extends CrudRepository { List findAll(); List findAllByBestCategoryId(Long bestCategoryId); + + @Query("SELECT DISTINCT best_category_id FROM item") + List findDistinctByBestCategoryId(); } diff --git a/backend/sidedish/src/main/resources/data.sql b/backend/sidedish/src/main/resources/data.sql index 7df454148..b557f07ed 100644 --- a/backend/sidedish/src/main/resources/data.sql +++ b/backend/sidedish/src/main/resources/data.sql @@ -25,6 +25,8 @@ INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_ca VALUES ("[애슐리투고] 로스트 콤보 450g", "립과 치킨이 만나 더욱 맛있게", 10900, 10900, 2, 4, 20, "이벤트 특가"); INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) VALUES ("title5", "discription5", 50000, 40000, 2, 5, 20, "이벤트 특가"); +INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) + VALUES ("title6", "discription6", 50000, 40000, 2, 1, 20, "이벤트 특가, 런칭 특가"); --image @@ -49,6 +51,10 @@ INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/f1 -- 애슐리투고 INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H206E/de61f1b996cb6a0c5e797b55178307f5.jpg',4); +-- 가나다라 +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/f14a921e2abc277c7f2033d34155f372.jpg',5); + +INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/f14a921e2abc277c7f2033d34155f372.jpg',6); From f75f0b96a023562955b030d00ced9c7ba70c4867 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Fri, 23 Apr 2021 12:05:32 +0900 Subject: [PATCH 12/38] =?UTF-8?q?feat=20:=20service=20layer=EB=A5=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ItemService를 추가하라. - ImageService를 추가하라. - BestCategoryService를 추가하라. --- .../controller/BestCategoryController.java | 51 +++---------------- .../sidedish/repository/ImageRepository.java | 2 +- .../sidedish/service/BestCategoryService.java | 47 +++++++++++++++++ .../team17/sidedish/service/ImageService.java | 19 +++++++ .../team17/sidedish/service/ItemService.java | 24 +++++++++ 5 files changed, 97 insertions(+), 46 deletions(-) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ImageService.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java index a60cf28d6..b70de4d9c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java @@ -1,12 +1,6 @@ package codsquad.team17.sidedish.controller; -import codsquad.team17.sidedish.domain.BestCategory; -import codsquad.team17.sidedish.domain.Item; -import codsquad.team17.sidedish.dto.BestCategoryDto; -import codsquad.team17.sidedish.dto.ItemDto; -import codsquad.team17.sidedish.repository.BestCategoryRepository; -import codsquad.team17.sidedish.repository.ImageRepository; -import codsquad.team17.sidedish.repository.ItemRepository; +import codsquad.team17.sidedish.service.BestCategoryService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -14,55 +8,22 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.LongStream; - @RestController @RequestMapping("/best") public class BestCategoryController { -// private static final int BEST_CATEGORY_ID_RANGE = 5; - - private final ItemRepository itemRepository; - private final ImageRepository imageRepository; - private final BestCategoryRepository bestCategoryRepository; + private final BestCategoryService bestCategoryService; - public BestCategoryController(ItemRepository itemRepository, ImageRepository imageRepository, - BestCategoryRepository bestCategoryRepository) { - this.itemRepository = itemRepository; - this.imageRepository = imageRepository; - this.bestCategoryRepository = bestCategoryRepository; + public BestCategoryController(BestCategoryService bestCategoryService) { + this.bestCategoryService = bestCategoryService; } @GetMapping public ResponseEntity getBestCategoryList() { - List distinctBestCategoryList = itemRepository.findDistinctByBestCategoryId(); - -// List result = LongStream.rangeClosed(1, BEST_CATEGORY_ID_RANGE). -// mapToObj(bestCategoryId -> getBestCategoryDto(bestCategoryId)) -// .collect(Collectors.toList()); - - List result = distinctBestCategoryList.stream() - .map(item -> getBestCategoryDto(item.getBestCategoryId())) - .collect(Collectors.toList()); - - return new ResponseEntity(result, HttpStatus.OK); + return new ResponseEntity(bestCategoryService.getBestCategoryList(), HttpStatus.OK); } @GetMapping("/{bestCategoryId}") public ResponseEntity getBestCategory(@PathVariable Long bestCategoryId) { - return new ResponseEntity(getBestCategoryDto(bestCategoryId), HttpStatus.OK); - } - - private BestCategoryDto getBestCategoryDto(Long bestCategoryId) { - List items = itemRepository.findAllByBestCategoryId(bestCategoryId); - List itemDtos = items.stream() - .map(item -> new ItemDto(item, imageRepository.findByItemIdLimit(item.getItemId()))) - .collect(Collectors.toList()); - - BestCategory bestCategory = bestCategoryRepository.findById(bestCategoryId) - .orElseThrow(RuntimeException::new); //TODO exception handling 하기 - - return new BestCategoryDto(bestCategory, itemDtos); + return new ResponseEntity(bestCategoryService.getBestCategoryDto(bestCategoryId), HttpStatus.OK); } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java index f4e52c872..1cff6861b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java @@ -10,5 +10,5 @@ public interface ImageRepository extends CrudRepository { @Query("SELECT image_id, url, item_id FROM image WHERE item_id=:itemId LIMIT 1;") - Image findByItemIdLimit(@Param("itemId") Long itemId); + Optional findTopImageByItemId(@Param("itemId") Long itemId); } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java index 45aed28b7..743df163b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java @@ -1,4 +1,51 @@ package codsquad.team17.sidedish.service; +import codsquad.team17.sidedish.domain.BestCategory; +import codsquad.team17.sidedish.domain.Item; +import codsquad.team17.sidedish.dto.BestCategoryDto; +import codsquad.team17.sidedish.dto.ItemDto; +import codsquad.team17.sidedish.repository.BestCategoryRepository; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service public class BestCategoryService { + private final BestCategoryRepository bestCategoryRepository; + + private final ItemService itemService; + private final ImageService imageService; + + public BestCategoryService(BestCategoryRepository bestCategoryRepository, + ItemService itemService, ImageService imageService) { + this.bestCategoryRepository = bestCategoryRepository; + this.itemService = itemService; + this.imageService = imageService; + } + + public List getBestCategoryList() { + List distinctBestCategoryList = itemService.findDistinctByBestCategoryId(); + + return distinctBestCategoryList.stream() + .map(item -> getBestCategoryDto(item.getBestCategoryId())) + .collect(Collectors.toList()); + } + + public BestCategoryDto getBestCategoryDto(Long bestCategoryId) { + List items = itemService.findAllByBestCategoryId(bestCategoryId); + + List itemDtos = items.stream() + .map(item -> new ItemDto(item, imageService.findTopImageByItemId(item.getItemId()))) + .collect(Collectors.toList()); + + BestCategory bestCategory = findBestCategoryId(bestCategoryId); + + return new BestCategoryDto(bestCategory, itemDtos); + } + + public BestCategory findBestCategoryId(Long bestCategoryId) { + return bestCategoryRepository.findById(bestCategoryId) + .orElseThrow(RuntimeException::new); //TODO exception handling 하기 + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ImageService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ImageService.java new file mode 100644 index 000000000..17467c367 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ImageService.java @@ -0,0 +1,19 @@ +package codsquad.team17.sidedish.service; + +import codsquad.team17.sidedish.domain.Image; +import codsquad.team17.sidedish.repository.ImageRepository; +import org.springframework.stereotype.Service; + +@Service +public class ImageService { + private final ImageRepository imageRepository; + + public ImageService(ImageRepository imageRepository) { + this.imageRepository = imageRepository; + } + + public Image findTopImageByItemId(Long itemId) { + return imageRepository.findTopImageByItemId(itemId) + .orElseThrow(RuntimeException::new); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java new file mode 100644 index 000000000..f80ef3202 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java @@ -0,0 +1,24 @@ +package codsquad.team17.sidedish.service; + +import codsquad.team17.sidedish.domain.Item; +import codsquad.team17.sidedish.repository.ItemRepository; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ItemService { + private final ItemRepository itemRepository; + + public ItemService(ItemRepository itemRepository) { + this.itemRepository = itemRepository; + } + + public List findAllByBestCategoryId(Long bestCategoryId) { + return itemRepository.findAllByBestCategoryId(bestCategoryId); + } + + public List findDistinctByBestCategoryId() { + return itemRepository.findDistinctByBestCategoryId(); + } +} From 4f09ac79fcbcf644f92f3c91a548ef5f7201e69d Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Fri, 23 Apr 2021 12:22:28 +0900 Subject: [PATCH 13/38] =?UTF-8?q?style=20:=20ItemDto=20item=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=AA=85=EC=9D=84=20=EB=B3=80=EA=B2=BD=ED=95=98?= =?UTF-8?q?=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - itemId -> item_id로 변경하라. --- .../main/java/codsquad/team17/sidedish/dto/ItemDto.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index bd83e56e0..cdbdb750c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -8,7 +8,7 @@ import java.util.List; public class ItemDto { - private Long itemId; + private Long item_id; private String title; private String description; @@ -23,7 +23,7 @@ public ItemDto(){ } public ItemDto(Item entity, Image image) { - this.itemId = entity.getItemId(); + this.item_id = entity.getItemId(); this.title = entity.getTitle(); this.description = entity.getDescription(); this.n_price = entity.getnPrice(); @@ -36,8 +36,8 @@ private List parseBadge(String badge) { return Arrays.asList(badge.split(", ")); } - public Long getItemId() { - return itemId; + public Long getItem_id() { + return item_id; } public String getTitle() { From 7b874c4b5f42e1391077e267b25e153f02331776 Mon Sep 17 00:00:00 2001 From: malaheaven Date: Fri, 23 Apr 2021 15:46:28 +0900 Subject: [PATCH 14/38] =?UTF-8?q?Feat:=20DishCategory=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EA=B5=AC=ED=98=84=ED=95=B4?= =?UTF-8?q?=EB=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - DishCategoryController 구현 - DishCategoryService 구현 - DishCategoryDto 구현 --- .../controller/DishCategoryController.java | 39 +++++++++++++++++++ .../team17/sidedish/domain/BestCategory.java | 1 - .../team17/sidedish/dto/BestCategoryDto.java | 1 - .../team17/sidedish/dto/DishCategoryDto.java | 29 ++++++++++++++ .../codsquad/team17/sidedish/dto/ItemDto.java | 3 +- .../sidedish/repository/ItemRepository.java | 6 +++ .../sidedish/service/BestCategoryService.java | 12 ++---- .../sidedish/service/DishCategoryService.java | 33 ++++++++++++++++ .../team17/sidedish/service/ItemService.java | 18 ++++++++- 9 files changed, 128 insertions(+), 14 deletions(-) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java new file mode 100644 index 000000000..072217fb4 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java @@ -0,0 +1,39 @@ +package codsquad.team17.sidedish.controller; + +import codsquad.team17.sidedish.dto.DishCategoryDto; +import codsquad.team17.sidedish.service.DishCategoryService; +import codsquad.team17.sidedish.service.ImageService; +import codsquad.team17.sidedish.service.ItemService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class DishCategoryController { + + private final DishCategoryService dishCategoryService; + private final ItemService itemService; + private final ImageService imageService; + + public DishCategoryController(DishCategoryService dishCategoryService, ItemService itemService, ImageService imageService) { + this.dishCategoryService = dishCategoryService; + this.itemService = itemService; + this.imageService = imageService; + } + + @GetMapping("/main") + public ResponseEntity getMainDishCategory() { + return new ResponseEntity(dishCategoryService.getDishCategoryDto(1L), HttpStatus.OK); + } + + @GetMapping("/soup") + public ResponseEntity getSoupDishCategory() { + return new ResponseEntity(dishCategoryService.getDishCategoryDto(2L), HttpStatus.OK); + } + + @GetMapping("/side") + public ResponseEntity getSideDishCategory() { + return new ResponseEntity(dishCategoryService.getDishCategoryDto(3L), HttpStatus.OK); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java index d69465538..7f4ea586b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java @@ -9,7 +9,6 @@ public class BestCategory { private String bestCategoryName; public BestCategory() { - } public BestCategory(Long bestCategoryId, String bestCategoryName) { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java index 0b559d80e..a8259c79b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java @@ -10,7 +10,6 @@ public class BestCategoryDto { private List items; private BestCategoryDto(){ - } public BestCategoryDto(BestCategory entity, List items) { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java new file mode 100644 index 000000000..4c9f30be4 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java @@ -0,0 +1,29 @@ +package codsquad.team17.sidedish.dto; + +import codsquad.team17.sidedish.domain.DishCategory; + +import java.util.List; + +public class DishCategoryDto { + private Long dish_category_id; + private String dish_category_name; + private List items; + + public DishCategoryDto(DishCategory entity, List items) { + this.dish_category_id = entity.getDishCategoryId(); + this.dish_category_name = entity.getDishCategoryName(); + this.items = items; + } + + public Long getDish_category_id() { + return dish_category_id; + } + + public String getDish_category_name() { + return dish_category_name; + } + + public List getItems() { + return items; + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index cdbdb750c..ab33f36e8 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -18,8 +18,7 @@ public class ItemDto { private List badge; private String image; - public ItemDto(){ - + public ItemDto() { } public ItemDto(Item entity, Image image) { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java index cfaecb77a..1c677ff65 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -8,8 +8,14 @@ public interface ItemRepository extends CrudRepository { List findAll(); + List findAllByBestCategoryId(Long bestCategoryId); + List findAllByDishCategoryId(Long dishtCategoryId); + @Query("SELECT DISTINCT best_category_id FROM item") List findDistinctByBestCategoryId(); + + @Query("SELECT DISTINCT dish_category_id FROM item") + List findDistinctByDishCategoryId(); } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java index 743df163b..5a534ed3a 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java @@ -34,18 +34,12 @@ public List getBestCategoryList() { public BestCategoryDto getBestCategoryDto(Long bestCategoryId) { List items = itemService.findAllByBestCategoryId(bestCategoryId); - - List itemDtos = items.stream() - .map(item -> new ItemDto(item, imageService.findTopImageByItemId(item.getItemId()))) - .collect(Collectors.toList()); - - BestCategory bestCategory = findBestCategoryId(bestCategoryId); - - return new BestCategoryDto(bestCategory, itemDtos); + List itemDtos = itemService.getItemDtoList(items); + return new BestCategoryDto(findBestCategoryId(bestCategoryId), itemDtos); } public BestCategory findBestCategoryId(Long bestCategoryId) { return bestCategoryRepository.findById(bestCategoryId) - .orElseThrow(RuntimeException::new); //TODO exception handling 하기 + .orElseThrow(RuntimeException::new); } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java new file mode 100644 index 000000000..1a61453b5 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java @@ -0,0 +1,33 @@ +package codsquad.team17.sidedish.service; + +import codsquad.team17.sidedish.domain.DishCategory; +import codsquad.team17.sidedish.domain.Item; +import codsquad.team17.sidedish.dto.DishCategoryDto; +import codsquad.team17.sidedish.dto.ItemDto; +import codsquad.team17.sidedish.repository.DishCategoryRepository; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class DishCategoryService { + private final DishCategoryRepository dishCategoryRepository; + private final ItemService itemService; + private final ImageService imageService; + + public DishCategoryService(DishCategoryRepository dishCategoryRepository, ItemService itemService, ImageService imageService) { + this.dishCategoryRepository = dishCategoryRepository; + this.itemService = itemService; + this.imageService = imageService; + } + + public DishCategory findDishCategoryId(Long dishCategoryId) { + return dishCategoryRepository.findById(dishCategoryId).orElseThrow(RuntimeException::new); + } + + public DishCategoryDto getDishCategoryDto(Long dishCategoryId) { + List items = itemService.findAllByDishCategoryId(dishCategoryId); + List itemDtos = itemService.getItemDtoList(items); + return new DishCategoryDto(findDishCategoryId(dishCategoryId), itemDtos); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java index f80ef3202..bbd761b9b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java @@ -1,24 +1,40 @@ package codsquad.team17.sidedish.service; import codsquad.team17.sidedish.domain.Item; +import codsquad.team17.sidedish.dto.ItemDto; import codsquad.team17.sidedish.repository.ItemRepository; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; @Service public class ItemService { private final ItemRepository itemRepository; + private final ImageService imageService; - public ItemService(ItemRepository itemRepository) { + public ItemService(ItemRepository itemRepository, ImageService imageService) { this.itemRepository = itemRepository; + this.imageService = imageService; } public List findAllByBestCategoryId(Long bestCategoryId) { return itemRepository.findAllByBestCategoryId(bestCategoryId); } + public List findAllByDishCategoryId(Long dishCategoryId) { + return itemRepository.findAllByDishCategoryId(dishCategoryId); + } + public List findDistinctByBestCategoryId() { return itemRepository.findDistinctByBestCategoryId(); } + + public List getItemDtoList(List items) { + return items.stream() + .map(item -> new ItemDto(item, imageService.findTopImageByItemId(item.getItemId()))) + .collect(Collectors.toList()); + + } } + From 991103cf6d0412e53e99e3efa4ed4f033a755f42 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Sun, 25 Apr 2021 18:12:37 +0900 Subject: [PATCH 15/38] =?UTF-8?q?refactor=20:=20=EB=B6=88=ED=95=84?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=9D=98=EC=A1=B4=EC=84=B1=EC=9D=84=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 사용하지 않는 ItemService 제거 - 사용하지 않는 ImageService 제거 --- .../team17/sidedish/controller/DishCategoryController.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java index 072217fb4..f834b4796 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java @@ -13,13 +13,9 @@ public class DishCategoryController { private final DishCategoryService dishCategoryService; - private final ItemService itemService; - private final ImageService imageService; - public DishCategoryController(DishCategoryService dishCategoryService, ItemService itemService, ImageService imageService) { + public DishCategoryController(DishCategoryService dishCategoryService) { this.dishCategoryService = dishCategoryService; - this.itemService = itemService; - this.imageService = imageService; } @GetMapping("/main") From 4d1f50ab89668a112c461d321b05cbbb75d0a194 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Sun, 25 Apr 2021 18:18:18 +0900 Subject: [PATCH 16/38] =?UTF-8?q?feat=20:=20BestCategory=EC=9D=98=20?= =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=9D=98=EC=A1=B4?= =?UTF-8?q?=EC=84=B1=EC=9D=84=20=EC=A0=9C=EA=B1=B0=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 사용하지 않는 ImageService를 제거하라. --- .../codsquad/team17/sidedish/service/BestCategoryService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java index 5a534ed3a..f1274e49c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java @@ -15,13 +15,11 @@ public class BestCategoryService { private final BestCategoryRepository bestCategoryRepository; private final ItemService itemService; - private final ImageService imageService; public BestCategoryService(BestCategoryRepository bestCategoryRepository, - ItemService itemService, ImageService imageService) { + ItemService itemService) { this.bestCategoryRepository = bestCategoryRepository; this.itemService = itemService; - this.imageService = imageService; } public List getBestCategoryList() { From 84c36090ceb0d1b8f6412f818d1a8e7d4f7a08c6 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Sun, 25 Apr 2021 18:46:42 +0900 Subject: [PATCH 17/38] =?UTF-8?q?refactor=20:=20imageRepository=20?= =?UTF-8?q?=EC=9D=98=EC=A1=B4=EC=84=B1=EC=9D=84=EC=A3=BC=EC=9E=85=ED=95=98?= =?UTF-8?q?=EC=9E=90.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 현재 단계에서 imageService의 큰 사용이 없어 조회기능을 imageRepository로 주입해서 조회하도록 변경하라. --- .../controller/DishCategoryController.java | 2 -- .../sidedish/service/DishCategoryService.java | 5 ++--- .../team17/sidedish/service/ImageService.java | 19 ------------------- .../team17/sidedish/service/ItemService.java | 12 +++++++----- 4 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ImageService.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java index f834b4796..2732ccb8c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java @@ -2,8 +2,6 @@ import codsquad.team17.sidedish.dto.DishCategoryDto; import codsquad.team17.sidedish.service.DishCategoryService; -import codsquad.team17.sidedish.service.ImageService; -import codsquad.team17.sidedish.service.ItemService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java index 1a61453b5..c105833ab 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java @@ -12,13 +12,12 @@ @Service public class DishCategoryService { private final DishCategoryRepository dishCategoryRepository; + private final ItemService itemService; - private final ImageService imageService; - public DishCategoryService(DishCategoryRepository dishCategoryRepository, ItemService itemService, ImageService imageService) { + public DishCategoryService(DishCategoryRepository dishCategoryRepository, ItemService itemService) { this.dishCategoryRepository = dishCategoryRepository; this.itemService = itemService; - this.imageService = imageService; } public DishCategory findDishCategoryId(Long dishCategoryId) { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ImageService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ImageService.java deleted file mode 100644 index 17467c367..000000000 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ImageService.java +++ /dev/null @@ -1,19 +0,0 @@ -package codsquad.team17.sidedish.service; - -import codsquad.team17.sidedish.domain.Image; -import codsquad.team17.sidedish.repository.ImageRepository; -import org.springframework.stereotype.Service; - -@Service -public class ImageService { - private final ImageRepository imageRepository; - - public ImageService(ImageRepository imageRepository) { - this.imageRepository = imageRepository; - } - - public Image findTopImageByItemId(Long itemId) { - return imageRepository.findTopImageByItemId(itemId) - .orElseThrow(RuntimeException::new); - } -} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java index bbd761b9b..f2fc79b47 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java @@ -2,6 +2,7 @@ import codsquad.team17.sidedish.domain.Item; import codsquad.team17.sidedish.dto.ItemDto; +import codsquad.team17.sidedish.repository.ImageRepository; import codsquad.team17.sidedish.repository.ItemRepository; import org.springframework.stereotype.Service; @@ -11,11 +12,11 @@ @Service public class ItemService { private final ItemRepository itemRepository; - private final ImageService imageService; + private final ImageRepository imageRepository; - public ItemService(ItemRepository itemRepository, ImageService imageService) { + public ItemService(ItemRepository itemRepository, ImageRepository imageRepository) { this.itemRepository = itemRepository; - this.imageService = imageService; + this.imageRepository = imageRepository; } public List findAllByBestCategoryId(Long bestCategoryId) { @@ -32,9 +33,10 @@ public List findDistinctByBestCategoryId() { public List getItemDtoList(List items) { return items.stream() - .map(item -> new ItemDto(item, imageService.findTopImageByItemId(item.getItemId()))) + .map(item -> new ItemDto(item, imageRepository + .findTopImageByItemId(item.getItemId()) + .orElseThrow(RuntimeException::new))) .collect(Collectors.toList()); - } } From 7ebac27f33b152389954c2026bf2f042344800f7 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Sun, 25 Apr 2021 19:00:27 +0900 Subject: [PATCH 18/38] =?UTF-8?q?refactor=20:=20dto=EC=9D=98=20nPrice,=20s?= =?UTF-8?q?Price=20=EB=B3=80=EC=88=98=EB=AA=85=EC=9D=84=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Java Naming Convention에 맞게 camel case로 변경하여라. - 정확한 의미를 부여할 수 있도록 변수명을 구체적으로 작성하라. --- .../team17/sidedish/dto/BestCategoryDto.java | 12 ++++--- .../team17/sidedish/dto/DishCategoryDto.java | 23 ++++++++----- .../codsquad/team17/sidedish/dto/ItemDto.java | 33 ++++++++++--------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java index a8259c79b..e412ddb09 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java @@ -1,16 +1,18 @@ package codsquad.team17.sidedish.dto; import codsquad.team17.sidedish.domain.BestCategory; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; public class BestCategoryDto { - private Long bestCategoryId; - private String bestCategoryName; - private List items; + @JsonProperty("best_category_id") + private final Long bestCategoryId; - private BestCategoryDto(){ - } + @JsonProperty("best_category_name") + private final String bestCategoryName; + + private final List items; public BestCategoryDto(BestCategory entity, List items) { this.bestCategoryId = entity.getBestCategoryId(); diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java index 4c9f30be4..19af39ea4 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java @@ -1,26 +1,31 @@ package codsquad.team17.sidedish.dto; import codsquad.team17.sidedish.domain.DishCategory; +import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; public class DishCategoryDto { - private Long dish_category_id; - private String dish_category_name; - private List items; + @JsonProperty("dish_category_id") + private final Long dishCategoryId; + + @JsonProperty("dish_category_name") + private final String dishCategoryName; + + private final List items; public DishCategoryDto(DishCategory entity, List items) { - this.dish_category_id = entity.getDishCategoryId(); - this.dish_category_name = entity.getDishCategoryName(); + this.dishCategoryId = entity.getDishCategoryId(); + this.dishCategoryName = entity.getDishCategoryName(); this.items = items; } - public Long getDish_category_id() { - return dish_category_id; + public Long getDishCategoryId() { + return dishCategoryId; } - public String getDish_category_name() { - return dish_category_name; + public String getDishCategoryName() { + return dishCategoryName; } public List getItems() { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index ab33f36e8..49504415c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -2,31 +2,32 @@ import codsquad.team17.sidedish.domain.Image; import codsquad.team17.sidedish.domain.Item; +import com.fasterxml.jackson.annotation.JsonProperty; import java.math.BigDecimal; import java.util.Arrays; import java.util.List; public class ItemDto { - private Long item_id; - private String title; - private String description; + private final Long item_id; + private final String title; + private final String description; - private BigDecimal n_price; - private BigDecimal s_price; + @JsonProperty("n_price") + private final BigDecimal normalPrice; - private List badge; - private String image; - - public ItemDto() { - } + @JsonProperty("s_price") + private final BigDecimal salePrice; + private final List badge; + private final String image; + public ItemDto(Item entity, Image image) { this.item_id = entity.getItemId(); this.title = entity.getTitle(); this.description = entity.getDescription(); - this.n_price = entity.getnPrice(); - this.s_price = entity.getsPrice(); + this.normalPrice = entity.getnPrice(); + this.salePrice = entity.getsPrice(); this.badge = parseBadge(entity.getBadge()); this.image = image.getUrl(); } @@ -47,12 +48,12 @@ public String getDescription() { return description; } - public BigDecimal getN_price() { - return n_price; + public BigDecimal getNormalPrice() { + return normalPrice; } - public BigDecimal getS_price() { - return s_price; + public BigDecimal getSalePrice() { + return salePrice; } public List getBadge() { From 23d2ecf69caae43b23c826da9d73fb98d67ccd0d Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Sun, 25 Apr 2021 19:30:31 +0900 Subject: [PATCH 19/38] =?UTF-8?q?refactor=20:=20itemDto=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=AA=85=EC=97=90=20final=EC=9D=84=20=EC=84=A0?= =?UTF-8?q?=EC=96=B8=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/codsquad/team17/sidedish/dto/ItemDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index 49504415c..535624069 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -21,7 +21,7 @@ public class ItemDto { private final List badge; private final String image; - + public ItemDto(Item entity, Image image) { this.item_id = entity.getItemId(); this.title = entity.getTitle(); From bab8d75eaa9acc521d8b5bad7dbb3d5dbd7e1530 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Mon, 26 Apr 2021 17:21:48 +0900 Subject: [PATCH 20/38] =?UTF-8?q?feat=20:=20=EC=83=81=EC=84=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EB=A5=BC=20=EC=A1=B0=ED=9A=8C=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EA=B5=AC=ED=98=84=ED=95=98?= =?UTF-8?q?=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BestCategoryController.java | 2 +- .../controller/DishCategoryController.java | 2 + .../controller/ItemDetailController.java | 24 ++ .../codsquad/team17/sidedish/domain/Item.java | 18 +- .../team17/sidedish/dto/BestCategoryDto.java | 2 + .../team17/sidedish/dto/DishCategoryDto.java | 2 + .../team17/sidedish/dto/ItemDetailDto.java | 124 ++++++++ .../codsquad/team17/sidedish/dto/ItemDto.java | 66 +++-- .../sidedish/dto/RecommandedItemDto.java | 57 ++++ .../sidedish/repository/ImageRepository.java | 7 + .../sidedish/repository/ItemRepository.java | 2 - .../sidedish/service/ItemDetailService.java | 36 +++ backend/sidedish/src/main/resources/data.sql | 277 ++++++++++++++---- .../sidedish/src/main/resources/schema.sql | 4 +- 14 files changed, 530 insertions(+), 93 deletions(-) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java index b70de4d9c..6d15adbf4 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/best") +@RequestMapping("/dish/best") public class BestCategoryController { private final BestCategoryService bestCategoryService; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java index 2732ccb8c..79e950729 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java @@ -5,9 +5,11 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController +@RequestMapping("/dish") public class DishCategoryController { private final DishCategoryService dishCategoryService; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java new file mode 100644 index 000000000..8c1506ff9 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java @@ -0,0 +1,24 @@ +package codsquad.team17.sidedish.controller; + +import codsquad.team17.sidedish.service.ItemDetailService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("dish/detail") +public class ItemDetailController { + private final ItemDetailService itemDetailService; + + public ItemDetailController(ItemDetailService itemDetailService) { + this.itemDetailService = itemDetailService; + } + + @GetMapping("/{itemId}") + public ResponseEntity getItemsDetail(@PathVariable Long itemId) { + return new ResponseEntity(itemDetailService.getItemDetail(itemId), HttpStatus.OK); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java index 3a9729e24..d8ce15233 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java @@ -13,9 +13,9 @@ public class Item { private String description; private String badge; - private BigDecimal nPrice; - private BigDecimal sPrice; + private BigDecimal normalPrice; + private BigDecimal salePrice; private int stock; private Long dishCategoryId; @@ -25,13 +25,13 @@ public class Item { public Item() { } - public Item(Long itemId, String title, String description, String badge, BigDecimal nPrice, BigDecimal sPrice, int stock, Long dishCategoryId, Long bestCategoryId) { + public Item(Long itemId, String title, String description, String badge, BigDecimal normalPrice, BigDecimal salePrice, int stock, Long dishCategoryId, Long bestCategoryId) { this.itemId = itemId; this.title = title; this.description = description; this.badge = badge; - this.nPrice = nPrice; - this.sPrice = sPrice; + this.normalPrice = normalPrice; + this.salePrice = salePrice; this.stock = stock; this.dishCategoryId = dishCategoryId; this.bestCategoryId = bestCategoryId; @@ -53,12 +53,12 @@ public String getBadge() { return badge; } - public BigDecimal getnPrice() { - return nPrice; + public BigDecimal getNormalPrice() { + return normalPrice; } - public BigDecimal getsPrice() { - return sPrice; + public BigDecimal getSalePrice() { + return salePrice; } public int getStock() { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java index e412ddb09..e4d7adc95 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java @@ -2,9 +2,11 @@ import codsquad.team17.sidedish.domain.BestCategory; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; +@JsonPropertyOrder({"best_category_id", "best_category_name", "items"}) public class BestCategoryDto { @JsonProperty("best_category_id") private final Long bestCategoryId; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java index 19af39ea4..8e57e7368 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java @@ -2,9 +2,11 @@ import codsquad.team17.sidedish.domain.DishCategory; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.List; +@JsonPropertyOrder({"dish_category_id", "dish_category_name", "items"}) public class DishCategoryDto { @JsonProperty("dish_category_id") private final Long dishCategoryId; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java new file mode 100644 index 000000000..a7016bf56 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java @@ -0,0 +1,124 @@ +package codsquad.team17.sidedish.dto; + +import codsquad.team17.sidedish.domain.Item; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + +import java.util.Arrays; +import java.util.List; + +@JsonPropertyOrder({"item_id", "title", "description", "n_price", "s_price", "badge", "main_image", "thumb_images", "point", "delivery_info" +, "delivery_fee", "delivery_description", "stock", "recommanded"}) +public class ItemDetailDto { + + @JsonProperty("item_id") + private Long itemId; + + private String title; + private String description; + + @JsonProperty("n_price") + private int normalPrice; + + @JsonProperty("s_price") + private int salePrice; + + @JsonProperty("badge") + private List badges; + + @JsonProperty("main_image") + private String mainImage; + + @JsonProperty("thumb_images") + private List thumbImages; + + private int point; + + @JsonProperty("delivery_fee") + private int deliveryFee = 2500; + + @JsonProperty("delivery_description") + private String deliveryDescription = "2,500원 (40,000원 이상 구매 시 무료)"; + + private int stock; + + @JsonProperty("recommanded") + private List recommandedItems; + + public ItemDetailDto(Item item, List thumbImages, List recommandedItems) { + this.itemId = item.getItemId(); + this.title = item.getTitle(); + this.description = item.getDescription(); + this.badges = parseByComma(item.getBadge()); + + this.normalPrice = item.getNormalPrice().intValue(); + this.salePrice = item.getSalePrice().intValue(); + this.point = calculatePoint(this.normalPrice); + this.stock = item.getStock(); + + this.mainImage = thumbImages.get(0); + this.thumbImages = thumbImages; + + this.recommandedItems = recommandedItems; + } + + public Long getItemId() { + return itemId; + } + + public String getTitle() { + return title; + } + + public String getDescription() { + return description; + } + + public int getNormalPrice() { + return normalPrice; + } + + public int getSalePrice() { + return salePrice; + } + + public List getBadges() { + return badges; + } + + public String getMainImage() { + return mainImage; + } + + public List getThumbImages() { + return thumbImages; + } + + public int getPoint() { + return point; + } + + public int getDeliveryFee() { + return deliveryFee; + } + + public String getDeliveryDescription() { + return deliveryDescription; + } + + public int getStock() { + return stock; + } + + public List getRecommandedItems() { + return recommandedItems; + } + + private List parseByComma(String badge) { + return Arrays.asList(badge.split(", ")); + } + + private int calculatePoint(int normalPrice) { + return normalPrice / 100; + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index 535624069..e59cf6b79 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -3,41 +3,45 @@ import codsquad.team17.sidedish.domain.Image; import codsquad.team17.sidedish.domain.Item; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import java.math.BigDecimal; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@JsonPropertyOrder({"item_id", "title", "description", "n_price", "s_price", "badge", "image", "delivery_type"}) public class ItemDto { - private final Long item_id; + @JsonProperty("item_id") + private final Long itemId; private final String title; private final String description; @JsonProperty("n_price") - private final BigDecimal normalPrice; + private final int normalPrice; @JsonProperty("s_price") - private final BigDecimal salePrice; - - private final List badge; - private final String image; - - public ItemDto(Item entity, Image image) { - this.item_id = entity.getItemId(); - this.title = entity.getTitle(); - this.description = entity.getDescription(); - this.normalPrice = entity.getnPrice(); - this.salePrice = entity.getsPrice(); - this.badge = parseBadge(entity.getBadge()); - this.image = image.getUrl(); - } + private final int salePrice; - private List parseBadge(String badge) { - return Arrays.asList(badge.split(", ")); + @JsonProperty("delivery_type") + private List deliveryType = Arrays.asList(new String[] {"전국택배, 새벽배송"}); + + @JsonProperty("badge") + private List badges; + + private String image; + + public ItemDto(Item item, Image image) { + this.itemId = item.getItemId(); + this.title = item.getTitle(); + this.description = item.getDescription(); + this.normalPrice = item.getNormalPrice().intValue(); + this.salePrice = item.getSalePrice().intValue(); + this.badges = parseBadge(item.getBadge()); + this.image = image.getUrl(); } - public Long getItem_id() { - return item_id; + public Long getItemId() { + return itemId; } public String getTitle() { @@ -48,19 +52,31 @@ public String getDescription() { return description; } - public BigDecimal getNormalPrice() { + public int getNormalPrice() { return normalPrice; } - public BigDecimal getSalePrice() { + public int getSalePrice() { return salePrice; } - public List getBadge() { - return badge; + public List getDeliveryType() { + return deliveryType; + } + + public List getBadges() { + return badges; } public String getImage() { return image; } + + private List parseBadge(String badge) { + if(badge.equals("")) { + return new ArrayList<>(); + } + + return Arrays.asList(badge.split(", ")); + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java new file mode 100644 index 000000000..b84171993 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java @@ -0,0 +1,57 @@ +package codsquad.team17.sidedish.dto; + +import codsquad.team17.sidedish.domain.Image; +import codsquad.team17.sidedish.domain.Item; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +@JsonPropertyOrder({"item_id", "title", "image", "price","url"}) +public class RecommandedItemDto { + private static final String URL = ""; + + @JsonProperty("item_id") + private final Long itemId; + + private final String title; + + private final String image; + + private final int price; + + @JsonProperty("url") + private final String itemUrl; + + public RecommandedItemDto (Item entity, Image image) { + this.itemId = entity.getItemId(); + this.title = entity.getTitle(); + this.image = image.getUrl(); + + this.price = entity.getNormalPrice().intValue(); + this.itemUrl = URL + URL + "/dish" + "/detail" + "/" + itemId; + } + + public static String getURL() { + return URL; + } + + public Long getItemId() { + return itemId; + } + + public String getTitle() { + return title; + } + + public String getImage() { + return image; + } + + public int getPrice() { + return price; + } + + public String getItemUrl() { + return itemUrl; + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java index 1cff6861b..8dc0685a0 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java @@ -1,14 +1,21 @@ package codsquad.team17.sidedish.repository; import codsquad.team17.sidedish.domain.Image; +import codsquad.team17.sidedish.domain.Item; import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import java.util.List; import java.util.Optional; public interface ImageRepository extends CrudRepository { @Query("SELECT image_id, url, item_id FROM image WHERE item_id=:itemId LIMIT 1;") Optional findTopImageByItemId(@Param("itemId") Long itemId); + + @Query("SELECT url FROM image WHERE item_id=:itemId") + List findUrlByItemId(@Param("itemId") Long itemId); + + List findAllByItemId(Long item); } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java index 1c677ff65..640b0770a 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -16,6 +16,4 @@ public interface ItemRepository extends CrudRepository { @Query("SELECT DISTINCT best_category_id FROM item") List findDistinctByBestCategoryId(); - @Query("SELECT DISTINCT dish_category_id FROM item") - List findDistinctByDishCategoryId(); } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java new file mode 100644 index 000000000..6ca6acdd3 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java @@ -0,0 +1,36 @@ +package codsquad.team17.sidedish.service; + +import codsquad.team17.sidedish.domain.Item; +import codsquad.team17.sidedish.dto.ItemDetailDto; +import codsquad.team17.sidedish.dto.RecommandedItemDto; +import codsquad.team17.sidedish.repository.ImageRepository; +import codsquad.team17.sidedish.repository.ItemRepository; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ItemDetailService { + private final ItemRepository itemRepository; + private final ImageRepository imageRepository; + + public ItemDetailService(ItemRepository itemRepository, ImageRepository imageRepository) { + this.itemRepository = itemRepository; + this.imageRepository = imageRepository; + } + + public ItemDetailDto getItemDetail(Long itemId) { + Item item = itemRepository.findById(itemId) + .orElseThrow(RuntimeException::new); + List imageUrls = imageRepository.findUrlByItemId(itemId); + + List items = itemRepository.findAll(); + List list = items.stream().map(item1 -> + new RecommandedItemDto(item1, imageRepository.findTopImageByItemId(item1.getItemId()) + .orElseThrow(RuntimeException::new))) + .collect(Collectors.toList()); + + return new ItemDetailDto(item, imageUrls, list); + } +} diff --git a/backend/sidedish/src/main/resources/data.sql b/backend/sidedish/src/main/resources/data.sql index b557f07ed..8f7d1bc2f 100644 --- a/backend/sidedish/src/main/resources/data.sql +++ b/backend/sidedish/src/main/resources/data.sql @@ -1,60 +1,229 @@ --best_category -INSERT INTO best_category(best_category_name) VALUES ("할인특가 세트상품"); -INSERT INTO best_category(best_category_name) VALUES ("풍성한 고기반찬"); -INSERT INTO best_category(best_category_name) VALUES ("편리한 반찬세트"); -INSERT INTO best_category(best_category_name) VALUES ("간편한 덮밥요리"); -INSERT INTO best_category(best_category_name) VALUES ("우리아이 영양반찬"); -INSERT INTO best_category(best_category_name) VALUES ("해당없음"); - +INSERT INTO best_category(best_category_name) VALUES ('할인특가 세트상품'); +INSERT INTO best_category(best_category_name) VALUES ('풍성한 고기반찬'); +INSERT INTO best_category(best_category_name) VALUES ('편리한 반찬세트'); +INSERT INTO best_category(best_category_name) VALUES ('간편한 덮밥요리'); +INSERT INTO best_category(best_category_name) VALUES ('우리아이 영양반찬'); +INSERT INTO best_category(best_category_name) VALUES ('해당없음'); --dish_category -INSERT INTO dish_category(dish_category_name) VALUES ("든든한 메인요리"); -INSERT INTO dish_category(dish_category_name) VALUES ("뜨끈한 국물요리"); -INSERT INTO dish_category(dish_category_name) VALUES ("정갈한 밑찬반"); - - ---item -INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) - VALUES ("[소중한식사] 경상도 한상차림", "오늘 저녁은 이상하게 안주빨을 세워보고 싶다!", 39000, 31200,1, 1, 20, "이벤트 특가, 런칭특가"); -INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) - VALUES ("[집밥의완성]초여름보양세트", "무더위에 대비하는 6월 한상차림 초여름 보양세트", 26000, 18200, 2, 2, 20, "이벤트 특가"); -INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) - VALUES ("[아내의쉐프] 아쉐찜닭", "아내의쉐프가 자신 있게 만들어서 이름도 '아쉐찜닭'입니다", 11900, 10700, 2, 3, 20, "이벤트 특가, 런칭특가"); -INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) - VALUES ("[애슐리투고] 로스트 콤보 450g", "립과 치킨이 만나 더욱 맛있게", 10900, 10900, 2, 4, 20, "이벤트 특가"); -INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) - VALUES ("title5", "discription5", 50000, 40000, 2, 5, 20, "이벤트 특가"); -INSERT INTO item(title, description, n_price, s_price, dish_category_id, best_category_id, stock, badge) - VALUES ("title6", "discription6", 50000, 40000, 2, 1, 20, "이벤트 특가, 런칭 특가"); - - ---image ---경상도 한상 차림 -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H9881/f2a7b4df359c850b1a9eb57e17ddf6fc.jpg',1); -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H9881/fbf29077698ca16f8050e43476b47f38.jpg',1); -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H9881/c96c6949efc3391148e9b280a2c5ed0b.jpg',1); -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H9881/71411e15d2d961df496f87f08648b345.jpg',1); - --- 초여름 보양세트 -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H7F20/fc5f385335b5d840be70b0cf612d0740.jpg',2); -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H7F20/fc5f385335b5d840be70b0cf612d0740.jpg',2); -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H7F20/ad8d4ecbdc341c7ff2cf6042e64437fb.jpg',2); -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H7F20/76b6f0595fbdbcf8424406cc65463a2d.jpg',2); - --- 아쉐찜닭 -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/739d2ed2a9c963dc616db52580de695d.jpg',3); -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/739d2ed2a9c963dc616db52580de695d.jpg',3); -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/9d2d191ddbc0555ae96ed7e8ec4c95e3.jpg',3); -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/f14a921e2abc277c7f2033d34155f372.jpg',3); - --- 애슐리투고 -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/H206E/de61f1b996cb6a0c5e797b55178307f5.jpg',4); - --- 가나다라 -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/f14a921e2abc277c7f2033d34155f372.jpg',5); - -INSERT INTO image(url,item_id) VALUES('https://cdn.bmf.kr/_data/product/HA567/f14a921e2abc277c7f2033d34155f372.jpg',6); - +INSERT INTO dish_category(dish_category_name) VALUES ('든든한 메인요리'); +INSERT INTO dish_category(dish_category_name) VALUES ('뜨끈한 국물요리'); +INSERT INTO dish_category(dish_category_name) VALUES ('정갈한 밑찬반'); +--item table +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[소중한식사] 마라 한상차림', '알싸 ~ 한 마라 요리 세 가지를 한 번에 !', 39000, 31200, 1, 1, 5, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[딩고] 시그니처 3 종 SET', '오늘 저녁은 이상하게 안주빨을 세워보고 싶다 !', 32800, 24000, 1, 1, 7, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[집밥의완성] 초여름보양세트', '무더위에 대비하는 6 월 한상차림 초여름 보양세트', 26000, 18200, 1, 1, 6, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[아내의쉐프] 아쉐찜닭', '아내의쉐프가 자신 있게 만들어서 이름도 아쉐찜닭입니다', 11900, 10700, 1, 2, 9, '이벤트특가, 론칭특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[애슐리투고] 로스트 콤보 450 g', '립과 치킨이 만나 더욱 맛있게', 10900, 10900, 1, 2, 7, '론칭특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[한옥집] 소갈비김치찜 2 인분', '부드러운 소갈비와 함께 푹 쪄낸 김치찜 !', 16500, 14850, 1, 2, 9, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[동네부엌] 사계절 건강식단 작은상', '마포엄마들이 사랑해온 건강반찬', 24000, 24000, 1, 3, 10, '베스트'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[집밥의완성] 한상 가득 세트 (3 ~ 4 인)', '식단 정기배송으로 반찬고민 끝', 32000, 32000, 1, 3, 8, '베스트'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[옹가솜씨] 한끼뚝딱세트', '한 세트만 있으면 한 끼 뚝딱', 19500, 17500, 1, 3, 5, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[옹가솜씨] 소고기쩜짜장 280 g', '짜장의 착한 변신', 7200, 7200, 1, 4, 3, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[무명식당] 뿌리채소비빔밥 2 인분', '각종 뿌리채소를 듬뿍 넣어 지은 뿌리채소영양밥', 5000, 4750, 1, 4, 7, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[미노리키친] 규동 250 g', '일본인의 소울푸드 ! 한국인도 좋아하는 소고기덮밥', 6500, 5200, 1, 4, 9, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[빅마마의밥친구] 입맛감각 살려주는 유부토마토조림 200 g', '아이반찬과 다이어트 반찬으로 일석이조 !', 4900, 4900, 3, 5, 7, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[동네부엌] 수제미트볼조림 300 g', '재료부터 다른 수제미트볼조림', 8700, 8700, 3, 5, 8, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[Young313] 흰살생선 된장소스구이 200 g', '부드러운 명태살을 이용한 특별한 생선요리', 9800, 9800, 3, 5, 8, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[빅마마의밥친구] 아삭 고소한 연근고기조림 250 g', '편식하는 아이도 좋아하는 건강한 연근조림', 5500, 5500, 1, 6, 17, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[소중한식사] 골뱅이무침 195 g', '매콤새콤달콤, 반찬으로도 안주로도 좋은', 7000, 6300, 1, 6, 18, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[옹가솜씨] 꽁치간장조림 240 g', '생강 향이 산뜻한', 5800, 5800, 1, 6, 15, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[마더앤찬] 코다리구이 320 g', '큼지막하고 살집 많은 동태 한 마리로 만든 코다리구이입니다.', 7500, 6750, 1, 6, 14, '이벤트특가, 론칭특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[남도애꽃] 반건조 문어조림 120 g', '씹을수록 감칠맛나는 문어살의 쫄깃함', 4600, 4600, 1, 6, 3, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[마샐미디쉬] 매콤마늘쫑 해산물볶음 180 g', '탱글탱글한 새우와 오징어를 마늘쫑과 함께 매콤하게 볶아냈어요.', 6900, 6210, 1, 6, 5, '론칭특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[빅마마의밥친구] 비빔오징어 150 g', '달콤한 신야초발효액이 포인트 !', 5000, 5000, 1, 6, 8, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[수하동] 특곰탕 850 g', '100 % 한우양지로 끓여낸 70 년전통의 서울식곰탕', 15000, 14200, 2, 6, 5, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[빅마마의밥친구] 된장찌개 900 g', '항아리에서 숙성시킨 집된장으로만 맛을내 짜지 않은 된장찌개', 10000, 10000, 2, 6, 3, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[탐나는밥상] 동태탕 1000 g', '칼칼한 국물이 속 풀기에 딱 좋은 동태탕', 14000, 14000, 2, 6, 10, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[국물닷컴] 치즈부대찌개 600 g', '안주용 부대찌개와는 달라 밥말아먹기 딱 좋은', 5500, 4300, 2, 6, 7, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[집밥의완성] 스키야키 1.5 kg (2 ~ 3 인분)', '진한 풍미의 일본식 전골, 스키야키', 19800, 10000, 2, 6, 8, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[새로미부산어묵] 프리미엄 어묵탕세트', '밀가루 0 % 프리미엄 어묵에 어묵스프까지 드려요 !', 18000, 14400, 2, 6, 3, '론칭특가, 이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[모이세] 육개장 1 팩(600 g)', '제주3대해장국 맛집의 인기메뉴', 5900, 4400, 2, 6, 9, '론칭특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[마더앤찬] 명란감자국 630 ml', '간간한 저염명란과 고소한 감자가 조화로운 국이에요', 7000, 6300, 2, 6, 7, '론칭특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[마샐미디쉬] 유자소스 연근무침 250 g', '향긋한 유자향과 아삭한 연근', 6500, 6500, 3, 6, 7, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[동네부엌] 쇠고기야채장조림 200 g', '부드러운 고기부터 밥비벼먹기 딱좋은 국물까지', 7400, 7400, 3, 6, 8, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[소중한식사] 도라지초무침 150 g', '새콤달콤 입맛 돋우는', 4000, 4000, 3, 6, 4, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[미노리키친] 일본식 우엉조림(킨피라고보) 80 g', '한국식 우엉조림과는 다른 진한 감칠맛', 3300, 3300, 3, 6, 10, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[빅마마의밥친구] 갈치포무침 150 g', '쉽게 접할수 없는 꼬순내가득 갈치포 무침', 7000, 7000, 3, 6, 8, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[마더앤찬] 명란치즈계란말이 230 g', '아이반찬으로 최고 계란말이', 4300, 3870, 3, 6, 9, '이벤트특가'); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[옹가솜씨] 달걀곤약조림 330 g', '칼로리 부담 쭉쭉 내린', 5800, 5800, 3, 6, 9, ''); +INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) +VALUES ('[너의반찬] 미소된장 고추무침 200 g', '고소한 양념 때문에 손이 자꾸 가요', 4500, 4500, 3, 6, 10, ''); +-- image +INSERT INTO image(url, item_id) VALUES ('http://www.straightnews.co.kr/news/photo/201912/61797_33389_525.jpg',1); +INSERT INTO image(url, item_id) VALUES ('https://t1.daumcdn.net/cfile/blog/99AE493359F9CE5D24',1); +INSERT INTO image(url, item_id) VALUES ('https://file.mk.co.kr/meet/neds/2018/01/image_readtop_2018_476_15147648623153727.jpg',1); +INSERT INTO image(url, item_id) VALUES ('https://static.hubzum.zumst.com/hubzum/2019/03/08/16/556063497b6e4b329f1ada2dc9475e04.jpg',2); +INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/dzDmRaaA3raCdhSMZervXK4CgCFxG21hHNQkR-d2gDkKr-dnB6jy9rQl50CuoSJ5AWANEhT4NzjrI_sfA9AUBL41FAqf3ME',2); +INSERT INTO image(url, item_id) VALUES ('https://mblogthumb-phinf.pstatic.net/MjAxOTA2MjRfODEg/MDAxNTYxMzc2MjA4NjU1.GD59hi3bg_9rJalZkD0Z__99FLNJn9hFS8LDv5Ip6l0g.Ny-1Awk69Dj9adJS9qNn3juanjyZQ6ppvWZqPCKDR6Ug.JPEG.hong595959/20190621_163159.jpg?type=w2',2); +INSERT INTO image(url, item_id) VALUES ('http://image.auction.co.kr/itemimage/1f/49/c8/1f49c85946.jpg',2); +INSERT INTO image(url, item_id) VALUES ('https://cdn.imweb.me/thumbnail/20200924/0d863f21d04ce.jpg',3); +INSERT INTO image(url, item_id) VALUES ('https://cdn.imweb.me/thumbnail/20200129/11d062f5c510f.jpg',3); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2019/06/28/7deb64b55ff75fd05269e8dcb9f6c3e81.jpg',3); +INSERT INTO image(url, item_id) VALUES ('http://img.segye.com/content/image/2019/07/11/20190711512360.jpg',3); +INSERT INTO image(url, item_id) VALUES ('https://i.imgur.com/ler6Uhf.png',3); +INSERT INTO image(url, item_id) VALUES ('https://contents.lotteon.com/itemimage/_v120319/LF/15/16/69/1_/0/LF1516691_0_1.jpg/dims/resizef/720X720',3); +INSERT INTO image(url, item_id) VALUES ('https://images.squarespace-cdn.com/content/v1/52efff1fe4b0877bde888e3e/1606396705490-4ZM19FZF36MEBSHYVMCB/ke17ZwdGBToddI8pDm48kB80eW4KK5wgMfkTp6SjTNtZw-zPPgdn4jUwVcJE1ZvWQUxwkmyExglNqGp0IvTJZUJFbgE-7XRK3dMEBRBhUpxkEDnlqEYEiGVDb0kl5jpOJsm5iyfgdjNZyk67t96-U_4JMfIDDY8RGcVnRlrKExA/home-bongchu.jpg',4); +INSERT INTO image(url, item_id) VALUES ('http://image.auction.co.kr/itemimage/1c/40/8d/1c408d9cb1.jpg',4); +INSERT INTO image(url, item_id) VALUES ('http://gdimg.gmarket.co.kr/1854666978/still/280',4); +INSERT INTO image(url, item_id) VALUES ('http://img2.tmon.kr/cdn3/deals/2021/02/16/4289032702/catlist_3col_v2_e39e4_inzzy.jpg',4); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/data/goods/19/11/46/1000003960/1000003960_list_06.jpg',4); +INSERT INTO image(url, item_id) VALUES ('https://crcf.cookatmarket.com/product/images/2019/11/zahi_1574060111_9552.jpg',4); +INSERT INTO image(url, item_id) VALUES ('https://crcf.cookatmarket.com/product/images/2020/04/huma_1586424678_2549_720.jpg',5); +INSERT INTO image(url, item_id) VALUES ('https://img.siksinhot.com/place/1478504797742000.jpg',5); +INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/Cq11C_7UnokVlg2M9jObMYC7I8thZ1zqjTk4Mkg_dwhO2L46WyZZlQ-pWyShfFV2gtWAF41vgl-QJF7CQZLOZkXHTvjnpfBVnc2OVsIRTdwbOa_CwqvE5s8KojuGCGIdNbLLJJapSacXEgeGAXTDJcgfAGqcxRX4tAppcOaWnbUxoGlPyn5aWzMQZgrmcaqauw',5); +INSERT INTO image(url, item_id) VALUES ('https://m.yorivery.com/data/goods/19/07/30//1000000783/1000000783_detail_177.jpg',6); +INSERT INTO image(url, item_id) VALUES ('https://cdn.lightning-ashe.com/wp-content/uploads/2017/10/DSC02028.jpg',6); +INSERT INTO image(url, item_id) VALUES ('https://img1.daumcdn.net/thumb/R720x0.q80/?scode=mtistory2&fname=http%3A%2F%2Fcfile25.uf.tistory.com%2Fimage%2F99BE484D5C5FEA291891B7',6); +INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/HP-YM9za54z3ErrfbKXrTjpt7dtTdhLAvHU1XNlOIYOUM2E5ElYB24zcXkFsyAzBhYhmgIT2c7Hw8crnfOsXpyd1HkeaoICijxNSIZYSZV_9eRkZpMOR88oz2hwCnSKt9g',7); +INSERT INTO image(url, item_id) VALUES ('http://mydinner.co.kr/web/product/big/201809/f66fcfa2cc6c85f6ae486a29f5979b9b.jpg',7); +INSERT INTO image(url, item_id) VALUES ('http://mydinner.co.kr/web/product/big/201809/24b0a19ca5b137d4d046701829a7d9c8.jpg',7); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2017/07/10/24502c34ab4f7fe1af89e7a0225a52dc1.jpg',7); +INSERT INTO image(url, item_id) VALUES ('http://vrthumb.clipartkorea.co.kr/2019/01/07/tica101m18110205.jpg',8); +INSERT INTO image(url, item_id) VALUES ('https://dispatch.cdnser.be/wp-content/uploads/2018/04/ally_2018-04-24_10-10-14_986160.png',8); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2019/03/03/6a72d77a1e49adbbe88ccbabebd0b7b31.jpg',8); +INSERT INTO image(url, item_id) VALUES ('https://api.orderyo.co.kr/image/store/5E969EA53E8',9); +INSERT INTO image(url, item_id) VALUES ('https://pds.joins.com/news/component/htmlphoto_mmdata/201908/27/9081355e-5c2e-491c-9070-e124d8878c90.jpg',9); +INSERT INTO image(url, item_id) VALUES ('https://www.noodlelovers.com/upload_data/m_product_noodle_set/shutterstock_543369610.jpg',10); +INSERT INTO image(url, item_id) VALUES ('https://pds.joins.com/news/component/htmlphoto_mmdata/201510/27/htm_2015102710446621668.jpg',10); +INSERT INTO image(url, item_id) VALUES ('https://i.ytimg.com/vi/thD7PlACa14/maxresdefault.jpg',10); +INSERT INTO image(url, item_id) VALUES ('https://t1.daumcdn.net/liveboard/realfood/83da4bd708ac4d3b920c77819d045c25.jpg',11); +INSERT INTO image(url, item_id) VALUES ('https://health.chosun.com/site/data/img_dir/2020/11/03/2020110301808_0.jpg',11); +INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/29SzHuZ04RyWoc8oS61bugSMxTkSVnvmUJd-fobHt4YWBhPOldzFkQUJp3KDlPRXpScVPW95KY5dPoLNae_1YXmpIfoYX_1mb02wQTi0Oy8JXZHgDcmYuX6SYZitURvL_82_kv2I0wpiyHnVTg',11); +INSERT INTO image(url, item_id) VALUES ('https://public.codesquad.kr/jk/storeapp/data/detail/HBDEF/4cce011a4a352c22cd399a60271b4921.jpg',12); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/HBDEF/6ef14155afc5b47e8c9efd762f7a6096.jpg,',12); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/HBDEF/8744504ff3bc315f901dca1f26fe63a1.jpg,',12); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/HBDEF/e30bd6de9340fc05db3cd1d1329b2c56.jpg',12); +INSERT INTO image(url, item_id) VALUES ('https://m.cj.co.kr/images/theKitchen/PHON/0000002408/0000010356/0000002408.jpg',13); +INSERT INTO image(url, item_id) VALUES ('https://post-phinf.pstatic.net/MjAxODA3MjZfMzEg/MDAxNTMyNTkwMTkxODA5.lyQBcu2up62yariQzbV8U2BrMEjOh1W6EWCiG42dGwEg.sx7smYgGrN7tuUjCz_UP0iANrGpwXfSJ9K9AdQWM9wUg.PNG/image.png?type=w1200',13); +INSERT INTO image(url, item_id) VALUES ('http://img-cf.kurly.com/shop/data/goodsview/20180207/gv30000017576_1.jpg',13); +INSERT INTO image(url, item_id) VALUES ('http://www.ant-news.co.kr/news/photo/202010/12466_13532_16.png',14); +INSERT INTO image(url, item_id) VALUES ('https://blog.kakaocdn.net/dn/xnG4D/btqxZSXIx9b/LGDUUCRPapPSWrtKXIoock/img.jpg',14); +INSERT INTO image(url, item_id) VALUES ('https://image.freepik.com/free-photo/appetizing-chicken-meatballs-in-tomato-sauce-meatballs-in-a-pan-on-a-dark-table-chicken-cutlets-in-tomato-meat-dish_140840-158.jpg',14); +INSERT INTO image(url, item_id) VALUES ('https://cdn.imweb.me/thumbnail/20201001/7c205dc8f3359.png',15); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2018/02/09/a92201aa0c5a90d64036e525bc2b47a41.jpg',15); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/HDF73/0f95f44ea8e2e7930321def493753a48.jpg',16); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/HDF73/2d408898494ac950d7d2cfd6c36d59c2.jpg',16); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/HDF73/62c8bb77facfc9c3be81f9bf45b27f2a.jpg',16); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/HDF73/f6d73afc0ebc1efa71eaea32e9d846f2.jpg',16); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/cad8eee316cf7151e07638aa57b32a9d.jpg',17); +INSERT INTO image(url, item_id) VALUES ('https://thumbnail8.coupangcdn.com/thumbnails/remote/492x492ex/image/vendor_inventory/0db2/50bda73ed88a032cc47338eb982a6af50eca8394b9f20a83fc05e516bbcf.jpg',17); +INSERT INTO image(url, item_id) VALUES ('https://thumbnail10.coupangcdn.com/thumbnails/remote/q89/image/vendor_inventory/5350/674ba13304070d8306e27df72bf142f7709c0f9d3366e05d94278967d10f.jpg',17); +INSERT INTO image(url, item_id) VALUES ('https://thumbnail6.coupangcdn.com/thumbnails/remote/q89/image/vendor_inventory/4db2/18ac31f75a0a8ba109b8c787fe2d951849cedc1d99727273a29db4136855.jpg',17); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/b6beada6b89af950289003d929936d9c.jpg',18); +INSERT INTO image(url, item_id) VALUES ('http://www.sisterkitchen.co.kr/uploads/pw1602004/201809/5666c2164340b099eb3c2666e15ea1ff_crop.jpg',18); +INSERT INTO image(url, item_id) VALUES ('https://mblogthumb-phinf.pstatic.net/20160923_118/guebyul_1474620868146bmsos_PNG/%BD%BA%C5%A9%B8%B0%BC%A6_2016-09-23_%BF%C0%C8%C4_5.24.39.png?type=w800',18); +INSERT INTO image(url, item_id) VALUES ('https://img1.daumcdn.net/thumb/R720x0.q80/?scode=mtistory2&fname=http%3A%2F%2Fcfile24.uf.tistory.com%2Fimage%2F15134A4A50B22D3608696F',18); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/0221110ead70dfd455e40703bbdd6252.jpg',19); +INSERT INTO image(url, item_id) VALUES ('https://t1.daumcdn.net/cfile/tistory/221E2C3450F401FD1E',19); +INSERT INTO image(url, item_id) VALUES ('https://asset02.flavr.co.kr/media/common/cache/b23c90228c5a3d2ea348cfc006f80fbb/product/600x400/17f82f742ffe127f42dca9de82fb58b1_d_1_16.jpg',19); +INSERT INTO image(url, item_id) VALUES ('https://cphoto.asiae.co.kr/listimglink/6/2016032411041100033_1.jpg',19); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/385f4106ac26f6e4fe7c640714f405a5.jpg',20); +INSERT INTO image(url, item_id) VALUES ('https://ndflowerfish.wisacdn.com/_data/product/201711/13/d1dd8f4a54bf697a3dd12053547e68e4.jpg',20); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2019/12/31/b71bbd57f3d722afefb9ea661fd8cd4c1.jpg',20); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2015/04/10/c281917bbf0030de633eaf7a0762e11d1.jpg',20); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/2455226945d52f5aefd51f35d663bb16.jpg',21); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2019/03/07/de53770e6b5f8c0497346b11d7ad6c971.jpg',21); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2017/04/07/602de02c50e267e0974e799ce04500ec1.jpg',21); +INSERT INTO image(url, item_id) VALUES ('https://t1.daumcdn.net/cfile/tistory/231E193B5728B86E20',21); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/bc3b777115e8377a48c7bd762fe5fdc9.jpg',22); +INSERT INTO image(url, item_id) VALUES ('https://beatmarket.speedgabia.com/page/171117_16_2.jpg',22); +INSERT INTO image(url, item_id) VALUES ('https://beatmarket.speedgabia.com/page/171117_16_4.jpg',22); +INSERT INTO image(url, item_id) VALUES ('http://m.mfv.co.kr/web/product/big/201502/37_shop1_595651.jpg',22); +INSERT INTO image(url, item_id) VALUES ('https://public.codesquad.kr/jk/storeapp/data/d1fccf125f0a78113d0e06cb888f2e74.jpg',23); +INSERT INTO image(url, item_id) VALUES ('https://post-phinf.pstatic.net/MjAxODA0MTZfMTU2/MDAxNTIzODY2ODcxNjU4.P32Oy80beQAYaCIOBNaAuV0l3Otp6YKNBeXU4M0aYe4g.boG9McCGBdmlAt8SVdulUovnCuujCOMTVYCtR9wQfp0g.PNG/%ED%81%AC%EA%B8%B0%EB%B3%80%ED%99%98_2018-04-16_17%3B18%3B19.PNG?type=w1200',23); +INSERT INTO image(url, item_id) VALUES ('https://ai.esmplus.com/foodjang01/images/331500565_b_1.jpg',23); +INSERT INTO image(url, item_id) VALUES ('http://img.newspim.com/content/image/2015/11/18/20151118000159_0.jpg',23); +INSERT INTO image(url, item_id) VALUES ('https://static.coupangcdn.com/image/vendor_inventory/7ba7/ac099e963ffffad4fc57b2f8ead2217858759d40ac31c7c460df0ce5cf5d.jpg',23); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/c069bc32cb37727c59e1f0c2839311a0.jpg',24); +INSERT INTO image(url, item_id) VALUES ('https://www.ghostfreshmart.com/wp-content/uploads/2020/04/%EC%B0%A8%EB%8F%8C%EB%90%9C%EC%9E%A5%EC%B0%8C%EA%B0%9C.jpg',24); +INSERT INTO image(url, item_id) VALUES ('http://image.auction.co.kr/itemimage/20/98/cb/2098cb0636.jpg',24); +INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/Uk4fjrCmeGw5CwvR4ZhfnkDGDOj60kp9XM6-iv9ToQS4BvzlmM2UMNjx5B0nVa0IL826VbhurF2oMmhAuVNYS93uNkEODJp0PmDkLMLFRGhh6MdYt9V2fyW4iZzi_BHHoOnaOOLBLljXb6c_1jVhq27vvzsjzYeUv8VIDr5q1rEJK5qka58',24); +INSERT INTO image(url, item_id) VALUES ('https://doctorkitchen-media.s3.amazonaws.com/products/group/img_detail_%E1%84%80%E1%85%A9%E1%84%80%E1%85%B5%E1%84%83%E1%85%B3%E1%86%B7%E1%84%88%E1%85%AE%E1%86%A8%E1%84%83%E1%85%AC%E1%86%AB%E1%84%8C%E1%85%A1%E1%86%BC%E1%84%8D%E1%85%B5%E1%84%80%E1%85%A2_3.jpg',24); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/f31fc3f5828c27ff60e4cf89a862d31c.jpg',25); +INSERT INTO image(url, item_id) VALUES ('https://img-cf.kurly.com/shop/data/goodsview/20180912/gv30000031970_1.jpg',25); +INSERT INTO image(url, item_id) VALUES ('http://image.babosarang.co.kr/product/detail/MMB/2011121636082131/_600.jpg',25); +INSERT INTO image(url, item_id) VALUES ('http://www.62life.com/images/gdimg/93010901(3).jpg',25); +INSERT INTO image(url, item_id) VALUES ('http://image.kyobobook.co.kr/newimages/giftshop_new/goods/400/1616/hot1586849727069.jpg',25); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/6edbb16da52708e8533b85fbf743f882.jpg',26); +INSERT INTO image(url, item_id) VALUES ('https://dimg.donga.com/wps/NEWS/IMAGE/2017/03/29/83592836.3.jpg',26); +INSERT INTO image(url, item_id) VALUES ('https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQ_VbazLjf4cj3R7eGp7q2ug-UxcpyPpeMTBA&usqp=CAU',26); +INSERT INTO image(url, item_id) VALUES ('https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSiyBrROGtL2LtLbuSoD0LA70aW8k9HuI2r2Q&usqp=CAU',26); +INSERT INTO image(url, item_id) VALUES ('https://www.dgfood.co.kr/shopimages/dlive2020/0010030000153.jpg',26); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/892f3e7f043bfa7dbbcd58f88eecac36.jpg',27); +INSERT INTO image(url, item_id) VALUES ('https://rimage.gnst.jp/livejapan.com/public/article/detail/a/00/00/a0000346/img/basic/a0000346_main.jpg',27); +INSERT INTO image(url, item_id) VALUES ('https://rimage.gnst.jp/livejapan.com/public/article/detail/a/20/00/a2000278/img/basic/a2000278_main.jpg?20210119142424&q=80&rw=750&rh=536',27); +INSERT INTO image(url, item_id) VALUES ('https://www.foodnews.news/data/photos/20200937/art_15995248145581_58ee97.png',27); +INSERT INTO image(url, item_id) VALUES ('https://static.hubzum.zumst.com/hubzum/2018/01/29/11/f2704d25d1504e86821c86878d4f7f66.jpg',27); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/ae571e13d18fd4f0f40d685d2c8fe8f1.jpg',28); +INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/2vhkZFZKG-wq7z0zBQk-NLP2pJBPHHXqJ5l5zlfFs1PCOjEXnIAMn1VS4g_pJbdJiH_2dY1dTO_9Src4pZQrd3GYrcnP6ji36jUpjWp4UYsos3bOf-sG41UXOxkmGzA-S7eoRj8kv1DbP54Y4Dr65gwftoHwyGwpDQ',28); +INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2016/12/02/dbd73e6d5327feec3c2a8ee8aa6900871.jpg',28); +INSERT INTO image(url, item_id) VALUES ('https://cdn.onul-hoi.com/uploads/store_package/image/477/c3d724_210311054224.jpg',28); +INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/MZJGCeEdS68sQFErX_AgSO4rynz36zp8fv-5uL_HhblZftcrHvVSHSkaf-xW1ziEhEgFyLHc7Hml-W5XaMgz85eFUg4J1GqvDccIhbJUhxuL3fjvotMX_MemdWOnXTJrJwLS3O8S-ya9SKVXxUJ6m9TvrJjogvID5pK3c_TdUjgL',28); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/8fd330b5f5dbccbcbf4f5731e5e9e29b.jpg',29); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H26C7/f945d8ac1dccc3f931bcaf35de5de582.jpg',29); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H26C7/bacb0b8186371bfafbd92dbeec718e13.jpg',29); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H26C7/b96b02e9a956c6d5ad1e10eb14ba81e0.jpg',29); +INSERT INTO image(url, item_id) VALUES ('https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSihO_rpYAI_OcKOJXCc3VN1IS8ro4QsBrEaw&usqp=CAU',29); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/2416b58044d49f0d3a24256f8e76163b.jpg',30); +INSERT INTO image(url, item_id) VALUES ('https://so-sim.com/data/product/view/161536304181_1.jpg',30); +INSERT INTO image(url, item_id) VALUES ('https://so-sim.com/data/product/view/161536304181_3.jpg',30); +INSERT INTO image(url, item_id) VALUES ('https://so-sim.com/data/product/view/161536304181_4.jpg',30); +INSERT INTO image(url, item_id) VALUES ('https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQK4liNHOktBkLCUkTzvquPDaKPINu-IPcu1w&usqp=CAU',30); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/fdb0d5fcfb86e332505785225a6d9ade.jpg',31); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/e5646e5fc09a01a9243979b229e0572b.jpg',32); +INSERT INTO image(url, item_id) VALUES ('https://public.codesquad.kr/jk/storeapp/data/4cfd1954861ebd18b5b53e558a8e902e.jpg',33); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/422befe07f7e2860b9a83a8d7049ec2e.jpg',34); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H602F/c8c8045696b4692107ef28c8b445ca42.jpg',34); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H602F/edc6bae2e2663f05b4e8eb5a2b95d68f.jpg',34); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H602F/c935f5913dc66b11ebceeef85485c438.jpg',34); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H602F/7c1e24867611394f04b37d05593e21ba.jpg',34); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/d0b5d2be962947d9534e2140d1b34b2d.jpg',35); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/f6817349118d4c671da8dca9065649a9.jpg',36); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H0FC6/43c38eeffa556554c9b06301eb3e85b2.jpg',36); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H0FC6/92f556b605c4a84813070d7214c4f336.jpg',36); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H0FC6/538b8ab021c7814aa4af860d94f81287.jpg',36); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/detail/H0FC6/adaef08ab0680b087096afa0f0070fad.jpg',36); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/757878b14ee5a8d5af905c154fc38f01.jpg',37); +INSERT INTO image(url, item_id) VALUES ('http://public.codesquad.kr/jk/storeapp/data/043cf496f07899e7515f761e29d1ffa9.jpg',38); diff --git a/backend/sidedish/src/main/resources/schema.sql b/backend/sidedish/src/main/resources/schema.sql index 49b733c10..8b7938d2f 100644 --- a/backend/sidedish/src/main/resources/schema.sql +++ b/backend/sidedish/src/main/resources/schema.sql @@ -15,8 +15,8 @@ CREATE TABLE IF NOT EXISTS item( item_id int auto_increment primary key, title varchar(500), description varchar(700), - n_price DECIMAL(10,2), - s_price DECIMAL(10,2), + normal_price DECIMAL(10,2), + sale_price DECIMAL(10,2), dish_category_id int, best_category_id int, stock int, From 72346c5d124b4c46a0bcd1d6cb5dc2909bc48509 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 27 Apr 2021 14:47:53 +0900 Subject: [PATCH 21/38] =?UTF-8?q?refactor=20:=20API=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=EC=9D=84=20=EC=88=98=EC=A0=95=ED=95=98?= =?UTF-8?q?=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - itemDetail : description 2500원 내용 삭제 - badge 빈 문자열 제거 - badge 베스트 요소 제거 - 배포 URL 완성 - URL 추가 : recommandedItemDto, ItemDto - delivery-type 순서 변경 --- .../team17/sidedish/dto/ItemDetailDto.java | 5 +++-- .../codsquad/team17/sidedish/dto/ItemDto.java | 22 +++++++++++-------- .../sidedish/dto/RecommandedItemDto.java | 14 ++++++------ .../sidedish/repository/ItemRepository.java | 2 +- backend/sidedish/src/main/resources/data.sql | 6 ++--- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java index a7016bf56..b4acb20d2 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -38,7 +39,7 @@ public class ItemDetailDto { private int deliveryFee = 2500; @JsonProperty("delivery_description") - private String deliveryDescription = "2,500원 (40,000원 이상 구매 시 무료)"; + private String deliveryDescription = "(40,000원 이상 구매 시 무료)"; private int stock; @@ -115,7 +116,7 @@ public List getRecommandedItems() { } private List parseByComma(String badge) { - return Arrays.asList(badge.split(", ")); + return badge.equals("") ? new ArrayList<>() : Arrays.asList(badge.split(", ")); } private int calculatePoint(int normalPrice) { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index e59cf6b79..cbb1e618e 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -9,8 +9,11 @@ import java.util.Arrays; import java.util.List; -@JsonPropertyOrder({"item_id", "title", "description", "n_price", "s_price", "badge", "image", "delivery_type"}) +@JsonPropertyOrder({"item_id", "title", "description", "n_price", "s_price", + "badge", "image", "delivery_type", "detail_url"}) public class ItemDto { + private static final String URL = "http://ec2-15-164-123-251.ap-northeast-2.compute.amazonaws.com:8080/"; + @JsonProperty("item_id") private final Long itemId; private final String title; @@ -23,21 +26,25 @@ public class ItemDto { private final int salePrice; @JsonProperty("delivery_type") - private List deliveryType = Arrays.asList(new String[] {"전국택배, 새벽배송"}); + private List deliveryType = Arrays.asList(new String[] {"새벽배송", "전국택배"}); @JsonProperty("badge") private List badges; private String image; + @JsonProperty("detail_url") + private String detailUrl; + public ItemDto(Item item, Image image) { this.itemId = item.getItemId(); this.title = item.getTitle(); this.description = item.getDescription(); this.normalPrice = item.getNormalPrice().intValue(); this.salePrice = item.getSalePrice().intValue(); - this.badges = parseBadge(item.getBadge()); + this.badges = parseByComma(item.getBadge()); this.image = image.getUrl(); + this.detailUrl = URL + URL + "/dish" + "/detail" + "/" + itemId; } public Long getItemId() { @@ -72,11 +79,8 @@ public String getImage() { return image; } - private List parseBadge(String badge) { - if(badge.equals("")) { - return new ArrayList<>(); - } - - return Arrays.asList(badge.split(", ")); + private List parseByComma(String badge) { + return badge.equals("") ? new ArrayList<>() : Arrays.asList(badge.split(", ")); } + } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java index b84171993..605397b14 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java @@ -6,9 +6,9 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; -@JsonPropertyOrder({"item_id", "title", "image", "price","url"}) +@JsonPropertyOrder({"item_id", "title", "image", "price","detail_url"}) public class RecommandedItemDto { - private static final String URL = ""; + private static final String URL = "http://ec2-15-164-123-251.ap-northeast-2.compute.amazonaws.com:8080/"; @JsonProperty("item_id") private final Long itemId; @@ -19,8 +19,8 @@ public class RecommandedItemDto { private final int price; - @JsonProperty("url") - private final String itemUrl; + @JsonProperty("detail_url") + private final String detailUrl; public RecommandedItemDto (Item entity, Image image) { this.itemId = entity.getItemId(); @@ -28,7 +28,7 @@ public RecommandedItemDto (Item entity, Image image) { this.image = image.getUrl(); this.price = entity.getNormalPrice().intValue(); - this.itemUrl = URL + URL + "/dish" + "/detail" + "/" + itemId; + this.detailUrl = URL + URL + "/dish" + "/detail" + "/" + itemId; } public static String getURL() { @@ -51,7 +51,7 @@ public int getPrice() { return price; } - public String getItemUrl() { - return itemUrl; + public String getDetailUrl() { + return detailUrl; } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java index 640b0770a..46ac84818 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -13,7 +13,7 @@ public interface ItemRepository extends CrudRepository { List findAllByDishCategoryId(Long dishtCategoryId); - @Query("SELECT DISTINCT best_category_id FROM item") + @Query("SELECT DISTINCT best_category_id FROM item WHERE best_category_id <> 6") List findDistinctByBestCategoryId(); } diff --git a/backend/sidedish/src/main/resources/data.sql b/backend/sidedish/src/main/resources/data.sql index 8f7d1bc2f..b8b552f45 100644 --- a/backend/sidedish/src/main/resources/data.sql +++ b/backend/sidedish/src/main/resources/data.sql @@ -26,9 +26,9 @@ VALUES ('[애슐리투고] 로스트 콤보 450 g', '립과 치킨이 만나 더 INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) VALUES ('[한옥집] 소갈비김치찜 2 인분', '부드러운 소갈비와 함께 푹 쪄낸 김치찜 !', 16500, 14850, 1, 2, 9, '이벤트특가'); INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) -VALUES ('[동네부엌] 사계절 건강식단 작은상', '마포엄마들이 사랑해온 건강반찬', 24000, 24000, 1, 3, 10, '베스트'); +VALUES ('[동네부엌] 사계절 건강식단 작은상', '마포엄마들이 사랑해온 건강반찬', 24000, 24000, 1, 3, 10, ''); INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) -VALUES ('[집밥의완성] 한상 가득 세트 (3 ~ 4 인)', '식단 정기배송으로 반찬고민 끝', 32000, 32000, 1, 3, 8, '베스트'); +VALUES ('[집밥의완성] 한상 가득 세트 (3 ~ 4 인)', '식단 정기배송으로 반찬고민 끝', 32000, 32000, 1, 3, 8, ''); INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) VALUES ('[옹가솜씨] 한끼뚝딱세트', '한 세트만 있으면 한 끼 뚝딱', 19500, 17500, 1, 3, 5, '이벤트특가'); INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) @@ -116,7 +116,7 @@ INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy INSERT INTO image(url, item_id) VALUES ('https://m.yorivery.com/data/goods/19/07/30//1000000783/1000000783_detail_177.jpg',6); INSERT INTO image(url, item_id) VALUES ('https://cdn.lightning-ashe.com/wp-content/uploads/2017/10/DSC02028.jpg',6); INSERT INTO image(url, item_id) VALUES ('https://img1.daumcdn.net/thumb/R720x0.q80/?scode=mtistory2&fname=http%3A%2F%2Fcfile25.uf.tistory.com%2Fimage%2F99BE484D5C5FEA291891B7',6); -INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/HP-YM9za54z3ErrfbKXrTjpt7dtTdhLAvHU1XNlOIYOUM2E5ElYB24zcXkFsyAzBhYhmgIT2c7Hw8crnfOsXpyd1HkeaoICijxNSIZYSZV_9eRkZpMOR88oz2hwCnSKt9g',7); +INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/HP-https://upload.wikimedia.org/wikipedia/commons/1/10/Banchan_2.jpg',7); INSERT INTO image(url, item_id) VALUES ('http://mydinner.co.kr/web/product/big/201809/f66fcfa2cc6c85f6ae486a29f5979b9b.jpg',7); INSERT INTO image(url, item_id) VALUES ('http://mydinner.co.kr/web/product/big/201809/24b0a19ca5b137d4d046701829a7d9c8.jpg',7); INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2017/07/10/24502c34ab4f7fe1af89e7a0225a52dc1.jpg',7); From 5bed5349770218b5605551491ae24df7921f9044 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 27 Apr 2021 15:01:32 +0900 Subject: [PATCH 22/38] =?UTF-8?q?feat=20:=20CORS=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=EC=9D=84=20=EA=B5=AC=ED=98=84=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team17/sidedish/config/WebConfig.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/config/WebConfig.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/config/WebConfig.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/config/WebConfig.java new file mode 100644 index 000000000..c53dcf452 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/config/WebConfig.java @@ -0,0 +1,15 @@ +package codsquad.team17.sidedish.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class WebConfig implements WebMvcConfigurer { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOrigins("*") + .allowedMethods("GET"); + } +} From 8591818fa94664489710cb5884157427c90184ee Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 27 Apr 2021 16:20:39 +0900 Subject: [PATCH 23/38] =?UTF-8?q?style=20:=20URL=20=EC=B6=94=EA=B0=80=20/?= =?UTF-8?q?=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/codsquad/team17/sidedish/dto/ItemDto.java | 2 +- .../java/codsquad/team17/sidedish/dto/RecommandedItemDto.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index cbb1e618e..c37f3ca42 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -12,7 +12,7 @@ @JsonPropertyOrder({"item_id", "title", "description", "n_price", "s_price", "badge", "image", "delivery_type", "detail_url"}) public class ItemDto { - private static final String URL = "http://ec2-15-164-123-251.ap-northeast-2.compute.amazonaws.com:8080/"; + private static final String URL = "http://ec2-15-164-123-251.ap-northeast-2.compute.amazonaws.com:8080"; @JsonProperty("item_id") private final Long itemId; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java index 605397b14..e7c1c3af8 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java @@ -8,7 +8,7 @@ @JsonPropertyOrder({"item_id", "title", "image", "price","detail_url"}) public class RecommandedItemDto { - private static final String URL = "http://ec2-15-164-123-251.ap-northeast-2.compute.amazonaws.com:8080/"; + private static final String URL = "http://ec2-15-164-123-251.ap-northeast-2.compute.amazonaws.com:8080"; @JsonProperty("item_id") private final Long itemId; From 004c536776f9ded4655f6816192096b28aa4a724 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 27 Apr 2021 16:43:03 +0900 Subject: [PATCH 24/38] =?UTF-8?q?fix=20:=20=EC=98=A4=ED=83=88=EC=9E=90=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20URL=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 중복된 URL을 제거하라. - recommanded -> recommended로 변경하라. --- .../dto/{RecommandedItemDto.java => RecommendedItemDto.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/{RecommandedItemDto.java => RecommendedItemDto.java} (94%) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java similarity index 94% rename from backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java rename to backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java index e7c1c3af8..8a20a5f22 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommandedItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java @@ -28,7 +28,7 @@ public RecommandedItemDto (Item entity, Image image) { this.image = image.getUrl(); this.price = entity.getNormalPrice().intValue(); - this.detailUrl = URL + URL + "/dish" + "/detail" + "/" + itemId; + this.detailUrl = URL + "/dish" + "/detail" + "/" + itemId; } public static String getURL() { From 1c51b98bf14a0e1890a967e7fc3e296f14df453e Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 27 Apr 2021 16:51:44 +0900 Subject: [PATCH 25/38] =?UTF-8?q?style=20:=20=EC=A4=91=EB=B3=B5=EB=90=9C?= =?UTF-8?q?=20URL=EC=9D=84=20=EC=A0=9C=EA=B1=B0=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team17/sidedish/dto/ItemDetailDto.java | 14 +++++++------- .../java/codsquad/team17/sidedish/dto/ItemDto.java | 2 +- .../team17/sidedish/dto/RecommendedItemDto.java | 4 ++-- .../team17/sidedish/service/ItemDetailService.java | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java index b4acb20d2..588766009 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java @@ -9,7 +9,7 @@ import java.util.List; @JsonPropertyOrder({"item_id", "title", "description", "n_price", "s_price", "badge", "main_image", "thumb_images", "point", "delivery_info" -, "delivery_fee", "delivery_description", "stock", "recommanded"}) +, "delivery_fee", "delivery_description", "stock", "recommended"}) public class ItemDetailDto { @JsonProperty("item_id") @@ -43,10 +43,10 @@ public class ItemDetailDto { private int stock; - @JsonProperty("recommanded") - private List recommandedItems; + @JsonProperty("recommended") + private List recommendedItems; - public ItemDetailDto(Item item, List thumbImages, List recommandedItems) { + public ItemDetailDto(Item item, List thumbImages, List recommendedItems) { this.itemId = item.getItemId(); this.title = item.getTitle(); this.description = item.getDescription(); @@ -60,7 +60,7 @@ public ItemDetailDto(Item item, List thumbImages, List getRecommandedItems() { - return recommandedItems; + public List getRecommendedItems() { + return recommendedItems; } private List parseByComma(String badge) { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index c37f3ca42..370fee6a2 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -44,7 +44,7 @@ public ItemDto(Item item, Image image) { this.salePrice = item.getSalePrice().intValue(); this.badges = parseByComma(item.getBadge()); this.image = image.getUrl(); - this.detailUrl = URL + URL + "/dish" + "/detail" + "/" + itemId; + this.detailUrl = URL + "/dish" + "/detail" + "/" + itemId; } public Long getItemId() { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java index 8a20a5f22..e6db08e78 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java @@ -7,7 +7,7 @@ @JsonPropertyOrder({"item_id", "title", "image", "price","detail_url"}) -public class RecommandedItemDto { +public class RecommendedItemDto { private static final String URL = "http://ec2-15-164-123-251.ap-northeast-2.compute.amazonaws.com:8080"; @JsonProperty("item_id") @@ -22,7 +22,7 @@ public class RecommandedItemDto { @JsonProperty("detail_url") private final String detailUrl; - public RecommandedItemDto (Item entity, Image image) { + public RecommendedItemDto(Item entity, Image image) { this.itemId = entity.getItemId(); this.title = entity.getTitle(); this.image = image.getUrl(); diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java index 6ca6acdd3..156abf8b3 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java @@ -2,7 +2,7 @@ import codsquad.team17.sidedish.domain.Item; import codsquad.team17.sidedish.dto.ItemDetailDto; -import codsquad.team17.sidedish.dto.RecommandedItemDto; +import codsquad.team17.sidedish.dto.RecommendedItemDto; import codsquad.team17.sidedish.repository.ImageRepository; import codsquad.team17.sidedish.repository.ItemRepository; import org.springframework.stereotype.Service; @@ -26,8 +26,8 @@ public ItemDetailDto getItemDetail(Long itemId) { List imageUrls = imageRepository.findUrlByItemId(itemId); List items = itemRepository.findAll(); - List list = items.stream().map(item1 -> - new RecommandedItemDto(item1, imageRepository.findTopImageByItemId(item1.getItemId()) + List list = items.stream().map(item1 -> + new RecommendedItemDto(item1, imageRepository.findTopImageByItemId(item1.getItemId()) .orElseThrow(RuntimeException::new))) .collect(Collectors.toList()); From 621d6c4541cbd29a75e3f38bde8d0354996266f7 Mon Sep 17 00:00:00 2001 From: malaheaven Date: Tue, 27 Apr 2021 20:19:05 +0900 Subject: [PATCH 26/38] Fix: dish url --- backend/sidedish/src/main/resources/data.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/sidedish/src/main/resources/data.sql b/backend/sidedish/src/main/resources/data.sql index b8b552f45..7c7d830ec 100644 --- a/backend/sidedish/src/main/resources/data.sql +++ b/backend/sidedish/src/main/resources/data.sql @@ -116,7 +116,7 @@ INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy INSERT INTO image(url, item_id) VALUES ('https://m.yorivery.com/data/goods/19/07/30//1000000783/1000000783_detail_177.jpg',6); INSERT INTO image(url, item_id) VALUES ('https://cdn.lightning-ashe.com/wp-content/uploads/2017/10/DSC02028.jpg',6); INSERT INTO image(url, item_id) VALUES ('https://img1.daumcdn.net/thumb/R720x0.q80/?scode=mtistory2&fname=http%3A%2F%2Fcfile25.uf.tistory.com%2Fimage%2F99BE484D5C5FEA291891B7',6); -INSERT INTO image(url, item_id) VALUES ('https://lh3.googleusercontent.com/proxy/HP-https://upload.wikimedia.org/wikipedia/commons/1/10/Banchan_2.jpg',7); +INSERT INTO image(url, item_id) VALUES ('https://upload.wikimedia.org/wikipedia/commons/1/10/Banchan_2.jpg',7); INSERT INTO image(url, item_id) VALUES ('http://mydinner.co.kr/web/product/big/201809/f66fcfa2cc6c85f6ae486a29f5979b9b.jpg',7); INSERT INTO image(url, item_id) VALUES ('http://mydinner.co.kr/web/product/big/201809/24b0a19ca5b137d4d046701829a7d9c8.jpg',7); INSERT INTO image(url, item_id) VALUES ('https://recipe1.ezmember.co.kr/cache/recipe/2017/07/10/24502c34ab4f7fe1af89e7a0225a52dc1.jpg',7); From ad07c854b8c009f8ee8a6502469a1ae6edab3d67 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 27 Apr 2021 20:48:08 +0900 Subject: [PATCH 27/38] =?UTF-8?q?feat=20:=20=EC=A3=BC=EB=AC=B8=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=EC=9D=84=20=EC=9C=84=ED=95=9C=20OrderDto=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team17/sidedish/dto/OrderDto.java | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java new file mode 100644 index 000000000..aaa473c44 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java @@ -0,0 +1,65 @@ +package codsquad.team17.sidedish.dto; + +import codsquad.team17.sidedish.domain.Item; + +import java.math.BigDecimal; + +public class OrderDto { + private Long itemId; + + private String description; + + private BigDecimal normalPrice; + private BigDecimal salePrice; + private int stock; + + private Long dishCategoryId; + private Long bestCategoryId; + + public OrderDto(Item item) { + this.itemId = item.getItemId(); + this.description = item.getDescription(); + + this.normalPrice = item.getNormalPrice(); + this.salePrice = item.getSalePrice(); + this.stock = item.getStock(); + + this.dishCategoryId = item.getDishCategoryId(); + this.bestCategoryId = item.getBestCategoryId(); + } + + public void orderItem(int orderAmount) { + if(this.stock - orderAmount < 0) { + throw new RuntimeException("재고가 모자랍니다."); + } + this.stock = this.stock - orderAmount; + } + + public Long getItemId() { + return itemId; + } + + public String getDescription() { + return description; + } + + public BigDecimal getNormalPrice() { + return normalPrice; + } + + public BigDecimal getSalePrice() { + return salePrice; + } + + public int getStock() { + return stock; + } + + public Long getDishCategoryId() { + return dishCategoryId; + } + + public Long getBestCategoryId() { + return bestCategoryId; + } +} From 9de9048e44582ae21f8c3dcf3a0b65f74872b1cd Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 27 Apr 2021 20:48:35 +0900 Subject: [PATCH 28/38] =?UTF-8?q?feat=20:=20OrderController=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sidedish/controller/OrderController.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java new file mode 100644 index 000000000..de56b80cf --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java @@ -0,0 +1,24 @@ +package codsquad.team17.sidedish.controller; + +import codsquad.team17.sidedish.service.OrderService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/order") +public class OrderController { + private OrderService orderService; + + public OrderController(OrderService orderService) { + this.orderService = orderService; + } + + @PutMapping("/{itemId}/{itemAmount}") + public ResponseEntity orderItem(@PathVariable Long itemId, @PathVariable int itemAmount) { + return new ResponseEntity(orderService.orderItem(itemId, itemAmount), HttpStatus.OK); + } +} From 15d6ab05a58d352c95d03863ca2f88f3488c4d00 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 27 Apr 2021 20:49:37 +0900 Subject: [PATCH 29/38] =?UTF-8?q?feat=20:=20Item=20entity=EC=97=90=20?= =?UTF-8?q?=EC=9E=AC=EA=B3=A0=20=EB=B0=98=EC=98=81=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/codsquad/team17/sidedish/domain/Item.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java index d8ce15233..d0ce8560f 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java @@ -1,5 +1,6 @@ package codsquad.team17.sidedish.domain; +import codsquad.team17.sidedish.dto.OrderDto; import org.springframework.data.annotation.Id; import java.math.BigDecimal; @@ -72,4 +73,8 @@ public Long getDishCategoryId() { public Long getBestCategoryId() { return bestCategoryId; } + + public void updateStock(OrderDto dto) { + this.stock = dto.getStock(); + } } From 528fe7d30a4a20cfd8c4d58359c91ed17716e4e2 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Tue, 27 Apr 2021 20:56:45 +0900 Subject: [PATCH 30/38] =?UTF-8?q?feat=20:=20=EC=9E=AC=EA=B3=A0=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=EC=9D=84=20=EC=9C=84=ED=95=9C=20OrderService=EB=A5=BC?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team17/sidedish/service/OrderService.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java new file mode 100644 index 000000000..9e06bdb23 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java @@ -0,0 +1,28 @@ +package codsquad.team17.sidedish.service; + +import codsquad.team17.sidedish.domain.Item; +import codsquad.team17.sidedish.dto.OrderDto; +import codsquad.team17.sidedish.repository.ItemRepository; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class OrderService { + private ItemRepository itemRepository; + + public OrderService(ItemRepository itemRepository) { + this.itemRepository = itemRepository; + } + + @Transactional + public OrderDto orderItem(Long itemId, int itemAmount) { + Item item = itemRepository.findById(itemId).orElseThrow(RuntimeException::new); + OrderDto orderDto = new OrderDto(item); + orderDto.orderItem(itemAmount); + item.updateStock(orderDto); + + itemRepository.save(item); + + return orderDto; + } +} From c0b10b558a81e3a7233cd4c4c12a8719e3df3431 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Wed, 28 Apr 2021 15:57:57 +0900 Subject: [PATCH 31/38] =?UTF-8?q?feat=20:=20ItemDetailDto=20deliveryInfo?= =?UTF-8?q?=20=EB=B3=80=EC=88=98=EB=AA=85=EC=9D=84=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/codsquad/team17/sidedish/dto/ItemDetailDto.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java index 588766009..a8f019b4d 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java @@ -41,6 +41,9 @@ public class ItemDetailDto { @JsonProperty("delivery_description") private String deliveryDescription = "(40,000원 이상 구매 시 무료)"; + @JsonProperty("delivery_info") + private String deliveryInfo = "서울 경기 새벽배송 / 전국택배 (제주 및 도서산간 불가) [월 · 화 · 수 · 목 · 금 · 토] 수령 가능한 상품입니다."; + private int stock; @JsonProperty("recommended") @@ -107,6 +110,10 @@ public String getDeliveryDescription() { return deliveryDescription; } + public String getDeliveryInfo() { + return deliveryInfo; + } + public int getStock() { return stock; } From c57bc46697be75c558de9d02d1789a135d025390 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Wed, 28 Apr 2021 15:58:49 +0900 Subject: [PATCH 32/38] =?UTF-8?q?style=20:=20dummy=20data=EB=A5=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 이벤트 특가, 론칭 특가 순서 변경 --- backend/sidedish/src/main/resources/data.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/sidedish/src/main/resources/data.sql b/backend/sidedish/src/main/resources/data.sql index b8b552f45..74995b0de 100644 --- a/backend/sidedish/src/main/resources/data.sql +++ b/backend/sidedish/src/main/resources/data.sql @@ -8,9 +8,9 @@ INSERT INTO best_category(best_category_name) VALUES ('우리아이 영양반찬 INSERT INTO best_category(best_category_name) VALUES ('해당없음'); --dish_category -INSERT INTO dish_category(dish_category_name) VALUES ('든든한 메인요리'); -INSERT INTO dish_category(dish_category_name) VALUES ('뜨끈한 국물요리'); -INSERT INTO dish_category(dish_category_name) VALUES ('정갈한 밑찬반'); +INSERT INTO dish_category(dish_category_name) VALUES ('모두가 좋아하는 든든한 메인요리'); +INSERT INTO dish_category(dish_category_name) VALUES ('정성이 담긴 뜨끈한 국물요리'); +INSERT INTO dish_category(dish_category_name) VALUES ('식탁을 풍성하게 하는 정갈한 밑반찬'); --item table INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) @@ -68,7 +68,7 @@ VALUES ('[국물닷컴] 치즈부대찌개 600 g', '안주용 부대찌개와는 INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) VALUES ('[집밥의완성] 스키야키 1.5 kg (2 ~ 3 인분)', '진한 풍미의 일본식 전골, 스키야키', 19800, 10000, 2, 6, 8, '이벤트특가'); INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) -VALUES ('[새로미부산어묵] 프리미엄 어묵탕세트', '밀가루 0 % 프리미엄 어묵에 어묵스프까지 드려요 !', 18000, 14400, 2, 6, 3, '론칭특가, 이벤트특가'); +VALUES ('[새로미부산어묵] 프리미엄 어묵탕세트', '밀가루 0 % 프리미엄 어묵에 어묵스프까지 드려요 !', 18000, 14400, 2, 6, 3, '이벤트특가, 론칭특가'); INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) VALUES ('[모이세] 육개장 1 팩(600 g)', '제주3대해장국 맛집의 인기메뉴', 5900, 4400, 2, 6, 9, '론칭특가'); INSERT INTO item(title, description, normal_price, sale_price, dish_category_id, best_category_id, stock, badge) From ef89ce5afc0807bad3d22fffe5697b797905afc3 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Wed, 28 Apr 2021 15:59:42 +0900 Subject: [PATCH 33/38] =?UTF-8?q?feat=20:=20=EC=B6=94=EC=B2=9C=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=9D=84=2010=EA=B0=9C=EB=A5=BC=20=EC=9E=84=EC=9D=98?= =?UTF-8?q?=EB=A1=9C=20=EB=B0=98=ED=99=98=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team17/sidedish/repository/ImageRepository.java | 2 +- .../codsquad/team17/sidedish/repository/ItemRepository.java | 3 +++ .../codsquad/team17/sidedish/service/ItemDetailService.java | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java index 8dc0685a0..3fc7da36b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java @@ -14,7 +14,7 @@ public interface ImageRepository extends CrudRepository { @Query("SELECT image_id, url, item_id FROM image WHERE item_id=:itemId LIMIT 1;") Optional findTopImageByItemId(@Param("itemId") Long itemId); - @Query("SELECT url FROM image WHERE item_id=:itemId") + @Query("SELECT url FROM image WHERE item_id=:itemId LIMIT 5") List findUrlByItemId(@Param("itemId") Long itemId); List findAllByItemId(Long item); diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java index 46ac84818..2ce885e16 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -3,6 +3,7 @@ import codsquad.team17.sidedish.domain.Item; import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; import java.util.List; @@ -16,4 +17,6 @@ public interface ItemRepository extends CrudRepository { @Query("SELECT DISTINCT best_category_id FROM item WHERE best_category_id <> 6") List findDistinctByBestCategoryId(); + @Query("SELECT * FROM item WHERE dish_category_id != :dishCategoryId order by rand() LIMIT 10;") + List findRandomItemsByItemId(@Param("dishCategoryId") Long dishCategoryId); } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java index 156abf8b3..7bac8608b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java @@ -25,9 +25,9 @@ public ItemDetailDto getItemDetail(Long itemId) { .orElseThrow(RuntimeException::new); List imageUrls = imageRepository.findUrlByItemId(itemId); - List items = itemRepository.findAll(); - List list = items.stream().map(item1 -> - new RecommendedItemDto(item1, imageRepository.findTopImageByItemId(item1.getItemId()) + List randomItems = itemRepository.findRandomItemsByItemId(item.getDishCategoryId()); + List list = randomItems.stream() + .map(item1 -> new RecommendedItemDto(item1, imageRepository.findTopImageByItemId(item1.getItemId()) .orElseThrow(RuntimeException::new))) .collect(Collectors.toList()); From c37a453cccdf09a790eae250b8943a7f46384ca3 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Wed, 28 Apr 2021 16:55:18 +0900 Subject: [PATCH 34/38] =?UTF-8?q?refactor=20:=20RequestBody=20=ED=98=95?= =?UTF-8?q?=ED=83=9C=EB=A1=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=A5=BC=20?= =?UTF-8?q?=EC=A0=84=EB=8B=AC=EB=B0=9B=EC=95=84=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sidedish/controller/OrderController.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java index de56b80cf..48b642288 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java @@ -3,13 +3,12 @@ import codsquad.team17.sidedish.service.OrderService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; @RestController -@RequestMapping("/order") +@RequestMapping("/dish") public class OrderController { private OrderService orderService; @@ -17,8 +16,8 @@ public OrderController(OrderService orderService) { this.orderService = orderService; } - @PutMapping("/{itemId}/{itemAmount}") - public ResponseEntity orderItem(@PathVariable Long itemId, @PathVariable int itemAmount) { - return new ResponseEntity(orderService.orderItem(itemId, itemAmount), HttpStatus.OK); + @PutMapping("/{itemId}/order") + public ResponseEntity orderItem(@PathVariable Long itemId, @RequestBody HashMap body) { + return new ResponseEntity(orderService.orderItem(itemId, body.get("order_amount")), HttpStatus.OK); } } From 9f364c8b1a8da5d4a869bdb96eea20d41e0e5997 Mon Sep 17 00:00:00 2001 From: malaheaven Date: Wed, 28 Apr 2021 20:16:37 +0900 Subject: [PATCH 35/38] =?UTF-8?q?Feat:=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EC=9D=B4=EC=85=89=EC=85=98=20=ED=95=B8=EB=93=A4=EB=9F=AC?= =?UTF-8?q?=EB=A5=BC=20=EC=9D=B4=EC=9A=A9=ED=95=98=EC=97=AC=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=EB=A5=BC=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - best 카테고리 - dish 카테고리 - 이미지 - 아이템 - 재고부족 --- .../controller/BestCategoryController.java | 13 +++++++++---- .../controller/DishCategoryController.java | 9 +++++++++ .../controller/ItemDetailController.java | 12 ++++++++---- .../sidedish/controller/OrderController.java | 8 ++++++++ .../sidedish/dto/ExceptionResponseDto.java | 14 ++++++++++++++ .../codsquad/team17/sidedish/dto/OrderDto.java | 3 ++- .../BestCategoryNotFoundException.java | 10 ++++++++++ .../DishCategoryNotFoundException.java | 10 ++++++++++ .../exception/GlobalExceptionHandler.java | 18 ++++++++++++++++++ .../exception/ImageNotFoundException.java | 9 +++++++++ .../exception/ItemNotFoundException.java | 9 +++++++++ .../exception/ItemStockEmptyException.java | 10 ++++++++++ .../sidedish/service/BestCategoryService.java | 3 ++- .../sidedish/service/DishCategoryService.java | 3 ++- .../sidedish/service/ItemDetailService.java | 7 +++++-- .../team17/sidedish/service/ItemService.java | 3 ++- .../team17/sidedish/service/OrderService.java | 3 ++- 17 files changed, 129 insertions(+), 15 deletions(-) create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ExceptionResponseDto.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/BestCategoryNotFoundException.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/DishCategoryNotFoundException.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/GlobalExceptionHandler.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ImageNotFoundException.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemNotFoundException.java create mode 100644 backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemStockEmptyException.java diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java index 6d15adbf4..7ae8fcbdf 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java @@ -1,12 +1,12 @@ package codsquad.team17.sidedish.controller; +import codsquad.team17.sidedish.dto.ExceptionResponseDto; +import codsquad.team17.sidedish.exception.BestCategoryNotFoundException; +import codsquad.team17.sidedish.exception.DishCategoryNotFoundException; import codsquad.team17.sidedish.service.BestCategoryService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/dish/best") @@ -26,4 +26,9 @@ public ResponseEntity getBestCategoryList() { public ResponseEntity getBestCategory(@PathVariable Long bestCategoryId) { return new ResponseEntity(bestCategoryService.getBestCategoryDto(bestCategoryId), HttpStatus.OK); } + + @ExceptionHandler(BestCategoryNotFoundException.class) + public ResponseEntity handleBestCategoryNotFoundException(Exception e){ + return new ResponseEntity(new ExceptionResponseDto(e.getMessage()),HttpStatus.NOT_FOUND); + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java index 79e950729..3bfd9c706 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java @@ -1,9 +1,13 @@ package codsquad.team17.sidedish.controller; import codsquad.team17.sidedish.dto.DishCategoryDto; +import codsquad.team17.sidedish.dto.ExceptionResponseDto; +import codsquad.team17.sidedish.exception.DishCategoryNotFoundException; +import codsquad.team17.sidedish.exception.ImageNotFoundException; import codsquad.team17.sidedish.service.DishCategoryService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -32,4 +36,9 @@ public ResponseEntity getSoupDishCategory() { public ResponseEntity getSideDishCategory() { return new ResponseEntity(dishCategoryService.getDishCategoryDto(3L), HttpStatus.OK); } + + @ExceptionHandler(DishCategoryNotFoundException.class) + public ResponseEntity handleDishCategoryNotFoundException(Exception e){ + return new ResponseEntity(new ExceptionResponseDto(e.getMessage()),HttpStatus.NOT_FOUND); + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java index 8c1506ff9..13436f126 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java @@ -1,12 +1,11 @@ package codsquad.team17.sidedish.controller; +import codsquad.team17.sidedish.dto.ExceptionResponseDto; +import codsquad.team17.sidedish.exception.ImageNotFoundException; import codsquad.team17.sidedish.service.ItemDetailService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("dish/detail") @@ -21,4 +20,9 @@ public ItemDetailController(ItemDetailService itemDetailService) { public ResponseEntity getItemsDetail(@PathVariable Long itemId) { return new ResponseEntity(itemDetailService.getItemDetail(itemId), HttpStatus.OK); } + + @ExceptionHandler(ImageNotFoundException.class) + public ResponseEntity handleImageNotFoundException(Exception e){ + return new ResponseEntity(new ExceptionResponseDto(e.getMessage()),HttpStatus.NOT_FOUND); + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java index 48b642288..5883daa31 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java @@ -1,5 +1,8 @@ package codsquad.team17.sidedish.controller; +import codsquad.team17.sidedish.dto.ExceptionResponseDto; +import codsquad.team17.sidedish.exception.ImageNotFoundException; +import codsquad.team17.sidedish.exception.ItemStockEmptyException; import codsquad.team17.sidedish.service.OrderService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -20,4 +23,9 @@ public OrderController(OrderService orderService) { public ResponseEntity orderItem(@PathVariable Long itemId, @RequestBody HashMap body) { return new ResponseEntity(orderService.orderItem(itemId, body.get("order_amount")), HttpStatus.OK); } + + @ExceptionHandler(ItemStockEmptyException.class) + public ResponseEntity handleItemStockEmptyException(Exception e){ + return new ResponseEntity(new ExceptionResponseDto(e.getMessage()),HttpStatus.BAD_REQUEST); + } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ExceptionResponseDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ExceptionResponseDto.java new file mode 100644 index 000000000..4fb353529 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ExceptionResponseDto.java @@ -0,0 +1,14 @@ +package codsquad.team17.sidedish.dto; + +public class ExceptionResponseDto { + + private String message; + + public ExceptionResponseDto(String message) { + this.message = message; + } + + public String getMessage() { + return message; + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java index aaa473c44..e86c3a916 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java @@ -1,6 +1,7 @@ package codsquad.team17.sidedish.dto; import codsquad.team17.sidedish.domain.Item; +import codsquad.team17.sidedish.exception.ItemStockEmptyException; import java.math.BigDecimal; @@ -30,7 +31,7 @@ public OrderDto(Item item) { public void orderItem(int orderAmount) { if(this.stock - orderAmount < 0) { - throw new RuntimeException("재고가 모자랍니다."); + throw new ItemStockEmptyException(); } this.stock = this.stock - orderAmount; } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/BestCategoryNotFoundException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/BestCategoryNotFoundException.java new file mode 100644 index 000000000..ba7f0937b --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/BestCategoryNotFoundException.java @@ -0,0 +1,10 @@ +package codsquad.team17.sidedish.exception; + +public class BestCategoryNotFoundException extends RuntimeException{ + + private static final String BEST_CATEGORY_NOT_FOUND_MESSAGE = "해당하는 BEST CATEGORY가 존재하지 않습니다"; + + public BestCategoryNotFoundException() { + super(BEST_CATEGORY_NOT_FOUND_MESSAGE); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/DishCategoryNotFoundException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/DishCategoryNotFoundException.java new file mode 100644 index 000000000..5903b0504 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/DishCategoryNotFoundException.java @@ -0,0 +1,10 @@ +package codsquad.team17.sidedish.exception; + +public class DishCategoryNotFoundException extends RuntimeException{ + + private static final String DISH_CATEGORY_NOT_FOUND_MESSAGE = "해당하는 DISH CATEGORY가 존재하지 않습니다"; + + public DishCategoryNotFoundException() { + super(DISH_CATEGORY_NOT_FOUND_MESSAGE); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/GlobalExceptionHandler.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/GlobalExceptionHandler.java new file mode 100644 index 000000000..586c6b985 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/GlobalExceptionHandler.java @@ -0,0 +1,18 @@ +package codsquad.team17.sidedish.exception; + + +import codsquad.team17.sidedish.dto.ExceptionResponseDto; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(ItemNotFoundException.class) + public ResponseEntity handleItemNotFoundException(Exception e){ + return new ResponseEntity(new ExceptionResponseDto(e.getMessage()), HttpStatus.NOT_FOUND); + } + +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ImageNotFoundException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ImageNotFoundException.java new file mode 100644 index 000000000..83f7e8fa4 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ImageNotFoundException.java @@ -0,0 +1,9 @@ +package codsquad.team17.sidedish.exception; + +public class ImageNotFoundException extends RuntimeException{ + private static final String IMAGE_NOT_FOUND_MESSAGE ="해당하는 이미지가 존재하지 않습니다"; + + public ImageNotFoundException() { + super(IMAGE_NOT_FOUND_MESSAGE); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemNotFoundException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemNotFoundException.java new file mode 100644 index 000000000..d5348ba02 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemNotFoundException.java @@ -0,0 +1,9 @@ +package codsquad.team17.sidedish.exception; + +public class ItemNotFoundException extends RuntimeException{ + private static final String ITEM_NOT_FOUND_MESSAGE = "요청하는 아이템이 존재하지 않습니다."; + + public ItemNotFoundException() { + super(ITEM_NOT_FOUND_MESSAGE); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemStockEmptyException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemStockEmptyException.java new file mode 100644 index 000000000..9a12b5966 --- /dev/null +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemStockEmptyException.java @@ -0,0 +1,10 @@ +package codsquad.team17.sidedish.exception; + +public class ItemStockEmptyException extends RuntimeException{ + + private static final String ITEM_STOCK_EMPTY_MESSAGE ="재고를 초과하는 주문을 요청하셨습니다"; + + public ItemStockEmptyException() { + super(ITEM_STOCK_EMPTY_MESSAGE); + } +} diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java index f1274e49c..58dab9dc1 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java @@ -4,6 +4,7 @@ import codsquad.team17.sidedish.domain.Item; import codsquad.team17.sidedish.dto.BestCategoryDto; import codsquad.team17.sidedish.dto.ItemDto; +import codsquad.team17.sidedish.exception.BestCategoryNotFoundException; import codsquad.team17.sidedish.repository.BestCategoryRepository; import org.springframework.stereotype.Service; @@ -38,6 +39,6 @@ public BestCategoryDto getBestCategoryDto(Long bestCategoryId) { public BestCategory findBestCategoryId(Long bestCategoryId) { return bestCategoryRepository.findById(bestCategoryId) - .orElseThrow(RuntimeException::new); + .orElseThrow(BestCategoryNotFoundException::new); } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java index c105833ab..27dd79983 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java @@ -4,6 +4,7 @@ import codsquad.team17.sidedish.domain.Item; import codsquad.team17.sidedish.dto.DishCategoryDto; import codsquad.team17.sidedish.dto.ItemDto; +import codsquad.team17.sidedish.exception.DishCategoryNotFoundException; import codsquad.team17.sidedish.repository.DishCategoryRepository; import org.springframework.stereotype.Service; @@ -21,7 +22,7 @@ public DishCategoryService(DishCategoryRepository dishCategoryRepository, ItemSe } public DishCategory findDishCategoryId(Long dishCategoryId) { - return dishCategoryRepository.findById(dishCategoryId).orElseThrow(RuntimeException::new); + return dishCategoryRepository.findById(dishCategoryId).orElseThrow(DishCategoryNotFoundException::new); } public DishCategoryDto getDishCategoryDto(Long dishCategoryId) { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java index 7bac8608b..f64dd68f7 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java @@ -3,6 +3,8 @@ import codsquad.team17.sidedish.domain.Item; import codsquad.team17.sidedish.dto.ItemDetailDto; import codsquad.team17.sidedish.dto.RecommendedItemDto; +import codsquad.team17.sidedish.exception.ImageNotFoundException; +import codsquad.team17.sidedish.exception.ItemNotFoundException; import codsquad.team17.sidedish.repository.ImageRepository; import codsquad.team17.sidedish.repository.ItemRepository; import org.springframework.stereotype.Service; @@ -22,15 +24,16 @@ public ItemDetailService(ItemRepository itemRepository, ImageRepository imageRep public ItemDetailDto getItemDetail(Long itemId) { Item item = itemRepository.findById(itemId) - .orElseThrow(RuntimeException::new); + .orElseThrow(ItemNotFoundException::new); List imageUrls = imageRepository.findUrlByItemId(itemId); List randomItems = itemRepository.findRandomItemsByItemId(item.getDishCategoryId()); List list = randomItems.stream() .map(item1 -> new RecommendedItemDto(item1, imageRepository.findTopImageByItemId(item1.getItemId()) - .orElseThrow(RuntimeException::new))) + .orElseThrow(ImageNotFoundException::new))) .collect(Collectors.toList()); return new ItemDetailDto(item, imageUrls, list); } + } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java index f2fc79b47..81537d7fa 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java @@ -2,6 +2,7 @@ import codsquad.team17.sidedish.domain.Item; import codsquad.team17.sidedish.dto.ItemDto; +import codsquad.team17.sidedish.exception.ItemNotFoundException; import codsquad.team17.sidedish.repository.ImageRepository; import codsquad.team17.sidedish.repository.ItemRepository; import org.springframework.stereotype.Service; @@ -35,7 +36,7 @@ public List getItemDtoList(List items) { return items.stream() .map(item -> new ItemDto(item, imageRepository .findTopImageByItemId(item.getItemId()) - .orElseThrow(RuntimeException::new))) + .orElseThrow(ItemNotFoundException::new))) .collect(Collectors.toList()); } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java index 9e06bdb23..392a15506 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java @@ -2,6 +2,7 @@ import codsquad.team17.sidedish.domain.Item; import codsquad.team17.sidedish.dto.OrderDto; +import codsquad.team17.sidedish.exception.ItemNotFoundException; import codsquad.team17.sidedish.repository.ItemRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,7 +17,7 @@ public OrderService(ItemRepository itemRepository) { @Transactional public OrderDto orderItem(Long itemId, int itemAmount) { - Item item = itemRepository.findById(itemId).orElseThrow(RuntimeException::new); + Item item = itemRepository.findById(itemId).orElseThrow(ItemNotFoundException::new); OrderDto orderDto = new OrderDto(item); orderDto.orderItem(itemAmount); item.updateStock(orderDto); From 90658f1f7d2223b2b1671cbf4f51cb8b68f29719 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Thu, 29 Apr 2021 10:13:48 +0900 Subject: [PATCH 36/38] =?UTF-8?q?feat=20:=20CORS=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=97=90=20PUT=20METHOD=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=98?= =?UTF-8?q?=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/codsquad/team17/sidedish/config/WebConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/config/WebConfig.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/config/WebConfig.java index c53dcf452..f171d94c0 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/config/WebConfig.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/config/WebConfig.java @@ -10,6 +10,6 @@ public class WebConfig implements WebMvcConfigurer { public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") .allowedOrigins("*") - .allowedMethods("GET"); + .allowedMethods("GET", "PUT"); } } From ae71da2a962471af591a2784b3d0162d035db9f6 Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Thu, 29 Apr 2021 18:08:01 +0900 Subject: [PATCH 37/38] =?UTF-8?q?chore=20:=20jackson=20databind=20dependen?= =?UTF-8?q?cy=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=98=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/sidedish/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/sidedish/build.gradle b/backend/sidedish/build.gradle index b7bab442e..5f58fc1fa 100644 --- a/backend/sidedish/build.gradle +++ b/backend/sidedish/build.gradle @@ -16,6 +16,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + //jackson-databind + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.10.0' runtimeOnly 'mysql:mysql-connector-java' } From 65facbdd2c250ba311532b7adff9515dffbf914a Mon Sep 17 00:00:00 2001 From: pbg0205 Date: Fri, 30 Apr 2021 14:36:14 +0900 Subject: [PATCH 38/38] =?UTF-8?q?style=20:=20=EC=BD=94=EB=93=9C=EC=97=90?= =?UTF-8?q?=20=EA=B0=9C=ED=96=89=EA=B3=BC=20=EC=A0=95=EB=A0=AC=EC=9D=84=20?= =?UTF-8?q?=EB=A7=9E=EC=B6=B0=EB=9D=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sidedish/controller/BestCategoryController.java | 6 +++--- .../sidedish/controller/DishCategoryController.java | 5 ++--- .../team17/sidedish/controller/ItemDetailController.java | 5 +++-- .../team17/sidedish/controller/OrderController.java | 8 ++++---- .../codsquad/team17/sidedish/domain/BestCategory.java | 1 + .../codsquad/team17/sidedish/domain/DishCategory.java | 1 + .../main/java/codsquad/team17/sidedish/domain/Image.java | 2 ++ .../main/java/codsquad/team17/sidedish/domain/Item.java | 4 ++++ .../codsquad/team17/sidedish/dto/BestCategoryDto.java | 1 + .../codsquad/team17/sidedish/dto/DishCategoryDto.java | 1 + .../java/codsquad/team17/sidedish/dto/ItemDetailDto.java | 5 +++-- .../main/java/codsquad/team17/sidedish/dto/ItemDto.java | 5 ++++- .../main/java/codsquad/team17/sidedish/dto/OrderDto.java | 4 ++++ .../codsquad/team17/sidedish/dto/RecommendedItemDto.java | 3 ++- .../sidedish/exception/BestCategoryNotFoundException.java | 2 +- .../sidedish/exception/DishCategoryNotFoundException.java | 2 +- .../team17/sidedish/exception/GlobalExceptionHandler.java | 2 +- .../team17/sidedish/exception/ImageNotFoundException.java | 5 +++-- .../team17/sidedish/exception/ItemNotFoundException.java | 3 ++- .../sidedish/exception/ItemStockEmptyException.java | 4 ++-- .../team17/sidedish/repository/ImageRepository.java | 1 - .../team17/sidedish/repository/ItemRepository.java | 1 + .../team17/sidedish/service/BestCategoryService.java | 2 +- .../team17/sidedish/service/DishCategoryService.java | 2 +- .../team17/sidedish/service/ItemDetailService.java | 1 + .../codsquad/team17/sidedish/service/ItemService.java | 1 + .../codsquad/team17/sidedish/service/OrderService.java | 3 ++- 27 files changed, 52 insertions(+), 28 deletions(-) diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java index 7ae8fcbdf..511e71d5c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/BestCategoryController.java @@ -2,7 +2,6 @@ import codsquad.team17.sidedish.dto.ExceptionResponseDto; import codsquad.team17.sidedish.exception.BestCategoryNotFoundException; -import codsquad.team17.sidedish.exception.DishCategoryNotFoundException; import codsquad.team17.sidedish.service.BestCategoryService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -11,6 +10,7 @@ @RestController @RequestMapping("/dish/best") public class BestCategoryController { + private final BestCategoryService bestCategoryService; public BestCategoryController(BestCategoryService bestCategoryService) { @@ -28,7 +28,7 @@ public ResponseEntity getBestCategory(@PathVariable Long bestCategoryId) { } @ExceptionHandler(BestCategoryNotFoundException.class) - public ResponseEntity handleBestCategoryNotFoundException(Exception e){ - return new ResponseEntity(new ExceptionResponseDto(e.getMessage()),HttpStatus.NOT_FOUND); + public ResponseEntity handleBestCategoryNotFoundException(Exception e) { + return new ResponseEntity(new ExceptionResponseDto(e.getMessage()), HttpStatus.NOT_FOUND); } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java index 3bfd9c706..91048406b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/DishCategoryController.java @@ -3,7 +3,6 @@ import codsquad.team17.sidedish.dto.DishCategoryDto; import codsquad.team17.sidedish.dto.ExceptionResponseDto; import codsquad.team17.sidedish.exception.DishCategoryNotFoundException; -import codsquad.team17.sidedish.exception.ImageNotFoundException; import codsquad.team17.sidedish.service.DishCategoryService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -38,7 +37,7 @@ public ResponseEntity getSideDishCategory() { } @ExceptionHandler(DishCategoryNotFoundException.class) - public ResponseEntity handleDishCategoryNotFoundException(Exception e){ - return new ResponseEntity(new ExceptionResponseDto(e.getMessage()),HttpStatus.NOT_FOUND); + public ResponseEntity handleDishCategoryNotFoundException(Exception e) { + return new ResponseEntity(new ExceptionResponseDto(e.getMessage()), HttpStatus.NOT_FOUND); } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java index 13436f126..630700ed3 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/ItemDetailController.java @@ -10,6 +10,7 @@ @RestController @RequestMapping("dish/detail") public class ItemDetailController { + private final ItemDetailService itemDetailService; public ItemDetailController(ItemDetailService itemDetailService) { @@ -22,7 +23,7 @@ public ResponseEntity getItemsDetail(@PathVariable Long itemId) { } @ExceptionHandler(ImageNotFoundException.class) - public ResponseEntity handleImageNotFoundException(Exception e){ - return new ResponseEntity(new ExceptionResponseDto(e.getMessage()),HttpStatus.NOT_FOUND); + public ResponseEntity handleImageNotFoundException(Exception e) { + return new ResponseEntity(new ExceptionResponseDto(e.getMessage()), HttpStatus.NOT_FOUND); } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java index 5883daa31..9804d65da 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/controller/OrderController.java @@ -1,7 +1,6 @@ package codsquad.team17.sidedish.controller; import codsquad.team17.sidedish.dto.ExceptionResponseDto; -import codsquad.team17.sidedish.exception.ImageNotFoundException; import codsquad.team17.sidedish.exception.ItemStockEmptyException; import codsquad.team17.sidedish.service.OrderService; import org.springframework.http.HttpStatus; @@ -13,7 +12,8 @@ @RestController @RequestMapping("/dish") public class OrderController { - private OrderService orderService; + + private final OrderService orderService; public OrderController(OrderService orderService) { this.orderService = orderService; @@ -25,7 +25,7 @@ public ResponseEntity orderItem(@PathVariable Long itemId, @RequestBody HashMap< } @ExceptionHandler(ItemStockEmptyException.class) - public ResponseEntity handleItemStockEmptyException(Exception e){ - return new ResponseEntity(new ExceptionResponseDto(e.getMessage()),HttpStatus.BAD_REQUEST); + public ResponseEntity handleItemStockEmptyException(Exception e) { + return new ResponseEntity(new ExceptionResponseDto(e.getMessage()), HttpStatus.BAD_REQUEST); } } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java index 7f4ea586b..d3481c14c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/BestCategory.java @@ -6,6 +6,7 @@ public class BestCategory { @Id private Long bestCategoryId; + private String bestCategoryName; public BestCategory() { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java index 4685e67c9..e843eb61d 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/DishCategory.java @@ -6,6 +6,7 @@ public class DishCategory { @Id private Long dishCategoryId; + private String dishCategoryName; public DishCategory() { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java index beef60909..982fb279c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Image.java @@ -6,7 +6,9 @@ public class Image { @Id private Long imageId; + private String url; + private Long itemId; public Image() { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java index d0ce8560f..e9ef9ec74 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/domain/Item.java @@ -9,6 +9,7 @@ public class Item { @Id private Long itemId; + private String title; private String description; @@ -16,10 +17,13 @@ public class Item { private String badge; private BigDecimal normalPrice; + private BigDecimal salePrice; + private int stock; private Long dishCategoryId; + private Long bestCategoryId; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java index e4d7adc95..e299d2abb 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/BestCategoryDto.java @@ -8,6 +8,7 @@ @JsonPropertyOrder({"best_category_id", "best_category_name", "items"}) public class BestCategoryDto { + @JsonProperty("best_category_id") private final Long bestCategoryId; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java index 8e57e7368..86afeecdf 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/DishCategoryDto.java @@ -8,6 +8,7 @@ @JsonPropertyOrder({"dish_category_id", "dish_category_name", "items"}) public class DishCategoryDto { + @JsonProperty("dish_category_id") private final Long dishCategoryId; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java index a8f019b4d..b27c02c5d 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDetailDto.java @@ -8,14 +8,15 @@ import java.util.Arrays; import java.util.List; -@JsonPropertyOrder({"item_id", "title", "description", "n_price", "s_price", "badge", "main_image", "thumb_images", "point", "delivery_info" -, "delivery_fee", "delivery_description", "stock", "recommended"}) +@JsonPropertyOrder({"item_id", "title", "description", "n_price", "s_price", "badge", "main_image", "thumb_images", + "point", "delivery_info", "delivery_fee", "delivery_description", "stock", "recommended"}) public class ItemDetailDto { @JsonProperty("item_id") private Long itemId; private String title; + private String description; @JsonProperty("n_price") diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java index 370fee6a2..914dd070b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/ItemDto.java @@ -12,11 +12,14 @@ @JsonPropertyOrder({"item_id", "title", "description", "n_price", "s_price", "badge", "image", "delivery_type", "detail_url"}) public class ItemDto { + private static final String URL = "http://ec2-15-164-123-251.ap-northeast-2.compute.amazonaws.com:8080"; @JsonProperty("item_id") private final Long itemId; + private final String title; + private final String description; @JsonProperty("n_price") @@ -26,7 +29,7 @@ public class ItemDto { private final int salePrice; @JsonProperty("delivery_type") - private List deliveryType = Arrays.asList(new String[] {"새벽배송", "전국택배"}); + private List deliveryType = Arrays.asList(new String[]{"새벽배송", "전국택배"}); @JsonProperty("badge") private List badges; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java index e86c3a916..d91e792e8 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/OrderDto.java @@ -6,15 +6,19 @@ import java.math.BigDecimal; public class OrderDto { + private Long itemId; private String description; private BigDecimal normalPrice; + private BigDecimal salePrice; + private int stock; private Long dishCategoryId; + private Long bestCategoryId; public OrderDto(Item item) { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java index e6db08e78..41745da45 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/dto/RecommendedItemDto.java @@ -6,8 +6,9 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; -@JsonPropertyOrder({"item_id", "title", "image", "price","detail_url"}) +@JsonPropertyOrder({"item_id", "title", "image", "price", "detail_url"}) public class RecommendedItemDto { + private static final String URL = "http://ec2-15-164-123-251.ap-northeast-2.compute.amazonaws.com:8080"; @JsonProperty("item_id") diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/BestCategoryNotFoundException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/BestCategoryNotFoundException.java index ba7f0937b..bb8354d76 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/BestCategoryNotFoundException.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/BestCategoryNotFoundException.java @@ -1,6 +1,6 @@ package codsquad.team17.sidedish.exception; -public class BestCategoryNotFoundException extends RuntimeException{ +public class BestCategoryNotFoundException extends RuntimeException { private static final String BEST_CATEGORY_NOT_FOUND_MESSAGE = "해당하는 BEST CATEGORY가 존재하지 않습니다"; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/DishCategoryNotFoundException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/DishCategoryNotFoundException.java index 5903b0504..16e188df7 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/DishCategoryNotFoundException.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/DishCategoryNotFoundException.java @@ -1,6 +1,6 @@ package codsquad.team17.sidedish.exception; -public class DishCategoryNotFoundException extends RuntimeException{ +public class DishCategoryNotFoundException extends RuntimeException { private static final String DISH_CATEGORY_NOT_FOUND_MESSAGE = "해당하는 DISH CATEGORY가 존재하지 않습니다"; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/GlobalExceptionHandler.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/GlobalExceptionHandler.java index 586c6b985..4bd3d3c93 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/GlobalExceptionHandler.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/GlobalExceptionHandler.java @@ -11,7 +11,7 @@ public class GlobalExceptionHandler { @ExceptionHandler(ItemNotFoundException.class) - public ResponseEntity handleItemNotFoundException(Exception e){ + public ResponseEntity handleItemNotFoundException(Exception e) { return new ResponseEntity(new ExceptionResponseDto(e.getMessage()), HttpStatus.NOT_FOUND); } diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ImageNotFoundException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ImageNotFoundException.java index 83f7e8fa4..74ab12209 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ImageNotFoundException.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ImageNotFoundException.java @@ -1,7 +1,8 @@ package codsquad.team17.sidedish.exception; -public class ImageNotFoundException extends RuntimeException{ - private static final String IMAGE_NOT_FOUND_MESSAGE ="해당하는 이미지가 존재하지 않습니다"; +public class ImageNotFoundException extends RuntimeException { + + private static final String IMAGE_NOT_FOUND_MESSAGE = "해당하는 이미지가 존재하지 않습니다"; public ImageNotFoundException() { super(IMAGE_NOT_FOUND_MESSAGE); diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemNotFoundException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemNotFoundException.java index d5348ba02..66756565b 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemNotFoundException.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemNotFoundException.java @@ -1,6 +1,7 @@ package codsquad.team17.sidedish.exception; -public class ItemNotFoundException extends RuntimeException{ +public class ItemNotFoundException extends RuntimeException { + private static final String ITEM_NOT_FOUND_MESSAGE = "요청하는 아이템이 존재하지 않습니다."; public ItemNotFoundException() { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemStockEmptyException.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemStockEmptyException.java index 9a12b5966..9f29a3502 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemStockEmptyException.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/exception/ItemStockEmptyException.java @@ -1,8 +1,8 @@ package codsquad.team17.sidedish.exception; -public class ItemStockEmptyException extends RuntimeException{ +public class ItemStockEmptyException extends RuntimeException { - private static final String ITEM_STOCK_EMPTY_MESSAGE ="재고를 초과하는 주문을 요청하셨습니다"; + private static final String ITEM_STOCK_EMPTY_MESSAGE = "재고를 초과하는 주문을 요청하셨습니다"; public ItemStockEmptyException() { super(ITEM_STOCK_EMPTY_MESSAGE); diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java index 3fc7da36b..b55b0c391 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ImageRepository.java @@ -1,7 +1,6 @@ package codsquad.team17.sidedish.repository; import codsquad.team17.sidedish.domain.Image; -import codsquad.team17.sidedish.domain.Item; import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java index 2ce885e16..1f9d42355 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/repository/ItemRepository.java @@ -8,6 +8,7 @@ import java.util.List; public interface ItemRepository extends CrudRepository { + List findAll(); List findAllByBestCategoryId(Long bestCategoryId); diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java index 58dab9dc1..584441242 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/BestCategoryService.java @@ -13,8 +13,8 @@ @Service public class BestCategoryService { - private final BestCategoryRepository bestCategoryRepository; + private final BestCategoryRepository bestCategoryRepository; private final ItemService itemService; public BestCategoryService(BestCategoryRepository bestCategoryRepository, diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java index 27dd79983..e5e42310c 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/DishCategoryService.java @@ -12,8 +12,8 @@ @Service public class DishCategoryService { - private final DishCategoryRepository dishCategoryRepository; + private final DishCategoryRepository dishCategoryRepository; private final ItemService itemService; public DishCategoryService(DishCategoryRepository dishCategoryRepository, ItemService itemService) { diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java index f64dd68f7..ae92d7dd2 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemDetailService.java @@ -14,6 +14,7 @@ @Service public class ItemDetailService { + private final ItemRepository itemRepository; private final ImageRepository imageRepository; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java index 81537d7fa..ba0c3c91a 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/ItemService.java @@ -12,6 +12,7 @@ @Service public class ItemService { + private final ItemRepository itemRepository; private final ImageRepository imageRepository; diff --git a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java index 392a15506..f6ff6624e 100644 --- a/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java +++ b/backend/sidedish/src/main/java/codsquad/team17/sidedish/service/OrderService.java @@ -9,7 +9,8 @@ @Service public class OrderService { - private ItemRepository itemRepository; + + private final ItemRepository itemRepository; public OrderService(ItemRepository itemRepository) { this.itemRepository = itemRepository;