Skip to content

πŸ”€ [MERGE] develop β†’ main 브랜치 병합 #147

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
naooung merged 21 commits into from
Aug 24, 2025
Merged

πŸ”€ [MERGE] develop β†’ main 브랜치 병합 #147

naooung merged 21 commits into from
Aug 24, 2025

Conversation

@naooung
Copy link
Member

@naooung naooung commented Aug 24, 2025

πŸ“ μž‘μ—… λ‚΄μš©

  • develop λΈŒλžœμΉ˜μ—μ„œ 개발이 μ™„λ£Œλœ λ‚΄μš©μ„ main 브랜치둜 λ³‘ν•©ν•©λ‹ˆλ‹€.

πŸ›  개발 상세

  • main 브랜치둜 병합

βœ”οΈ 체크 리슀트

  • Merge ν•˜λ €λŠ” PR 및 Commit듀을 λ‘œμ»¬μ—μ„œ μ‹€ν–‰ν–ˆμ„ λ•Œ μ—λŸ¬κ°€ λ°œμƒν•˜μ§€ μ•Šμ•˜λŠ”κ°€?

πŸ“Έ μŠ€ν¬λ¦°μƒ· (선택)

βž• μΆ”ν›„ κ³„νš(선택)

shinchaerin79 and others added 21 commits August 22, 2025 01:12
@shinchaerin79
♻️ rewardName β†’ reward ν•„λ“œλͺ… μˆ˜μ •
ba1ff79
@shinchaerin79
♻️ μ „ν™”λ²ˆν˜Έ νŒ¨ν„΄ μˆ˜μ • (슀마트콜 번호 ν—ˆμš©)
e18ed46
@shinchaerin79
♻️ Store Response에 authCode μΆ”κ°€
2f448d0
@shinchaerin79
✨ νŠΉμ • 메뉴 μ‚­μ œ API κ΅¬ν˜„
78f2041
@shinchaerin79
Merge branch 'refactor/store-phoneNumber' of https://github.com/Dan-C…
027bf9c 
…hu/BE into fix/store-get-menus
@shinchaerin79
πŸ› κ°€κ²Œ 전체 쑰회 μ‹œ 메뉴 λͺ©λ‘ 쑰회 μ‹€νŒ¨ 버그 μˆ˜μ •
de30c2b
@naooung
Merge pull request #132 from Dan-Chu/refactor/openai-mission-response…
9727add 
…-reward

♻️ [REFACTOR/#131] MissionRecommendResponse rewardName β†’ reward ν•„λ“œλͺ… μˆ˜μ •
@naooung
Merge pull request #134 from Dan-Chu/refactor/store-phoneNumber
1ba7cb1 
♻️ [REFACTOR/#133] μ „ν™”λ²ˆν˜Έ νŒ¨ν„΄ μˆ˜μ • (슀마트콜 번호 ν—ˆμš©)
@naooung
Merge pull request #138 from Dan-Chu/feature/menu-delete
8e26437 
✨ [FEAT/#137] νŠΉμ • 메뉴 μ‚­μ œ API κ΅¬ν˜„
@shinchaerin79
Merge pull request #136 from Dan-Chu/refactor/store-response-authcode
8fb936f
@shinchaerin79
Merge pull request #140 from Dan-Chu/fix/store-get-menus
857805a
@shinchaerin79
✨ content[i].store ꡬ쑰λ₯Ό λ§žμΆ”κΈ° μœ„ν•΄ StoreListItemResponse DTO μΆ”κ°€
1a7a0f5
@shinchaerin79
♻️ κ°€κ²Œ λͺ©λ‘ νŽ˜μ΄μ§• 응닡 ꡬ쑰 μˆ˜μ •
1357241
@naooung
Merge pull request #144 from Dan-Chu/refactor/store-paging-response
487fce3 
♻️ [REFACTOR/#141] κ°€κ²Œ λͺ©λ‘ νŽ˜μ΄μ§• 응닡 ꡬ쑰 μˆ˜μ •
@naooung
πŸ”§ μ„œλΈŒλͺ¨λ“ˆ monitoring μ„€μ •κ°’ μΆ”κ°€
9953a0f
@naooung
πŸ”§ SecurityConfig prometheus μ ‘κ·Ό ν—ˆμš©
2557e86
@naooung
βž• monitoring κ΄€λ ¨ μ˜μ‘΄μ„± μΆ”κ°€
4227cfe
@naooung
✨ prometheus.yml μ„œλ²„ 볡사 κ³Όμ • μΆ”κ°€
bcf79d7
@naooung
✨ Prometheus & Grafana ꡬ좕
ddbde07
@naooung
Merge pull request #146 from Dan-Chu/feature/monitoring
5ebda8f 
✨ [FEAT/#145] Prometheus & Grafana ꡬ좕
@naooung
πŸ”§ μ„œλΈŒλͺ¨λ“ˆ AccessToken 만료 μ‹œκ°„ λ³€κ²½
f1356c6
@naooung naooung self-assigned this Aug 24, 2025
@naooung naooung added the πŸ”€ Merge 브랜치 병합 label Aug 24, 2025
@naooung naooung merged commit a072571 into main Aug 24, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@naooung naooung

Labels

πŸ”€ Merge 브랜치 병합

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@naooung @shinchaerin79