Skip to content

Final Merge #188

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
Merged
SeungAh-Yoo99 merged 610 commits into from
Dec 13, 2024
Merged

Final Merge #188

SeungAh-Yoo99 merged 610 commits into from
Dec 13, 2024

Conversation

@SeungAh-Yoo99
Copy link
Collaborator

@SeungAh-Yoo99 SeungAh-Yoo99 commented Dec 13, 2024

πŸ›  κ΅¬ν˜„ 사항

  • ν”„λ‘œμ νŠΈ 끝! ν™˜ν˜Έν•˜μ„Έμš”

yaejinkong and others added 30 commits November 26, 2024 11:06
@yaejinkong
[refactor/TK-187]: λΆˆν•„μš”ν•œ μ½”λ“œ μ‚­μ œ
2ffc80e
@yaejinkong
[feat/TK-202]: @EnableScheduling μ• λ…Έν…Œμ΄μ…˜ μΆ”κ°€
8ed81f8
@Kong-E
Merge pull request #108 from woorifisa-projects-3rd/feat/TK-141-share…
342d90e 
…d-payments-API

[Feat/TK-141] κ³΅λ™κ²°μ œλ‚΄μ—­ NPE μ—λŸ¬ ν•΄κ²°
@yaejinkong
[feat/TK-202]: μ •μ‚° 정리 μš”μ²­ μŠ€μΌ€μ€„λŸ¬ μΆ”κ°€
32119c8
@yaejinkong
Merge remote-tracking branch 'origin/dev' into feat/TK-187-signup
0a71146
@yaejinkong
[refactor/TK-187]: resolved merge conflicts
bc5fe11
@yaejinkong
[refactor/TK-202]: λ©”μ„œλ“œλͺ… λ³€κ²½
357a2ec
@yaejinkong
Merge pull request #107 from woorifisa-projects-3rd/feat/TK-187-signup
4f58147 
[Feat/TK-187] 인증인가 μ—λŸ¬ μˆ˜μ • 및 μ§€μΆœ 상세 λ‚΄μ—­ 쑰회 API μˆ˜μ •
@yaejinkong
[refactor/TK-202]: SettlementRequestLogκ°€ userλ₯Ό 가지도둝 μˆ˜μ •
678112f 
- settlementRequestLog 생성 μ‹œ userλ₯Ό ν¬ν•¨ν•˜λ„λ‘ μ½”λ“œ μˆ˜μ •
- μ•Œλ¦Όμ°½ 쑰회 APIλŠ” userIdλ₯Ό κΈ°μ€€μœΌλ‘œ λͺ¨λ“  μ•Œλ¦Όμ„ μ‘°νšŒν•˜λ„λ‘ λ³€κ²½
- μ •μ‚° 보λ₯˜ μ‹œ, μž”μ•‘μ΄ λΆ€μ‘±ν•œ λ©€λ²„λ“€μ—κ²Œλ§Œ λ‘œκ·Έκ°€ μ €μž₯λ˜λ„λ‘ λ³€κ²½
- μ •μ‚° 보λ₯˜ μ‹œ μž”μ•‘ λΆ€μ‘± λ©€λ²„λ“€μ˜ κ³„μ’Œ 상세 νŽ˜μ΄μ§€λ‘œ μ΄λ™ν•˜λ„λ‘ 링크 μΆ”κ°€
@yaejinkong
Merge remote-tracking branch 'origin/dev' into feat/TK-202-settlement…
082e258 
…-notification
@SeungAh-Yoo99
[hotfix]: userId UserAuthorizationUtilμ—μ„œ κ°€μ Έμ˜€λ„λ‘ μˆ˜μ •
3e46403
@HoChoRoo
[fix/TK-196]:둜그인된 μœ μ € 검증
5cae83f
@doyi0107
[fix/TK-206]:μΉ΄λ“œ λ°œκΈ‰ μ™„λ£Œ ë©APIν…ŒμŠ€Γ£Γ£οΏ½νŠΈ
9458cae
@SeungAh-Yoo99
[feat/TK-207]: μœ„λΉ„ μΉ΄λ“œ 결제 λ‚΄μ—­ 뢈러였기 API κ΅¬ν˜„
66d9f9c
@yaejinkong
[refactor/TK-187]: 상세 λ‚΄μ—­ 쑰회 API μˆ˜μ •
d40dfbd 
- λ‚΄κ°€ κ²°μ œν–ˆμ§€λ§Œ μ •μ‚° 인원에 ν¬ν•¨λ˜μ§€ μ•ŠλŠ” 경우λ₯Ό κ³ λ €ν•˜λ„λ‘ μˆ˜μ •
@yaejinkong
[refactor/TK-202]: SettlementRequestLog ν•„λ“œ 변경에 따라 μŠ€μΌ€μ€„λŸ¬μ—μ„œλ„ λͺ¨λ“  μ—¬ν–‰μ›λ“€μ˜ λ‘œκ·Έβ€¦
f90aae5 
…λ₯Ό μƒμ„±ν•˜λ„λ‘ λ³€κ²½
@doyi0107
[fix/TK-206]:μΉ΄λ“œ λ°œκΈ‰ μ™„λ£Œ λ©”api κ΅¬ν˜„
4ce2ce2
@SeungAh-Yoo99
[fix/TK-207]: RequestParam nullable둜 μˆ˜μ •
920b2aa
@yaejinkong
[refactor/TK-202]: μŠ€μΌ€μ€„λŸ¬λ₯Ό scheduler νŒ¨ν‚€μ§€λ‘œ λ”°λ‘œ λΉΌκΈ°
9aaf3da
@yaejinkong
Merge pull request #115 from woorifisa-projects-3rd/feat/TK-187-signup
b6730b4 
[Feat/TK-187]: 상세 λ‚΄μ—­ 쑰회 API μˆ˜μ •
@yaejinkong
Merge remote-tracking branch 'origin/dev' into feat/TK-202-settlement…
06e5306 
…-notification
@SeungAh-Yoo99
Merge branch 'dev' of https://github.com/woorifisa-projects-3rd/WithB…
f7bbecd 
…eeTravel-BE into feat/TK-207-μœ„λΉ„-μΉ΄λ“œ-결제-λ‚΄μ—­-뢈러였기-API
@doyi0107
Merge branch 'feat/TK-206-μΉ΄λ“œ-λ°œκΈ‰-μ™„λ£Œ-API-κ΅¬ν˜„-' of https://github.com/woo…
b216096 
…rifisa-projects-3rd/WithBeeTravel-BE into feat/TK-208-μΉ΄λ“œ-λ°œκΈ‰-μ—¬λΆ€-API-κ΅¬ν˜„-
@doyi0107
[fix/TK-208]:버Γͺ였λ₯˜μˆ˜μ •
d646d14
@yaejinkong
[refactor/TK-202]: μŠ€μΌ€μ€„λŸ¬μ™€ λΉ„μ¦ˆλ‹ˆμŠ€ 둜직 뢄리
dcd6e02
@yaejinkong
[feat/TK-202]: TaskSchedulerConfig μΆ”κ°€
775b3d6
@SeungAh-Yoo99
Merge pull request #111 from woorifisa-projects-3rd/fix-인증-인가-적용
6ca8017 
[hotfix]: userId UserAuthorizationUtilμ—μ„œ κ°€μ Έμ˜€λ„λ‘ μˆ˜μ •
@SeungAh-Yoo99
Merge pull request #114 from woorifisa-projects-3rd/feat/TK-207-μœ„λΉ„-μΉ΄λ“œβ€¦
598d50b 
…-결제-λ‚΄μ—­-뢈러였기-API

Feat/tk 207 μœ„λΉ„ μΉ΄λ“œ 결제 λ‚΄μ—­ 뢈러였기 api
@HoChoRoo
[fix/TK-200]:μ΅œμ‹ ν™”
a483485
@HoChoRoo
Merge pull request #119 from woorifisa-projects-3rd/feat/TK-200-CICD-…
8699e1b 
β€¦μ μš©ν•˜κΈ°

Feat/tk 200 cicd μ μš©ν•˜κΈ°
yaejinkong and others added 29 commits December 9, 2024 14:29
@yaejinkong
[refactor/TK-253] μ—¬ν–‰ 멀버 μ΄ˆλŒ€ μ½”λ“œ μΆ”κ°€
b52b9df
@yaejinkong
Merge remote-tracking branch 'origin/dev' into feat/TK-253-ν…ŒμŠ€νŠΈ-μ½”λ“œ-μž‘μ„±
3dec7de
@yaejinkong
Merge pull request #177 from woorifisa-projects-3rd/feat/TK-253-ν…ŒμŠ€νŠΈ-코…
8f4e066 
β€¦λ“œ-μž‘μ„±

[refactor/TK-253] μ—¬ν–‰ 멀버 μ΄ˆλŒ€ μ½”λ“œ μ•Œλ¦Ό μΆ”κ°€
@SeungAh-Yoo99
[feat/TK-260]: μ—¬ν–‰ 메인 이미지 λ³€κ²½ API μΆ”κ°€
93636de
@doyi0107
Merge pull request #174 from woorifisa-projects-3rd/feat/TK-260-결제-내역…
cf9d841 
…-직접-μΆ”κ°€-ν…ŒμŠ€νŠΈ-μ½”λ“œ-μž‘μ„±

Feat/tk 260 ν—ˆλ‹ˆ μΊ‘μŠμ— μΆ”κ°€ν•œ 멀버 ν”„λ‘œν•„ 이미지 μΆ”κ°€
@yaejinkong
Merge remote-tracking branch 'origin/dev' into feat/TK-253-ν…ŒμŠ€νŠΈ-μ½”λ“œ-μž‘μ„±
261dd6e
@HoChoRoo
[feat/TK-273]:CICD ν…ŒμŠ€νŠΈ μ„€μ • λ‹€μ‹œ μˆ˜μ •
5796a5c
@yaejinkong
[refactor/TK-253] νšŒμ›κ°€μž… μ‹œ κ³„μ’Œ 생성
7a7389d
@yaejinkong
Merge pull request #178 from woorifisa-projects-3rd/feat/TK-253-ν…ŒμŠ€νŠΈ-코…
d0424ba 
β€¦λ“œ-μž‘μ„±
@HoChoRoo
[fix/TK-273]: κ²°μ œλ‚΄μ—­ μΆ”κ°€ 였λ₯˜ μˆ˜μ •
b050826
@yaejinkong
[refactor/TK-253] dto μˆ˜μ •
8666d2b
@yaejinkong
Merge pull request #180 from woorifisa-projects-3rd/feat/TK-253-ν…ŒμŠ€νŠΈ-코…
290b489 
β€¦λ“œ-μž‘μ„±

[refactor/TK-253] dto μˆ˜μ •
@HoChoRoo
Merge pull request #179 from woorifisa-projects-3rd/feat/TK-273-μΉ΄μΉ΄μ˜€ν†‘-…
6cf4764 
β€¦μ΄ˆλŒ€μ½”λ“œ-API-μˆ˜μ •

Feat/tk 273 κ²°μ œλ‚΄μ—­ μΆ”κ°€ API μˆ˜μ •
@SeungAh-Yoo99
[fix/TK-275]: ν—ˆλ‹ˆμΊ‘μŠ μ—¬ν–‰ 기둝 μ—†λŠ” 결제 λ‚΄μ—­κΉŒμ§€ λΆˆλ €μ˜€λŠ” μ—λŸ¬ μˆ˜μ •
604afdf
@yaejinkong
[refactor/TK-253] μŠ€μΌ€μ€„λŸ¬ ν…ŒμŠ€νŠΈμš©μœΌλ‘œ μˆ˜μ •
d74f8a9
@SeungAh-Yoo99
Merge pull request #183 from woorifisa-projects-3rd/feat/TK-253-ν…ŒμŠ€νŠΈ-코…
06294da 
β€¦λ“œ-μž‘μ„±

[refactor/TK-253] μŠ€μΌ€μ€„λŸ¬ ν…ŒμŠ€νŠΈμš©μœΌλ‘œ μˆ˜μ •
@yaejinkong
[refactor/TK-253] μŠ€μΌ€μ€„λŸ¬ λ‹€μ‹œ 원상 볡ꡬ
90a0ad9
@yaejinkong
Merge remote-tracking branch 'origin/dev' into feat/TK-253-ν…ŒμŠ€νŠΈ-μ½”λ“œ-μž‘μ„±
d0aa2c6
@doyi0107
Merge pull request #182 from woorifisa-projects-3rd/feat/TK-275-쒅합적인-…
09612df 
β€¦μ—λŸ¬-μˆ˜μ •

[fix/TK-275]: ν—ˆλ‹ˆμΊ‘μŠ μ—¬ν–‰ 기둝 μ—†λŠ” 결제 λ‚΄μ—­κΉŒμ§€ λΆˆλ €μ˜€λŠ” μ—λŸ¬ μˆ˜μ •
@HoChoRoo
[feat/TK-273]:λ±…ν‚Ή SSE μ„€μ •
970bf24
@HoChoRoo
[feat/TK-273]:λ±…ν‚Ή SSE μ„€μ • 문ꡬ μˆ˜μ •
0b2fd2a
@HoChoRoo
Merge pull request #184 from woorifisa-projects-3rd/feat/TK-253-ν…ŒμŠ€νŠΈ-코…
da1ecfc 
β€¦λ“œ-μž‘μ„±

[Feat/TK-253] μŠ€μΌ€μ€„λŸ¬ μ½”λ“œ μˆ˜μ •
@HoChoRoo
Merge pull request #185 from woorifisa-projects-3rd/feat/TK-273-μΉ΄μΉ΄μ˜€ν†‘-…
5576ca6 
β€¦μ΄ˆλŒ€μ½”λ“œ-API-μˆ˜μ •

[feat/TK-273] :λ±…ν‚Ή SSE μ„€μ •
@HoChoRoo
[refactor/TK-273]:λ±…ν‚Ή sse μˆ˜μ •
4287ef8
@HoChoRoo
[refactor/TK-273]:μ •μ‚° μ™„λ£Œ μ•Œλ¦Ό λ©”μ‹œμ§€, 링크 μˆ˜μ •
15d8db1
@HoChoRoo
Merge pull request #186 from woorifisa-projects-3rd/feat/TK-273-μΉ΄μΉ΄μ˜€ν†‘-…
12c000a 
β€¦μ΄ˆλŒ€μ½”λ“œ-API-μˆ˜μ •

Feat/tk 273 μΉ΄μΉ΄μ˜€ν†‘ μ΄ˆλŒ€μ½”λ“œ api μˆ˜μ •
@doyi0107
[feat/TK-253] cicd μˆ˜μ •
5833e4e
@doyi0107
Merge pull request #187 from woorifisa-projects-3rd/feat/TK-214-μ½”λ“œ-λ¦¬νŒ©ν† λ§-
a531805 
[feat/TK-253] cicd μˆ˜μ •
@SeungAh-Yoo99
Merge pull request #161 from woorifisa-projects-3rd/feat/TK-262-κ³΅λ™μ§€μΆœλ‚΄β€¦
484ba69 
…역-ν…ŒμŠ€νŠΈ-μ½”λ“œ-μž‘μ„±

[feat/TK-262]: κ³΅λ™μ§€μΆœλ‚΄μ—­ ν…ŒμŠ€νŠΈ μ½”λ“œ μž‘μ„±
@SeungAh-Yoo99 SeungAh-Yoo99 merged commit 15847f5 into main Dec 13, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@SeungAh-Yoo99 @yaejinkong @Kong-E @HoChoRoo @doyi0107