Skip to content

Commit 8cf6f4a

Browse files
authored
Merge branch 'dev' into main
2 parents b1a1607 + b48c7ef commit 8cf6f4a

File tree

217 files changed

+7105
-5374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+7105
-5374
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Feature Report
3+
about: μΆ”κ°€ν•  사항듀
4+
title: 'feature: '
5+
labels: feat
6+
assignees: ''
7+
8+
---
9+
10+
# Feature Report
11+
12+
## μΆ”κ°€ ν•  사항듀
13+
14+
## μ²¨λΆ€μžλ£Œ
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Fix Report
3+
about: 고쳐야 ν•  사항듀
4+
title: 'fix: '
5+
labels: fix
6+
assignees: ''
7+
8+
---
9+
10+
# Fix Report
11+
12+
## 고쳐야 ν•  사항
13+
14+
## μ²¨λΆ€μžλ£Œ

β€Ž.github/README.mdβ€Ž

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,28 @@
11
![eatssu_main](https://github.com/user-attachments/assets/ae21de9d-8333-46fb-b0ad-d8578f572fda)
22

33
# EAT-SSU: μˆ­μ‹€λŒ€ 학식 리뷰 μ•±
4+
45
**EAT-SSUλŠ” μˆ­μ‹€λŒ€ν•™κ΅ ν•™μƒλ“€μ˜ 즐겁고 νŽΈλ¦¬ν•œ 학식 μ΄μš©μ„ κΏˆκΎΈλŠ” ν”„λ‘œμ νŠΈμž…λ‹ˆλ‹€.**
6+
57
- `학생식당`, `도담식당`, `ν‘Έλ“œμ½”νŠΈ`, `μŠ€λ‚΅μ½”λ„ˆ`, `κΈ°μˆ™μ‚¬ 식당`의 λͺ¨λ“  메뉴λ₯Ό 비ꡐ할 수 μžˆμ–΄μš”.
68
- 학식에 λŒ€ν•œ 리뷰λ₯Ό 톡해 μˆ­μ‹€λŒ€ ν•™μš°λ“€κ³Ό 정보λ₯Ό κ³΅μœ ν•  수 μžˆμ–΄μš”.
79
- μ‹λ‹Ήμ˜ μš΄μ˜μ‹œκ°„κ³Ό μœ„μΉ˜λ₯Ό 확인할 수 μžˆμ–΄μš”!
810
- [More & Contact](https://hi-jin-1514.notion.site/EAT-SSU-b04aaec9b7814a628c6ef6b3e08c74a3)
911

1012
## λ‹€μš΄λ‘œλ“œ
13+
1114
2023.11.27~ μ„œλΉ„μŠ€ 쀑
15+
1216
- [App Store](https://apps.apple.com/kr/app/eat-ssu-%EC%88%AD%EC%8B%A4%EB%8C%80-%ED%95%99%EC%8B%9D-%EB%A6%AC%EB%B7%B0-%EC%95%B1/id6472618331)
13-
- [Play Store](https://play.google.com/store/apps/details?id=com.eatssu.android)
17+
- [Play Store](https://play.google.com/store/apps/details?id=com.eatssu.android)
18+
19+
## 개발 ν™˜κ²½
20+
21+
### Application ν™˜κ²½
22+
23+
- `application.yml` νŒŒμΌμ€ νŒ€ λ‚΄λΆ€μ—μ„œλ§Œ κ³΅μœ ν•©λ‹ˆλ‹€.
24+
25+
### Java SDK 17
26+
27+
- `build.gradle`을 확인해도 μ•Œκ² μ§€λ§Œ, Java 17을 μ‚¬μš©ν•©λ‹ˆλ‹€.
28+
- VendorλŠ” μ–΄λŠ 것을 μ‚¬μš©ν•΄λ„ λ¬΄λ°©ν•©λ‹ˆλ‹€.

β€Ž.github/workflows/gradle.ymlβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ jobs:
9393
sudo docker pull ${{ secrets.DOCKER_REPO }}/eatssu-prod
9494
sudo docker run -d -p 8080:8080 ${{ secrets.DOCKER_REPO }}/eatssu-prod
9595
sudo docker image prune -f
96-
9796
9897
## deploy to develop
9998
- name: Deploy to dev server

β€Ž.junie/guidelines.mdβ€Ž

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
# EAT-SSU ν”„λ‘œμ νŠΈ κ°€μ΄λ“œλΌμΈ
2+
3+
## ν”„λ‘œμ νŠΈ κ°œμš”
4+
5+
<<<<<<< HEAD
6+
EAT-SSUλŠ” μˆ­μ‹€λŒ€ν•™κ΅ 학생듀이 캠퍼슀 λ‚΄ 식당 메뉴λ₯Ό λ¦¬λ·°ν•˜κ³  비ꡐ할 수 μžˆλŠ” λͺ¨λ°”일 μ• ν”Œλ¦¬μΌ€μ΄μ…˜μž…λ‹ˆλ‹€. 이 앱은 메뉴 리뷰, 운영 μ‹œκ°„, μœ„μΉ˜ λ“± λ‹€μ–‘ν•œ 식사 μ˜΅μ…˜μ— λŒ€ν•œ 쒅합적인 정보λ₯Ό μ œκ³΅ν•˜μ—¬ 식사 κ²½ν—˜μ„ ν–₯μƒμ‹œν‚€λŠ” 것을 λͺ©ν‘œλ‘œ ν•©λ‹ˆλ‹€.
7+
=======
8+
EAT-SSUλŠ” μˆ­μ‹€λŒ€ν•™κ΅ 학생듀이 캠퍼슀 λ‚΄ 식당 메뉴λ₯Ό λ¦¬λ·°ν•˜κ³  비ꡐ할 수 μžˆλŠ” λͺ¨λ°”일 μ• ν”Œλ¦¬μΌ€μ΄μ…˜μž…λ‹ˆλ‹€. 이 앱은 메뉴 리뷰, 운영 μ‹œκ°„, μœ„μΉ˜ λ“± λ‹€μ–‘ν•œ 식사 μ˜΅μ…˜μ— λŒ€ν•œ 쒅합적인 정보λ₯Ό μ œκ³΅ν•˜μ—¬ 식사 κ²½ν—˜μ„
9+
ν–₯μƒμ‹œν‚€λŠ” 것을 λͺ©ν‘œλ‘œ ν•©λ‹ˆλ‹€.
10+
>>>>>>> bbb0601 (docs: Java SDK 17 λͺ…μ„Έ)
11+
12+
### μ£Όμš” κΈ°λŠ₯
13+
14+
- 캠퍼슀 λ‚΄ λͺ¨λ“  식당 μ‹œμ„€μ˜ 메뉴 보기 및 비ꡐ:
15+
<<<<<<< HEAD
16+
- 학생식당
17+
- 도담식당
18+
- ν‘Έλ“œμ½”νŠΈ
19+
- μŠ€λ‚΅μ½”λ„ˆ
20+
- κΈ°μˆ™μ‚¬ 식당
21+
=======
22+
- 학생식당
23+
- 도담식당
24+
- ν‘Έλ“œμ½”νŠΈ
25+
- μŠ€λ‚΅μ½”λ„ˆ
26+
- κΈ°μˆ™μ‚¬ 식당
27+
>>>>>>> bbb0601 (docs: Java SDK 17 λͺ…μ„Έ)
28+
- 식사에 λŒ€ν•œ 리뷰 μž‘μ„± 및 읽기
29+
- 식당 운영 μ‹œκ°„ 및 μœ„μΉ˜ 확인
30+
- μ‚¬μš©μž 인증 μ‹œμŠ€ν…œ
31+
32+
## 기술 μŠ€νƒ
33+
34+
### λ°±μ—”λ“œ
35+
<<<<<<< HEAD
36+
=======
37+
38+
>>>>>>> bbb0601 (docs: Java SDK 17 λͺ…μ„Έ)
39+
- **ν”„λ ˆμž„μ›Œν¬**: Spring Boot 3.0.4
40+
- **μ–Έμ–΄**: Java 17
41+
- **λ°μ΄ν„°λ² μ΄μŠ€**: MySQL (ν”„λ‘œλ•μ…˜), H2 (ν…ŒμŠ€νŒ…)
42+
- **ORM**: Spring Data JPA와 QueryDSL
43+
- **λ³΄μ•ˆ**: Spring Security와 JWT
44+
- **API λ¬Έμ„œν™”**: OpenAPI (Springdoc)
45+
- **λΉŒλ“œ 도ꡬ**: Gradle
46+
- **ν΄λΌμš°λ“œ μŠ€ν† λ¦¬μ§€**: AWS S3
47+
- **μ•Œλ¦Ό**: Slack API 톡합
48+
49+
### λͺ¨λ°”일 μ• ν”Œλ¦¬μΌ€μ΄μ…˜
50+
<<<<<<< HEAD
51+
=======
52+
53+
>>>>>>> bbb0601 (docs: Java SDK 17 λͺ…μ„Έ)
54+
- iOS(App Store)와 Android(Play Store) λͺ¨λ‘μ—μ„œ 이용 κ°€λŠ₯
55+
56+
## ν”„λ‘œμ νŠΈ ꡬ쑰
57+
58+
이 ν”„λ‘œμ νŠΈλŠ” λ‹€μŒκ³Ό 같은 ꡬ쑰둜 도메인 주도 섀계 μ ‘κ·Ό 방식을 λ”°λ¦…λ‹ˆλ‹€:
59+
60+
```
61+
src/main/java/ssu/eatssu/
62+
β”œβ”€β”€ domain/
63+
β”‚ β”œβ”€β”€ menu/
64+
β”‚ β”‚ β”œβ”€β”€ entity/
65+
β”‚ β”‚ β”œβ”€β”€ persistence/
66+
β”‚ β”‚ β”œβ”€β”€ presentation/
67+
β”‚ β”‚ β”‚ β”œβ”€β”€ dto/
68+
β”‚ β”‚ β”‚ β”œβ”€β”€ rest/
69+
β”‚ β”‚ └── service/
70+
β”‚ β”œβ”€β”€ restaurant/
71+
β”‚ β”‚ β”œβ”€β”€ entity/
72+
β”‚ β”‚ β”œβ”€β”€ persistence/
73+
β”‚ β”‚ β”œβ”€β”€ presentation/
74+
β”‚ β”‚ └── service/
75+
β”‚ └── [기타 도메인]
76+
β”œβ”€β”€ global/
77+
β”‚ β”œβ”€β”€ config/
78+
β”‚ β”œβ”€β”€ error/
79+
β”‚ └── security/
80+
└── [기타 νŒ¨ν‚€μ§€]
81+
```
82+
83+
## 개발 κ°€μ΄λ“œλΌμΈ
84+
85+
### μ½”λ“œ μŠ€νƒ€μΌ
86+
<<<<<<< HEAD
87+
=======
88+
89+
>>>>>>> bbb0601 (docs: Java SDK 17 λͺ…μ„Έ)
90+
- Java μ½”λ”© κ·œμΉ™ μ€€μˆ˜
91+
- 의미 μžˆλŠ” λ³€μˆ˜ 및 λ©”μ†Œλ“œ 이름 μ‚¬μš©
92+
- λ³΅μž‘ν•œ λ‘œμ§μ— λŒ€ν•œ 포괄적인 주석 μž‘μ„±
93+
- λͺ¨λ“  μƒˆλ‘œμš΄ κΈ°λŠ₯에 λŒ€ν•œ λ‹¨μœ„ ν…ŒμŠ€νŠΈ μž‘μ„±
94+
95+
### Git μ›Œν¬ν”Œλ‘œμš°
96+
<<<<<<< HEAD
97+
=======
98+
99+
>>>>>>> bbb0601 (docs: Java SDK 17 λͺ…μ„Έ)
100+
- 메인 λΈŒλžœμΉ˜μ—μ„œ κΈ°λŠ₯ 브랜치 생성
101+
- μ„€λͺ…적인 컀밋 λ©”μ‹œμ§€ μ‚¬μš©
102+
- 병합 μ „ μ½”λ“œ 리뷰λ₯Ό μœ„ν•œ ν’€ λ¦¬ν€˜μŠ€νŠΈ 제좜
103+
- 컀밋을 집쀑적이고 μ›μžμ μœΌλ‘œ μœ μ§€
104+
105+
### λ³΄μ•ˆ
106+
<<<<<<< HEAD
107+
=======
108+
109+
>>>>>>> bbb0601 (docs: Java SDK 17 λͺ…μ„Έ)
110+
- λ―Όκ°ν•œ 정보(API ν‚€, 자격 증λͺ…)λ₯Ό μ ˆλŒ€ μ»€λ°‹ν•˜μ§€ μ•ŠμŒ
111+
- `application.yml` νŒŒμΌμ€ νŒ€ λ‚΄μ—μ„œλ§Œ 곡유
112+
- 항상 μ‚¬μš©μž μž…λ ₯ 검증
113+
- μ΅œμ†Œ κΆŒν•œ 원칙 μ€€μˆ˜
114+
115+
### ν…ŒμŠ€νŒ…
116+
<<<<<<< HEAD
117+
=======
118+
119+
>>>>>>> bbb0601 (docs: Java SDK 17 λͺ…μ„Έ)
120+
- λͺ¨λ“  μ„œλΉ„μŠ€μ— λŒ€ν•œ λ‹¨μœ„ ν…ŒμŠ€νŠΈ μž‘μ„±
121+
- API μ—”λ“œν¬μΈνŠΈμ— λŒ€ν•œ 톡합 ν…ŒμŠ€νŠΈ μ‚¬μš©
122+
- μ€‘μš” ꡬ성 μš”μ†Œμ— λŒ€ν•œ ν…ŒμŠ€νŠΈ 컀버리지 μœ μ§€
123+
124+
## 배포
125+
126+
μ• ν”Œλ¦¬μΌ€μ΄μ…˜μ€ Docker μ»¨ν…Œμ΄λ„ˆλ‘œ λ°°ν¬λ©λ‹ˆλ‹€. λΉŒλ“œ ν”„λ‘œμ„ΈμŠ€λŠ” `eat-ssu.jar`λΌλŠ” JAR νŒŒμΌμ„ μƒμ„±ν•©λ‹ˆλ‹€.
127+
128+
## μ—°λ½μ²˜
129+
130+
ν”„λ‘œμ νŠΈμ— λŒ€ν•œ μžμ„Έν•œ μ •λ³΄λŠ” [ν”„λ‘œμ νŠΈ νŽ˜μ΄μ§€](https://hi-jin-1514.notion.site/EAT-SSU-b04aaec9b7814a628c6ef6b3e08c74a3)λ₯Ό λ°©λ¬Έν•˜μ„Έμš”.

β€Žsrc/main/generated/ssu/eatssu/domain/inquiry/entity/QInquiry.javaβ€Ž

Lines changed: 0 additions & 65 deletions
This file was deleted.

β€Žsrc/main/generated/ssu/eatssu/domain/menu/entity/QMeal.javaβ€Ž

Lines changed: 0 additions & 48 deletions
This file was deleted.

β€Žsrc/main/generated/ssu/eatssu/domain/menu/entity/QMealMenu.javaβ€Ž

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
Β (0)