Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
24a357b
Docs: Modify ReadMe.md (#none)
dahun-lee-daji Apr 19, 2021
67026cd
feat : git ignore 추가 #3
bibi6666667 Apr 20, 2021
32ce3d3
feat : 프로젝트 생성 #3
bibi6666667 Apr 20, 2021
2df65e0
feat : mysql 연동 #3
95degree Apr 20, 2021
c299e20
chore : 코드 포멧팅 정리 #3
95degree Apr 20, 2021
29f93b7
feat : 데이터 Entity, Controller, Repository 생성 #4
bibi6666667 Apr 21, 2021
b875ef1
feat : 각 엔티티별 Post Api 생성 #4
95degree Apr 22, 2021
eca5d24
feat : schema.sql 생성 #4
95degree Apr 22, 2021
c94157c
feat : 필요없는 클래스 삭제 #4
95degree Apr 22, 2021
34bcef2
feat : db table과 맞게 entity 생성 #4
95degree Apr 22, 2021
c9ce77c
feat : 메인 페이지와 상세 페이지 응답 전용 Dto 생성 #4
95degree Apr 22, 2021
8596643
feat : 메인 페이지와 상세 페이지 응답 전용 Dto 생성 #4
95degree Apr 22, 2021
cec6a6b
feat : set으로 Category와 Dish 1:n 관계 설정 #4
95degree Apr 22, 2021
6a1bf0e
feat : Dto 생성 #4
95degree Apr 23, 2021
cd08799
refactor : point 컬럼 추가 #4
95degree Apr 23, 2021
43767a8
refactor : 패키지 이름 변경 #4
95degree Apr 23, 2021
cd83338
refactor : 변수 타입 String으로 변환 #4
95degree Apr 23, 2021
76c7ae6
refactor : 변수 타입 String으로 변환 #4
95degree Apr 23, 2021
8b3b4e6
refactor : 중복되는 필드 정보 제거 #4
95degree Apr 23, 2021
7093aaf
refactor : Set 구현에서 Map 구현으로 변경 #4
95degree Apr 26, 2021
b28a113
refactor : 현재 정보에 맞는 ddl로 변경 #4
95degree Apr 26, 2021
6774929
feat : CategoryType Enum 생성 #4
95degree Apr 26, 2021
cc18d2e
feat : 카테고리별 조회 API 생성 #4
95degree Apr 26, 2021
35f5b40
feat : Category의 typ을 String에서 enum으로 변경 #4
95degree Apr 26, 2021
61b4896
feat : category 및 dish 조회 메서드 추가 #4
bibi6666667 Apr 26, 2021
b4b6a42
feat : import JsonProperty, JsonRootName
bibi6666667 Apr 26, 2021
34c31a2
delete : 불필요한 파일 제거 #4
bibi6666667 Apr 27, 2021
30b5130
feat : enum 삭제 #4
95degree Apr 27, 2021
a3a155b
feat : toString() 추가 #4
95degree Apr 27, 2021
03b9972
feat : categoryId 필드 삭제 #4
95degree Apr 27, 2021
08bd074
feat : 필요없는 필드 삭제 #4
95degree Apr 27, 2021
e2189b2
feat : addDish() 추가 #4
95degree Apr 27, 2021
54e7e75
feat : getDishByDishId() 생성 #4
95degree Apr 27, 2021
735ec4f
refactor : 메소드 네이밍 및 로직 변경 #4
95degree Apr 27, 2021
69ffe56
feat : 불필요한 메소드 제거#4
95degree Apr 27, 2021
bf1f2c7
refactor : @RequestMapping 변경 #4
95degree Apr 27, 2021
29c4933
refactor : 포멧팅 수정 #4
95degree Apr 27, 2021
b8f4259
refactor : 포멧팅 수정 #4
95degree Apr 27, 2021
754955e
feat : @JsonProperty 추가 #4
95degree Apr 27, 2021
49a10ed
Merge pull request #18 from dahun-lee-daji/BE-step1
95degree Apr 27, 2021
de6f3ea
feat : mysql db 연결 정보 설정 및 schema.sql 수정 #4
bibi6666667 Apr 27, 2021
c11e698
Merge pull request #19 from dahun-lee-daji/BE-step1
95degree Apr 27, 2021
e335fa4
delete : 불필요한 test메서드 삭제 #20
bibi6666667 Apr 27, 2021
140a94d
feat : findCategoryByType() 로직 변경 #4
95degree Apr 28, 2021
af84a78
feat : findDishByTypeAndId 로직 변경 #4
95degree Apr 28, 2021
69905fe
feat : 예외 추가 #4
95degree Apr 28, 2021
423f91b
feat : return 타입 Optional로 변경 #4
95degree Apr 28, 2021
3bdd88e
feat : NotFoundException 추가 #4
95degree Apr 28, 2021
92fdf7b
feat : DB 연결을 위한 application.properties 속성 추가
bibi6666667 Apr 28, 2021
5040f36
delete : 삭제된 항목에 대한 schema.sql 내용 수정
bibi6666667 Apr 28, 2021
d422af8
feat : categoryID 컬럼명 수정
bibi6666667 Apr 28, 2021
e56918c
feat : DB연결을 위한 application.properties 항목 추가
bibi6666667 Apr 28, 2021
ce0f1fd
refactor : idColumn명을 category에서 categroy_id로 변경 #4
95degree Apr 28, 2021
e352273
feat : 주문하기 api 생성 #4
95degree Apr 28, 2021
cc710d3
feat : 주문하기 api에 필요한 ResponseDto 생성
95degree Apr 28, 2021
d3e1018
feat : deliver_info varchar(45->1000) 수정 #4
95degree Apr 28, 2021
3140ebb
feat : OrderDish() 추가
95degree Apr 28, 2021
f2ff540
feat : datasource url 수정 #4
95degree Apr 28, 2021
4d6aba3
Merge branch 'BE-step1' into Dev-BE
bibi6666667 Apr 28, 2021
2f6d589
merge : BE-step1 브랜치를 Dev-BE로 merge (충돌 해결)
bibi6666667 Apr 28, 2021
812fbed
refactor : Controller 분리, Service 분리
bibi6666667 Apr 29, 2021
f8072f6
refactor : ErrorStatus -> Status로 변경
bibi6666667 Apr 29, 2021
63d18d2
feat : dishId로 카테고리 조회를 위해 CategoryRepository 메서드 추가 #30
bibi6666667 Apr 29, 2021
d0ed921
feat : ResponseDto에 Status 추가 #30
bibi6666667 Apr 29, 2021
2d9ac57
feat : findByDishId() 추가 #30
95degree Apr 29, 2021
eb494fd
refactor : 포맷팅 수정 #30
95degree Apr 29, 2021
1269657
feat : 에러 발생시 이유가 message에 담기 도록 변경#30
95degree Apr 29, 2021
5bb34cf
feat : findByDishId() 추가#30
95degree Apr 29, 2021
d224817
refactor : url mapping 변경 #30
95degree Apr 29, 2021
9c6ce5f
refactor : 포맷팅 수정 #30
95degree Apr 29, 2021
07b476d
feat : DB연결을 위한 application.properties 수정 #30
bibi6666667 Apr 29, 2021
ce54f7c
feat : DishResponseDto의 id에 JsonProperty 추가
bibi6666667 Apr 29, 2021
c567d22
feat : 배열 형태로 반환하기 위한 DishesDto 생성 및 사용
bibi6666667 Apr 29, 2021
d464ce1
feat : 불필요한 Dto 삭제 및 카테고리조회 메서드 리턴값 변경
bibi6666667 Apr 29, 2021
5e3ce1b
refactor : 컨트롤러 메소드들의 리턴 값을 ResponseEntity로 변경 #30
95degree Apr 30, 2021
963eb3c
feat: embedded entity Image 생성 #30
95degree Apr 30, 2021
65bff12
refactor: 필요없는 import문 제거 #30
95degree Apr 30, 2021
e188eea
refactor: 포맷팅 수정 #30
95degree 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
184 changes: 184 additions & 0 deletions BE/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@

# Created by https://www.toptal.com/developers/gitignore/api/windows,java,intellij,gradle
# Edit at https://www.toptal.com/developers/gitignore?templates=windows,java,intellij,gradle

### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### Intellij Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/

# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml

# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/

# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$

# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml

### Java ###
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

### Windows ###
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

### Gradle ###
.gradle
build/

# Ignore Gradle GUI config
gradle-app.setting

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

# Cache of project
.gradletasknamecache

# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
# gradle/wrapper/gradle-wrapper.properties

### Gradle Patch ###
**/build/

# End of https://www.toptal.com/developers/gitignore/api/windows,java,intellij,gradle
/.idea/modules/BE.iml
/.idea/.name
/.idea/compiler.xml
/.idea/jarRepositories.xml
/.idea/misc.xml
/.idea/vcs.xml
8 changes: 8 additions & 0 deletions BE/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions BE/HELP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Getting Started

### Reference Documentation
For further reference, please consider the following sections:

* [Official Gradle documentation](https://docs.gradle.org)
* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/2.4.5/gradle-plugin/reference/html/)
* [Create an OCI image](https://docs.spring.io/spring-boot/docs/2.4.5/gradle-plugin/reference/html/#build-image)
* [Spring Web](https://docs.spring.io/spring-boot/docs/2.4.5/reference/htmlsingle/#boot-features-developing-web-applications)
* [Spring Data JDBC](https://docs.spring.io/spring-data/jdbc/docs/current/reference/html/)

### Guides
The following guides illustrate how to use some features concretely:

* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/)
* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/)
* [Building REST services with Spring](https://spring.io/guides/tutorials/bookmarks/)
* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/)
* [Using Spring Data JDBC](https://github.com/spring-projects/spring-data-examples/tree/master/jdbc/basics)

### Additional Links
These additional references should also help you:

* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle)

24 changes: 24 additions & 0 deletions BE/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
plugins {
id 'org.springframework.boot' version '2.4.5'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'java'
}

group = 'com.codesquad'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = '1.8'

repositories {
mavenCentral()
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
implementation 'org.springframework.boot:spring-boot-starter-web'
runtimeOnly 'mysql:mysql-connector-java'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
}

test {
useJUnitPlatform()
}
Binary file added BE/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions BE/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
Loading