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.

Sign up for GitHub

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

Jump to bottom

develop -> main #1135

Merged
merged 30 commits into from
Dec 13, 2024
Merged

develop -> main #1135

merged 30 commits into from
Dec 13, 2024

Conversation

krSeonghyeon
Copy link
Contributor

๐Ÿ”ฅ ์—ฐ๊ด€ ์ด์Šˆ

  • close #์ด์Šˆ๋ฒˆํ˜ธ

๐Ÿš€ ์ž‘์—… ๋‚ด์šฉ

๐Ÿ’ฌ ๋ฆฌ๋ทฐ ์ค‘์ ์‚ฌํ•ญ

DHkimgit and others added 30 commits November 26, 2024 14:45
@DHkimgit
feat : ๋„๋ฉ”์ธ ๋ชจ๋ธ ๋น„์Šค๋‹ˆ์Šค ๊ตฌํ˜„ ๋กœ์ง ์ž‘์„ฑ
f9c9d8d
@DHkimgit
feat : command DTO ์ž‘์„ฑ
f62e322
@DHkimgit
feat : BusStation enum ๋ฉค๋ฒ„ ์ถ”๊ฐ€
c138c80
@DHkimgit
feat : repository query ๋ฉ”์†Œ๋“œ ์ถ”๊ฐ€
70e5b38
@DHkimgit
feat : ์ „๋žตํŒจํ„ด ์ธํ„ฐํŽ˜์ด์Šค ์ž‘์„ฑ
180f899
@DHkimgit
feat : ์ „๋žตํŒจํ„ด ๊ตฌํ˜„์ฒด ์ž‘์„ฑ
8f487af
@DHkimgit
feat : response DTO ์ž‘์„ฑ
fa05713
@DHkimgit
feat : ์‹œ๋‚ด๋ฒ„์Šค ์Šค์ผ€์ค„ ์กฐํšŒ ๊ตฌํ˜„ ๋กœ์ง ๊ฐœ์„ 
ab7e344
@DHkimgit
feat : ๋Œ€์„ฑ ๋ฒ„์Šค ์Šค์ผ€์ค„ ๋ฐ์ดํ„ฐ ์ž‘์„ฑ
cd81e3b
@DHkimgit
feat : service ๊ณ„์ธต ์ž‘์„ฑ
69ed6b8
@DHkimgit
feat : controller ์ž‘์„ฑ
e8f80cf
@DHkimgit
chore : ํด๋ž˜์Šค ์ด๋ฆ„ ๋ณ€๊ฒฝ
552b763
@DHkimgit
refactor : ์…”ํ‹€๋ฒ„์Šค ๊ตฌํ˜„์ฒด ํ†ตํ•ฉ
65a66b9
@DHkimgit
chore : ์ถœ๋ ฅ ์ˆ˜์ •, ์ƒ์ˆ˜ ์ถ”๊ฐ€
fca0a90
@DHkimgit
chore : static import ์ ์šฉ
bb908b5
@DHkimgit
chore : ์ฝ”๋“œ ๋ฆฌ๋ทฐ ๋ฐ˜์˜ - indent
a8646e4
@DHkimgit
feat : ๋ฒ„์Šค ํƒ€์ž… ์ •๋ ฌ ๊ธฐ์ค€ ์ถ”๊ฐ€
475534c
@20HyeonsuLee @songsunkook
@Choon0414 @BaeJinho4028 @seongjae6751 @Soundbar91
feature: ๋ชจ๋“  ์ƒ์  ์กฐํšŒ API์— ํ˜œํƒ ์ƒ์„ธ ํ•„๋“œ ์ถ”๊ฐ€ (#1121)
f3fecd8 
* feat: ๋ชจ๋“  ์ƒ์  ์กฐํšŒ์‹œ ํ˜œํƒ ํ•„๋“œ ์ถ”๊ฐ€

* refactor: ๋ฆฌ๋ทฐ ๋ฐ˜์˜

---------

Co-authored-by: ์†ก์„ ๊ถŒ <[email protected]>
Co-authored-by: Hwang HyeonSik <[email protected]>
Co-authored-by: ๋ฐฐ์ง„ํ˜ธ <[email protected]>
Co-authored-by: ๊น€์„ฑ์žฌ <[email protected]>
Co-authored-by: ์‹ ๊ด€๊ทœ <[email protected]>
Co-authored-by: HyeonsuLee <[email protected]>
@DHkimgit
feat : Api ์ธํ„ฐํŽ˜์ด์Šค ๋ฉ”์„œ๋“œ ์ถ”๊ฐ€
ef1ef9e
@BaeJinho4028
feat: ์ƒ์  ํ˜œํƒ ์ƒ์„ธ๋ณด๊ธฐ ํ•„๋“œ ์ถ”๊ฐ€ (#1123)
d874940 
* feat: ํ˜œํƒ ์นดํ…Œ๊ณ ๋ฆฌ๋ณ„ ์ƒ์  ์กฐํšŒ์‹œ ํ˜œํƒ ์ƒ์„ธ๋ณด๊ธฐ ์ถ”๊ฐ€

* test: ํ…Œ์ŠคํŠธ ํ•„๋“œ ์ถ”๊ฐ€

* fix: ํ”ผ๋“œ๋ฐฑ ๋ฐ˜์˜
@DHkimgit
chore : ์ฃผ์„, ์Šคํ‚ค๋งˆ ์ˆ˜์ • ๋ฐ ๊ฐœ์„ 
187fbd2
@DHkimgit
chore : ์ฃผ์„, ์Šคํ‚ค๋งˆ ์ˆ˜์ • ๋ฐ ๊ฐœ์„ 
0552b56
@dradnats1012
refactor: ์—‘์…€ ๋ฉ”์„œ๋“œ ๋ถ„๋ฆฌ (#1041)
bc82893 
* feat: ์—‘์…€ ๋‹ค์šด๋กœ๋“œ ๋ฆฌํŒฉํ† ๋ง

* feat: ์—‘์…€ ๋‹ค์šด๋กœ๋“œ ๋ฆฌํŒฉํ† ๋ง

* refactor: ๋™์‹œ์„ฑ ์ œ์–ด ์–ด๋…ธํ…Œ์ด์…˜ ์‚ญ์ œ

* fix: ๋ฆฌ๋ทฐ ๋ฐ˜์˜

* fix: ์ฃผ์„ ์‚ญ์ œ
@DHkimgit
fix : ์ผ๋ถ€ ์š”์ฒญ์— ๋Œ€ํ•ด 404 ์—๋Ÿฌ ๋ฐ˜ํ™˜ํ•˜๋Š” ์˜ค๋ฅ˜ ์ˆ˜์ •
031e938
@DHkimgit
feat : ์ฒœ์•ˆ์—ญ <-> ํ„ฐ๋ฏธ๋„ ์ •๋ณด ์ œ๊ณต
2c4291b
@DHkimgit
feat: ๋ฒ„์Šค ๊ตํ†ตํŽธ ์กฐํšŒ API
392dfab 
feat: ๋ฒ„์Šค ๊ตํ†ตํŽธ ์กฐํšŒ API
@krSeonghyeon
feat: ์–ด๋“œ๋ฏผ ํ˜œํƒ ์ƒ์„ธ ํŽ˜์ด์ง€ ํ˜œํƒ๋ฌธ๊ตฌ ๋ฏธ๋ฆฌ๋ณด๊ธฐ ์ถ”๊ฐ€ (#1132)
610fee0 
* feat: ํŠน์ • ํ˜œํƒ ์นดํ…Œ๊ณ ๋ฆฌ ์ƒ์  ์ „์ฒด ์กฐํšŒ์— ํ˜œํƒ ๋ฌธ๊ตฌ ๋ฏธ๋ฆฌ๋ณด๊ธฐ ์ถ”๊ฐ€ ๋ฐ˜ํ™˜

* feat: ํŠน์ • ํ˜œํƒ ์นดํ…Œ๊ณ ๋ฆฌ ์ƒ์  ์ „์ฒด ์ถ”๊ฐ€์— ํ˜œํƒ ๋ฌธ๊ตฌ ๋ฏธ๋ฆฌ๋ณด๊ธฐ ์ถ”๊ฐ€

* feat: ํŠน์ • ํ˜œํƒ ์นดํ…Œ๊ณ ๋ฆฌ ์ƒ์  ์ˆ˜์ • API ์ถ”๊ฐ€

* test: ํŠน์ • ํ˜œํƒ ์นดํ…Œ๊ณ ๋ฆฌ์˜ ์ƒ์  ์ „์ฒด ์กฐํšŒ ํ…Œ์ŠคํŠธ ์ถ”๊ฐ€

* test: ํŠน์ • ํ˜œํƒ ์นดํ…Œ๊ณ ๋ฆฌ์˜ ์ƒ์  ์ถ”๊ฐ€ ํ…Œ์ŠคํŠธ ์ž‘์„ฑ

* test: ํŠน์ • ํ˜œํƒ ์นดํ…Œ๊ณ ๋ฆฌ์˜ ์ƒ์ ๋“ค ์ˆ˜์ • ํ…Œ์ŠคํŠธ ์ž‘์„ฑ

* chore: ๊ฐœํ–‰์ถ”๊ฐ€

* chore: ๋ฉ€ํ‹ฐ๋ผ์ธ ๋ฌธ์ž์—ด๋กœ ๋ณ€๊ฒฝ

* chore: ๋ฉ€ํ‹ฐ๋ผ์ธ ๋ฌธ์ž์—ด๋กœ ๋ณ€๊ฒฝ

* feat: ์ˆ˜์ •์—์„œ shopId๊ฐ€ ์•„๋‹Œ mapId๋ฅผ ์ด์šฉํ•˜๋„๋ก ๋ณ€๊ฒฝ

* feat: ๋ถˆํ•„์š”ํ•œ schema ์‚ญ์ œ
@kih1015
feat: ํ•™๊ต๋ฒ„์Šค ์‹œ๊ฐ„ํ‘œ ๊ด€๋ จ API (#1119)
91f7692 
* feat: ํ•™๊ต๋ฒ„์Šค ์‹œ๊ฐ„ํ‘œ ๊ด€๋ จ API 2๊ฐœ ๊ตฌํ˜„

/courses/shuttle ํ•™๊ต๋ฒ„์Šค ๋…ธ์„  ์กฐํšŒ API ๊ตฌํ˜„
/timetable/shuttle ํ•™๊ต๋ฒ„์Šค ์‹œ๊ฐ„ํ‘œ ์กฐํšŒ API ๊ตฌํ˜„

* feat: ํ•™๊ต๋ฒ„์Šค ๋…ธ์„  ์กฐํšŒ response ์Šค์›จ๊ฑฐ ๋ช…์„ธ

* chore: ๋ฉ”์„œ๋“œ ์ด๋ฆ„ ๋ณ€๊ฒฝ

* feat: ํ•™๊ต๋ฒ„์Šค ๋…ธ์„  ์กฐํšŒ DTO ๋ถ„๋ฆฌ

๋ชจ๋ธ ๊ฐ์ฒด์™€ DTO ๋ถ„๋ฆฌ
์ปจํŠธ๋กค๋Ÿฌ ๋ฉ”์„œ๋“œ ์ด๋ฆ„ ๋ณ€๊ฒฝ

* feat: ํ•™๊ธฐ ์ข…๋ฅ˜์— ๋”ฐ๋ฅธ ๋…ธ์„  ๋ฐ˜ํ™˜ํ•˜๋„๋ก ๋ณ€๊ฒฝ

์ •๊ทœํ•™๊ธฐ, ๊ณ„์ ˆํ•™๊ธฐ, ๋ฐฉํ•™์— ๋”ฐ๋ผ ๋‹ค๋ฅธ ๋…ธ์„  ๋ฐ˜ํ™˜

* chore: response ์Šค์›จ๊ฑฐ ๋ช…์„ธ ์ •๋ณด ์ˆ˜์ •

* feat: response ๊ตฌ์กฐ ๋ณ€๊ฒฝ

์ „์ฒด ๋…ธ์„  ์กฐํšŒ response ๊ตฌ์กฐ ๋ณ€๊ฒฝ

* feat: response ์ˆœ์„œ๋Œ€๋กœ ๋ฐ˜ํ™˜

์ง€์—ญ ์ˆœ์„œ๋Œ€๋กœ ๋ฐ˜ํ™˜ (์ฒœ์•ˆ, ์„œ์šธ, ์ฒญ์ฃผ)
๋…ธ์„  ์ข…๋ฅ˜ ์ˆœ์„œ๋Œ€๋กœ ๋ฐ˜ํ™˜ (์ˆœํ™˜, ์ฃผ์ค‘, ์ฃผ๋ง)

* refactor: ๋ฆฌ๋ทฐ ๋ฐ˜์˜

uri ์ˆ˜์ •: /bus/timetable/shuttle/{id}
ShuttleBusService ๊ตฌํ˜„
dto ์ฑ…์ž„ ๋ถ„๋ฆฌ
dto ์ด๋ฆ„ ๋ณ€๊ฒฝ

* refactor: enum ๋„์ž…

์ง€์—ญ, ๋…ธ์„ ์ข…๋ฅ˜ ์†์„ฑ enum ๋Œ€์ฒด
์ •๋ ฌ ๋กœ์ง ๊ฐœ์„ 

* refactor: dto ๋ณ€ํ™˜ ์ฑ…์ž„ ๋ถ„๋ฆฌ from service

* chore: detail ์†์„ฑ ์ถ”๊ฐ€

๋…ธ์„  ์ •๋ณด์— detail ์†์„ฑ ์ถ”๊ฐ€
๋…ธ์„  ์ง€์—ญ response ์ด๋ฆ„ ์ˆ˜์ •
@kih1015
chore: ์ง€์—ญ ์ด๋ฆ„ ์ˆ˜์ • (#1134)
14d9d8e 
ex: ์ฒœ์•ˆยท์•„์‚ฐ -> ์ฒœ์•ˆใƒป์•„์‚ฐ
@Soundbar91
fix: ์–ด๋“œ๋ฏผ ํžˆ์Šคํ† ๋ฆฌ ๊ธฐ๋Šฅ ์ˆ˜์ • (#1131)
885875d 
* fix: ๋ฐ˜ํ™˜ ๋‚ ์งœ ํ˜•์‹ ๋ณ€๊ฒฝ

* feat: ๊ฒ€์ƒ‰ ์ •๋ ฌ ์˜ต์…˜ ์ถ”๊ฐ€

* fix: String ํ•„๋“œ Enum์œผ๋กœ ๋ณ€๊ฒฝ

* style: ์ฝ”๋“œ ํฌ๋ฉงํŒ…

* chore: ๋ฏธ์‚ฌ์šฉ import ์‚ญ์ œ

* style: ์ฝ”๋“œ ํฌ๋ฉงํŒ…

* chore: ์ฝ”๋“œ ๋ธ”๋Ÿญ ์ฒ˜๋ฆฌ

* chore: historys -> histories์œผ๋กœ ๋ณ€๊ฒฝ

* chore: ์ •์  ๋ฉ”์†Œ๋“œ ๋„ค์ด๋ฐ ๋ณ€๊ฒฝ

* style: ์ฝ”๋“œ ๊ฐœํ–‰

* style: ์ฝ”๋“œ ๊ฐœํ–‰

* fix: ๋กœ๊น… ์–ด๋…ธํ…Œ์ด์…˜์œผ๋กœ ๋ณ€๊ฒฝ

* Revert "fix: ๋กœ๊น… ์–ด๋…ธํ…Œ์ด์…˜์œผ๋กœ ๋ณ€๊ฒฝ"

This reverts commit 7c1ecb2.

* chore: ๋ฆฌ๋ทฐ ๋ฐ˜์˜

* style: ์ฝ”๋“œ ํฌ๋ฉงํŒ…
@github-actions GitHub Actions
Copy link

Unit Test Results

344 testsโ€‚ +2โ€‚โ€ƒโ€ƒ343 โœ”๏ธ +2โ€‚โ€ƒโ€ƒ1m 34s โฑ๏ธ +6s
โŸโ€„41 suites ยฑ0โ€‚โ€ƒโ€ƒโŸโ€„โŸโ€„1 ๐Ÿ’ค ยฑ0โ€‚
โŸโ€„41 filesโ€„โ€‚ ยฑ0โ€‚โ€ƒโ€ƒโŸโ€„โŸโ€„0 โŒ ยฑ0โ€‚

Results for commit 885875d.โ€ƒยฑ Comparison against base commit b1af75d.

@krSeonghyeon krSeonghyeon merged commit ee31add into main Dec 13, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Soundbar91 Soundbar91 Soundbar91 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@krSeonghyeon @Soundbar91 @DHkimgit @20HyeonsuLee @BaeJinho4028 @dradnats1012 @kih1015