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

[PEAUTY-265] Merge release branch into Develop branch #117

Merged
merged 517 commits into from
Dec 25, 2024
Merged

[PEAUTY-265] Merge release branch into Develop branch #117

merged 517 commits into from
Dec 25, 2024

Conversation

harvartz
Copy link
Contributor

@harvartz harvartz commented Dec 22, 2024 •
edited
Loading

๐Ÿ“„ [PF-265] Merge release branch into Develop branch

Jira : PEAUTY-265

โœจ ๋ณ€๊ฒฝ ์‚ฌํ•ญ

  • ๊ธฐ๋Šฅ ์ถ”๊ฐ€/๋ณ€๊ฒฝ ์„ค๋ช…
  • ๋ฒ„๊ทธ ์ˆ˜์ • ์„ค๋ช…
  • ๋ฌธ์„œ ์ˆ˜์ • ์„ค๋ช…
  • release branch main ๋ธŒ๋žœ์น˜๋กœ ๋ณ‘ํ•ฉ
  • release v.0.0.1์„ ๊ทธ๋งŒ ์‚ฌ์šฉํ•˜๊ณ  ์ƒˆ๋กœ์šด ๋ฒ„์ „ ์—…๋ฐ์ดํŠธํ•˜๊ธฐ ์œ„ํ•ด ์ง„ํ–‰

๐Ÿ“… ์ž‘์—… ์ผ์ •

  • Expected MD: 0.1MD
  • Actual MD: 0.1MD

Difference reason (If correct, no need.)

  • None.

โœ”๏ธ ํ™•์ธ ์‚ฌํ•ญ

  • ์ฝ”๋“œ๊ฐ€ ์ž˜ ์ž‘๋™ํ•˜๋Š”์ง€ ํ™•์ธํ–ˆ๋‚˜์š”?
  • ์ƒˆ๋กœ์šด ๊ธฐ๋Šฅ์— ๋Œ€ํ•œ ํ…Œ์ŠคํŠธ๊ฐ€ ์ถ”๊ฐ€๋˜์—ˆ๋‚˜์š”?
  • ๋ฌธ์„œ๊ฐ€ ์—…๋ฐ์ดํŠธ๋˜์—ˆ๋‚˜์š”?

Shanate and others added 30 commits December 10, 2024 11:19
@Shanate
refactor: Change puppySize Eng -> Kor
5dd165c
@Shanate
refactor: Load DesignerId in GetARoundWorkspace API
8a3ba84
@Shanate
Merge pull request #64 from peauty/feature/PEAUTY-180
3d37816
@Shanate
Merge branch 'release/v0.1.0' of https://github.com/peauty/peauty-BE โ€ฆ
66d6787 
โ€ฆinto feature/PEAUTY-186
@Shanate
Merge pull request #65 from peauty/feature/PEAUTY-186
b89f130
@harvartz
feat: dev, prod ์„œ๋ฒ„ log๋ ˆ๋ฒจ info -> warn ๋ณ€๊ฒฝ
72cc8d2
@harvartz
feat: ์ถ”๊ฐ€ dev, prod ์„œ๋ฒ„ log๋ ˆ๋ฒจ info -> warn ๋ณ€๊ฒฝ(๋””์ž์ด๋„ˆ, ์ปค์Šคํ„ฐ๋จธ)
f5fcee3
@Shanate
style: Disease Enum Naming Confirmed
739e0a5
@Shanate
style: Disease Enum Naming Confirmed
b3fd3b8
@Shanate
Merge pull request #66 from peauty/feature/PEAUTY-186
32181c2
@weejinyoung
docs: add process thread docs
129eb74
@harvartz
feat: ๊ฒฐ์ œ ์‹œ์Šคํ…œ ํ”„๋กœํ† ํƒ€์ž… ํ™˜๊ฒฝ์„ค์ •
4b7c0ac
@harvartz
feat: ๋„๋ฉ”์ธ ์„ค๊ณ„
ab54529
@harvartz
feat: ๋น„์ฆˆ๋‹ˆ์Šค ๋กœ์ง ๋ฐ ์ •๋ฆฌ
5cf488f 
- ๊ฐ์ฒด ๋ชจ๋ธ ๋ณ€๊ฒฝ์— ๋”ฐ๋ผ์„œ ๋กœ์ง์ด ์ˆ˜์ •๋  ๊ฐ€๋Šฅ์„ฑ์ด ์žˆ์Šต๋‹ˆ๋‹ค
@weejinyoung
feat: impl getEstimateProposalProfiles (#67)
4d2efae
@harvartz
chore: health check๋ฅผ ์œ„ํ•ด acturator ์ถ”๊ฐ€
3c881b1
@harvartz
chore: health check๋ฅผ ์œ„ํ•ด acturator ์ถ”๊ฐ€
fd1634e
@harvartz
Merge pull request #68 from peauty/feature/PEAUTY-187
f96616b 
[PEAUTY-187] health check - actuator build gradle ์ถ”๊ฐ€
@harvartz
feat: security config actuator, static url ์ถ”๊ฐ€ํ•˜๊ธฐ
ba3aa87
@harvartz
Merge remote-tracking branch 'origin/release/v0.1.0' into release/v0.1.0
e0f43e7
@weejinyoung
feat: impl estimate to optional (#69)
927ece6
@weejinyoung
[PEAUTY-184] Refactor bidding select api (#70)
f2280e4 
* feat: add estimate profile in thread profile

* feat: add designer profile in response

* feat: estimate optionall
@Shanate
feat: Impl Review Rating & Count Logic
d0bbac0
@harvartz
feat: ๊ฒฐ์ œ ๊ฒ€์ฆ ๋ฐ ์™„๋ฃŒ
5880a1b
@harvartz
Merge branch 'release/v0.1.0' into feature/PEAUTY-169
7a41455
@harvartz
chore: logging warn ์ถ”๊ฐ€ ๋ฐ deisgner ๋ชจ๋“ˆ์—์„œ payment ์˜์กด์„ฑ ์ œ๊ฑฐ
91857e9
@harvartz
Merge remote-tracking branch 'origin/feature/PEAUTY-169' into featureโ€ฆ
976c6cf 
โ€ฆ/PEAUTY-169
@Shanate
style: Change Spell Capital -> Small Letter in Method
11d7f80
@Shanate
style: Specific Error Code
f5e2f3e
@weejinyoung
[PEAUTY-190] Add dummy data query (#72)
c6a81c3 
* feat: add dummy data query

* env: ddl auto none
harvartz and others added 23 commits December 18, 2024 21:37
@harvartz
Merge pull request #111 from peauty/feature/PEAUTY-258
5705e9a 
[PEAUTY-258] Workspace Update API for License Saving
@Shanate
refactor: refactor update review PathVariable
088950d
@Shanate
refactor: refactor delete review PathVariable
7879f90
@Shanate
refactor: TODO
21c70a8
@Shanate
refactor: TODO
d23978a
@Shanate
refactor: ResponseCode Change
d80910a
@Shanate
Merge branch 'release/v0.1.0' of https://github.com/peauty/peauty-BE โ€ฆ
64fa2e3 
โ€ฆinto feature/PEAUTY-259
@Shanate
Merge pull request #112 from peauty/feature/PEAUTY-259
ec63d43
@harvartz
docs: log ์‚ญ์ œ
24cb353
@harvartz
refactor: ์ฃผ๋ฌธ ์ฝ”๋“œ ์ถ”๊ฐ€
69b266a
@harvartz
fix: userId -> orderId ์ œ๊ฑฐ
4f9617d
@harvartz
refactor: ์‚ฌ์šฉํ•˜์ง€ ์•Š๋Š” ์ƒํƒœ ์ฝ”๋“œ ์‚ญ์ œ
b05b628
@harvartz
Merge pull request #113 from peauty/feature/PEAUTY-260
096b6f0 
[PEAUTY-260] Fix Order API
@weejinyoung
fix: change thread filter logic
20f495d
@weejinyoung
feat: add designer bidding select cost value (#114)
d74c9d4
@weejinyoung
feat: add style field in response
e9ac7c3
@Shanate
refactor: Add Enum ContentGeneral - Good Cost
797e556
@Shanate
Merge pull request #115 from peauty/feature/PEAUTY-262
d16eabd
@weejinyoung
fix: avoid null problem
b90019e
@Shanate
refactor: GOOD_COST value Change
c9830aa
@Shanate
feat: Add Logic about removing Images
fdd3c70
@Shanate
feat: add TODO
b6de25c
@Shanate
Merge pull request #116 from peauty/feature/PEAUTY-263
636b371
@harvartz harvartz added the ๐Ÿ› ๏ธ ๊ธฐ๋Šฅ New feature or request label Dec 22, 2024
@harvartz harvartz self-assigned this Dec 22, 2024
weejinyoung
weejinyoung approved these changes Dec 23, 2024
View reviewed changes
Copy link
Contributor

@weejinyoung weejinyoung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ๐Ÿ‘

Shanate
Shanate approved these changes Dec 23, 2024
View reviewed changes
Copy link
Contributor

@Shanate Shanate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :)

@harvartz harvartz merged commit 1411a8c into main Dec 25, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Shanate Shanate Shanate approved these changes

@weejinyoung weejinyoung weejinyoung approved these changes

Assignees

@harvartz harvartz

Labels
๐Ÿ› ๏ธ ๊ธฐ๋Šฅ New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@harvartz @weejinyoung @Shanate