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

[Team15 - BE] 1주차 PR #33

Merged
merged 79 commits into from
May 1, 2021
Merged
Show file tree
Hide file tree
Changes from 72 commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
beedfb0
[#6] build: Initialize Spring Boot project
jihye-woo Apr 20, 2021
d9de00a
[#6] build: Add datasource properties
jihye-woo Apr 20, 2021
5873875
[#15] Feat : Create schema.sql , data.sql
choitree Apr 21, 2021
5861901
[#16] Feat : Create Domain
choitree Apr 21, 2021
8aabc10
[#18]Feat : Create DishRepository
choitree Apr 21, 2021
a3a0d9c
[#18]Feat : Create DishService
choitree Apr 21, 2021
594a4dc
[#18]Feat : Create DishController
choitree Apr 21, 2021
a25bfcb
[#19]Feat : Create DishService
choitree Apr 21, 2021
7f57d02
[#20]Feat : Create DishController
choitree Apr 21, 2021
1c04275
Merge branch 'BE/feature/16/domain' of https://github.com/jihye-woo/s…
choitree Apr 21, 2021
e9e8524
[#17]Feat : Create DTO
choitree Apr 21, 2021
cc2c9ac
[#17] feature: Set default value at delivery table
jihye-woo Apr 22, 2021
7447544
[#17] refactor: Renaming DishDTO to ItemDTO
jihye-woo Apr 22, 2021
2962327
[#17] refactor: Delete unused class
jihye-woo Apr 22, 2021
d1532bc
[#17] feature: Add custom query at DishRepository
jihye-woo Apr 22, 2021
7b99539
[#17] feature: Add showDishsBySection method
jihye-woo Apr 22, 2021
971b284
[#17] refactor: Renaming Dish to Item
jihye-woo Apr 22, 2021
5715f70
[#17] refactor: Remove unused method
jihye-woo Apr 22, 2021
4518c15
[#18] Create BestRepository
jihye-woo Apr 22, 2021
00b9d92
[#20] feature: Create BestController
jihye-woo Apr 22, 2021
9924cff
[#20] feature: Split ItemController::showDishsBySection
jihye-woo Apr 22, 2021
9d72584
[#16] feature: Create Best
jihye-woo Apr 22, 2021
c5e4829
[#19] feature: Create BestService
jihye-woo Apr 22, 2021
57296bc
[#16] build: Include gradle-wrapper.jar file
jihye-woo Apr 23, 2021
7ff1637
[#16] feature: Delete Event table
jihye-woo Apr 23, 2021
347c7e5
Chore :Change (application.properties) datasource.url
choitree Apr 23, 2021
2266cb7
[#16] feature: Add DishBest table in DB
jihye-woo Apr 24, 2021
37308d7
[#16] feature: Add BestDTO class
jihye-woo Apr 24, 2021
f1f2b63
[#16] feature: Add BestDish class
jihye-woo Apr 24, 2021
fbc5574
[#16] feature: Add features for best API
jihye-woo Apr 24, 2021
dcf0297
Merge remote-tracking branch 'origin/BE/feature/16/domain' into BE/fe…
jihye-woo Apr 24, 2021
0faf3f4
Merge pull request #30 from jihye-woo/BE/feature/16/domain
jihye-woo Apr 24, 2021
c9caeb0
[#32] chore : .gitignore 파일 수정
jihye-woo Apr 26, 2021
cffaa82
[#32] refactor : BestController 공통 url 묶기
jihye-woo Apr 26, 2021
eeffb01
[#32] refactor : Wrapping response to Map<K, V>
jihye-woo Apr 26, 2021
e9ba94f
chore : Add bestdishes data to data.sql
choitree Apr 26, 2021
d78d60a
[#32] refactor : Change n_price as nullable
jihye-woo Apr 26, 2021
366a0e4
[#32] refactor : Remove unused log message
jihye-woo Apr 26, 2021
bd70fd2
[#32] refactor : Change Id type from Integer to Long
jihye-woo Apr 26, 2021
6a62acf
[#32] refactor : Change price type to Integer
jihye-woo Apr 26, 2021
d84dbd8
[#32] refactor : Rename nPrice and sPrice
jihye-woo Apr 26, 2021
6dc6585
[#32] refactor : Remove unused class BestDish
jihye-woo Apr 26, 2021
8e4feca
[#32] refactor : Rename nPrice and sPrice
jihye-woo Apr 26, 2021
25f0f1e
[#32] feature : Add event table
jihye-woo Apr 26, 2021
1f65395
[#32] refactor : Rename Item to Dish
jihye-woo Apr 26, 2021
897133a
[#32]Chore: update query, join to outer join
choitree Apr 27, 2021
9e27eea
[#32]Chore : update query join to outer join
choitree Apr 27, 2021
418c571
[#32]Refactor : delete duplicate method
choitree Apr 27, 2021
8c62e1a
[#32]Refactor : delete duplicate method
choitree Apr 27, 2021
bda8ecd
[#32] Feature : Create BestDishesDTO to wrapping Best list response
choitree Apr 27, 2021
8e9f88e
#32] Refactor : Change response wrapping class from Map to Custom DTO
choitree Apr 27, 2021
5b06d67
#32] Refactor : Change response wrapping class from Map to Custom DTO
choitree Apr 27, 2021
05c87f8
[#32] Chore : Change table name dish_best to best_dishes, and column …
choitree Apr 27, 2021
ee6ea7f
[#32] Chore : Change ItemController class name to DishController
choitree Apr 27, 2021
6dd7f6b
[#32] refactor : Add @JsonProperty annotation
jihye-woo Apr 27, 2021
55e2ec8
[#32] feature : Create SectionDishesDTO for wrapping response
jihye-woo Apr 27, 2021
8e323ae
[#32] refactor : Rename items to dishes at BestDTO
jihye-woo Apr 27, 2021
f921c72
[#32] refactor : Add static factory method at BestDishesDTO
jihye-woo Apr 27, 2021
db295ad
Chore : Add all data in data.sql
choitree Apr 27, 2021
2a5b6a5
chore : Add insert query in data.sql
jihye-woo Apr 28, 2021
d541c3c
Chore : fix all data in data.sql
choitree Apr 28, 2021
0a92460
Chore : change event rows to one row
choitree Apr 28, 2021
026a735
Chore : change query table name and column names
choitree Apr 28, 2021
9766a0b
Chore : Delete unused Class
choitree Apr 28, 2021
d0b329e
[#38]Feature : Make Detail Feature
choitree Apr 28, 2021
2fb7f04
[#38]Feature : Make Detail Feature
choitree Apr 28, 2021
df1410d
build : Resolve deploy error
jihye-woo Apr 28, 2021
4763f8e
build : Remove automate sql initialize mode
jihye-woo Apr 28, 2021
6822d40
build : Change query string to lowercase
jihye-woo Apr 28, 2021
3973f7a
style : add space at comment
choitree Apr 28, 2021
348ed6a
[#41] Change DataDTO data type
choitree Apr 29, 2021
bf257b9
[#41] Change DataDTO data type
choitree Apr 29, 2021
5b9e825
[#41] Change DishDTO class name to DishDAO
choitree Apr 29, 2021
dc19cd2
[#41] Change DishDTO class name to DishDAO
choitree Apr 29, 2021
f88a439
[#41] Add JsonInclude annotation at normalPrice, badge
choitree Apr 29, 2021
354a718
Chore : add UNSIGNED which is Dish table, stock column in schema.sql
choitree Apr 29, 2021
9bbbde2
Feature : Create custom Exception classes
choitree Apr 29, 2021
3240299
Feature : Add stock update method in Dish class
choitree Apr 29, 2021
789d975
Feature : Add stock update logic
choitree Apr 29, 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
176 changes: 176 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@

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

### 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 #
*.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*

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### react ###
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

전체 공통으로 쓰이는 건가요?
react에 관련된 ignore가 들어있네요?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

리액트 관련된 내용 삭제하였습니다~

.DS_*
logs
**/*.backup.*
**/*.back.*

node_modules
bower_components

*.sublime*

psd
thumb
sketch

# End of https://www.toptal.com/developers/gitignore/api/java,react,intellij,macos
199 changes: 199 additions & 0 deletions backend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,199 @@
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/


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

### 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 #
*.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*

### macOS ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# End of https://www.toptal.com/developers/gitignore/api/java,react,intellij,macos
Loading