Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[BE][Team17] Cooper,Robin 2차 PR 보냅니다 #61

Open
wants to merge 60 commits into
base: team17-final
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
3642f9b
Chore : 백엔드 프로젝트 파일을 생성하라.
pbg0205 Apr 20, 2021
0b2600b
Feat: 스프링 데이터 jdbc으로 셋팅하라
malaheaven Apr 21, 2021
7fc73cc
Merge pull request #10 from swing-park/feature-setup-jdbc
pbg0205 Apr 21, 2021
41d119b
Feat: domain을 생성해라
malaheaven Apr 21, 2021
d9290c6
Merge pull request #11 from swing-park/feature-create-domain
pbg0205 Apr 21, 2021
5849e54
Feat: repository를 생성해라
malaheaven Apr 21, 2021
64d0596
Merge pull request #12 from swing-park/feature-create-repository
pbg0205 Apr 21, 2021
16d4c02
Fix : DB 스키마 변경하라
malaheaven Apr 22, 2021
fe0e43c
Merge pull request #17 from swing-park/fix-db-schema
pbg0205 Apr 22, 2021
b970e66
Feat: controller를 만들어라
malaheaven Apr 22, 2021
8c2ca83
Merge pull request #18 from swing-park/feature-create-controller
pbg0205 Apr 22, 2021
5f05a54
style : 변수명 오탈자를 수정하라.
pbg0205 Apr 22, 2021
a34d29c
feat : finAll 메서드를 추가하라.
pbg0205 Apr 22, 2021
21ef877
feat : domain과 dto에 getter를 추가해라.
pbg0205 Apr 22, 2021
5d7243b
feat : 베스트목록들을 반환하는 메서드를 작성하라.
pbg0205 Apr 22, 2021
e842d9a
feat : 베스트 카테고리 목록을 조회하라.
pbg0205 Apr 23, 2021
f75f0b9
feat : service layer를 추가하라.
pbg0205 Apr 23, 2021
92a2627
Merge pull request #21 from swing-park/feature-create-get-method
malaheaven Apr 23, 2021
4f09ac7
style : ItemDto item 변수명을 변경하라.
pbg0205 Apr 23, 2021
5dcf127
Merge pull request #22 from swing-park/feature-create-get-method
malaheaven Apr 23, 2021
7b874c4
Feat: DishCategory 조회 기능을 구현해라
malaheaven Apr 23, 2021
8cf8d8c
Merge pull request #24 from swing-park/feature-create-dishcategory
pbg0205 Apr 23, 2021
991103c
refactor : 불필요한 의존성을 제거하라.
pbg0205 Apr 25, 2021
4d1f50a
feat : BestCategory의 불필요한 의존성을 제거하라.
pbg0205 Apr 25, 2021
84c3609
refactor : imageRepository 의존성을주입하자.
pbg0205 Apr 25, 2021
7ebac27
refactor : dto의 nPrice, sPrice 변수명을 변경하라.
pbg0205 Apr 25, 2021
23d2ecf
refactor : itemDto 변수명에 final을 선언하라.
pbg0205 Apr 25, 2021
bab8d75
feat : 상세정보를 조회하는 기능을 구현하라.
pbg0205 Apr 26, 2021
e7d652d
Merge pull request #29 from swing-park/feature-create-detail
malaheaven Apr 26, 2021
72346c5
refactor : API관련 내용을 수정하라.
pbg0205 Apr 27, 2021
b0daa2e
Merge pull request #36 from swing-park/refactor-response-json-api
malaheaven Apr 27, 2021
5bed534
feat : CORS 기능을 구현하라.
pbg0205 Apr 27, 2021
8a1afdc
Merge pull request #37 from swing-park/feature-setup-cors
malaheaven Apr 27, 2021
8591818
style : URL 추가 / 제거
pbg0205 Apr 27, 2021
b4badb8
Merge pull request #39 from swing-park/style-url-path
malaheaven Apr 27, 2021
004c536
fix : 오탈자 수정 및 URL 추가 수정
pbg0205 Apr 27, 2021
6edbbcf
Merge pull request #41 from swing-park/style-url-path
malaheaven Apr 27, 2021
1c51b98
style : 중복된 URL을 제거하라.
pbg0205 Apr 27, 2021
ac31a2f
Merge pull request #43 from swing-park/style-url-path
pbg0205 Apr 27, 2021
621d6c4
Fix: dish url
malaheaven Apr 27, 2021
ab9efe8
Merge pull request #45 from swing-park/fix-dish-url
malaheaven Apr 27, 2021
ad07c85
feat : 주문 기능을 위한 OrderDto 생성
pbg0205 Apr 27, 2021
9de9048
feat : OrderController 생성
pbg0205 Apr 27, 2021
15d6ab0
feat : Item entity에 재고 반영 기능 추가
pbg0205 Apr 27, 2021
528fe7d
feat : 재고 반영을 위한 OrderService를 생성하라.
pbg0205 Apr 27, 2021
955b7c7
Merge pull request #50 from swing-park/feature-order-test
malaheaven Apr 28, 2021
c0b10b5
feat : ItemDetailDto deliveryInfo 변수명을 추가하라.
pbg0205 Apr 28, 2021
c57bc46
style : dummy data를 수정하라.
pbg0205 Apr 28, 2021
ef89ce5
feat : 추천 목록을 10개를 임의로 반환하라.
pbg0205 Apr 28, 2021
920ec75
Merge pull request #51 from swing-park/refactor-FE-feedback
malaheaven Apr 28, 2021
c37a453
refactor : RequestBody 형태로 데이터를 전달받아라.
pbg0205 Apr 28, 2021
7032c0c
Merge pull request #55 from swing-park/feature-order
malaheaven Apr 28, 2021
9f364c8
Feat: 커스텀 이셉션 핸들러를 이용하여 예외를 처리
malaheaven Apr 28, 2021
b50f10b
Merge pull request #61 from swing-park/feature-exception-handler
pbg0205 Apr 28, 2021
90658f1
feat : CORS 설정에 PUT METHOD를 추가하라.
pbg0205 Apr 29, 2021
362f0fb
Merge pull request #62 from swing-park/feat-cors-put
malaheaven Apr 29, 2021
ae71da2
chore : jackson databind dependency를 추가하라.
pbg0205 Apr 29, 2021
8c3d66e
Merge pull request #66 from swing-park/chore-jackson-core
malaheaven Apr 29, 2021
65facbd
style : 코드에 개행과 정렬을 맞춰라.
pbg0205 Apr 30, 2021
67453c1
Merge pull request #73 from swing-park/style-code
malaheaven Apr 30, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions backend/sidedish/.gitignore
Original file line number Diff line number Diff line change
@@ -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/
26 changes: 26 additions & 0 deletions backend/sidedish/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
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'
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'
}

test {
useJUnitPlatform()
}
Binary file not shown.
5 changes: 5 additions & 0 deletions backend/sidedish/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
185 changes: 185 additions & 0 deletions backend/sidedish/gradlew
Original file line number Diff line number Diff line change
@@ -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" "$@"
89 changes: 89 additions & 0 deletions backend/sidedish/gradlew.bat
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions backend/sidedish/settings.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rootProject.name = 'sidedish'
Original file line number Diff line number Diff line change
@@ -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);
}

}
Original file line number Diff line number Diff line change
@@ -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", "PUT");
}
}
Loading