-
Notifications
You must be signed in to change notification settings - Fork 50
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
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 d9de00a
[#6] build: Add datasource properties
jihye-woo 5873875
[#15] Feat : Create schema.sql , data.sql
choitree 5861901
[#16] Feat : Create Domain
choitree 8aabc10
[#18]Feat : Create DishRepository
choitree a3a0d9c
[#18]Feat : Create DishService
choitree 594a4dc
[#18]Feat : Create DishController
choitree a25bfcb
[#19]Feat : Create DishService
choitree 7f57d02
[#20]Feat : Create DishController
choitree 1c04275
Merge branch 'BE/feature/16/domain' of https://github.com/jihye-woo/s…
choitree e9e8524
[#17]Feat : Create DTO
choitree cc2c9ac
[#17] feature: Set default value at delivery table
jihye-woo 7447544
[#17] refactor: Renaming DishDTO to ItemDTO
jihye-woo 2962327
[#17] refactor: Delete unused class
jihye-woo d1532bc
[#17] feature: Add custom query at DishRepository
jihye-woo 7b99539
[#17] feature: Add showDishsBySection method
jihye-woo 971b284
[#17] refactor: Renaming Dish to Item
jihye-woo 5715f70
[#17] refactor: Remove unused method
jihye-woo 4518c15
[#18] Create BestRepository
jihye-woo 00b9d92
[#20] feature: Create BestController
jihye-woo 9924cff
[#20] feature: Split ItemController::showDishsBySection
jihye-woo 9d72584
[#16] feature: Create Best
jihye-woo c5e4829
[#19] feature: Create BestService
jihye-woo 57296bc
[#16] build: Include gradle-wrapper.jar file
jihye-woo 7ff1637
[#16] feature: Delete Event table
jihye-woo 347c7e5
Chore :Change (application.properties) datasource.url
choitree 2266cb7
[#16] feature: Add DishBest table in DB
jihye-woo 37308d7
[#16] feature: Add BestDTO class
jihye-woo f1f2b63
[#16] feature: Add BestDish class
jihye-woo fbc5574
[#16] feature: Add features for best API
jihye-woo dcf0297
Merge remote-tracking branch 'origin/BE/feature/16/domain' into BE/fe…
jihye-woo 0faf3f4
Merge pull request #30 from jihye-woo/BE/feature/16/domain
jihye-woo c9caeb0
[#32] chore : .gitignore 파일 수정
jihye-woo cffaa82
[#32] refactor : BestController 공통 url 묶기
jihye-woo eeffb01
[#32] refactor : Wrapping response to Map<K, V>
jihye-woo e9ba94f
chore : Add bestdishes data to data.sql
choitree d78d60a
[#32] refactor : Change n_price as nullable
jihye-woo 366a0e4
[#32] refactor : Remove unused log message
jihye-woo bd70fd2
[#32] refactor : Change Id type from Integer to Long
jihye-woo 6a62acf
[#32] refactor : Change price type to Integer
jihye-woo d84dbd8
[#32] refactor : Rename nPrice and sPrice
jihye-woo 6dc6585
[#32] refactor : Remove unused class BestDish
jihye-woo 8e4feca
[#32] refactor : Rename nPrice and sPrice
jihye-woo 25f0f1e
[#32] feature : Add event table
jihye-woo 1f65395
[#32] refactor : Rename Item to Dish
jihye-woo 897133a
[#32]Chore: update query, join to outer join
choitree 9e27eea
[#32]Chore : update query join to outer join
choitree 418c571
[#32]Refactor : delete duplicate method
choitree 8c62e1a
[#32]Refactor : delete duplicate method
choitree bda8ecd
[#32] Feature : Create BestDishesDTO to wrapping Best list response
choitree 8e9f88e
#32] Refactor : Change response wrapping class from Map to Custom DTO
choitree 5b06d67
#32] Refactor : Change response wrapping class from Map to Custom DTO
choitree 05c87f8
[#32] Chore : Change table name dish_best to best_dishes, and column …
choitree ee6ea7f
[#32] Chore : Change ItemController class name to DishController
choitree 6dd7f6b
[#32] refactor : Add @JsonProperty annotation
jihye-woo 55e2ec8
[#32] feature : Create SectionDishesDTO for wrapping response
jihye-woo 8e323ae
[#32] refactor : Rename items to dishes at BestDTO
jihye-woo f921c72
[#32] refactor : Add static factory method at BestDishesDTO
jihye-woo db295ad
Chore : Add all data in data.sql
choitree 2a5b6a5
chore : Add insert query in data.sql
jihye-woo d541c3c
Chore : fix all data in data.sql
choitree 0a92460
Chore : change event rows to one row
choitree 026a735
Chore : change query table name and column names
choitree 9766a0b
Chore : Delete unused Class
choitree d0b329e
[#38]Feature : Make Detail Feature
choitree 2fb7f04
[#38]Feature : Make Detail Feature
choitree df1410d
build : Resolve deploy error
jihye-woo 4763f8e
build : Remove automate sql initialize mode
jihye-woo 6822d40
build : Change query string to lowercase
jihye-woo 3973f7a
style : add space at comment
choitree 348ed6a
[#41] Change DataDTO data type
choitree bf257b9
[#41] Change DataDTO data type
choitree 5b9e825
[#41] Change DishDTO class name to DishDAO
choitree dc19cd2
[#41] Change DishDTO class name to DishDAO
choitree f88a439
[#41] Add JsonInclude annotation at normalPrice, badge
choitree 354a718
Chore : add UNSIGNED which is Dish table, stock column in schema.sql
choitree 9bbbde2
Feature : Create custom Exception classes
choitree 3240299
Feature : Add stock update method in Dish class
choitree 789d975
Feature : Add stock update logic
choitree File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 ### | ||
.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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
전체 공통으로 쓰이는 건가요?
react에 관련된 ignore가 들어있네요?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
리액트 관련된 내용 삭제하였습니다~