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

[Feat] dev to main merge #18

Merged
merged 51 commits into from
Jul 10, 2023
Merged

[Feat] dev to main merge #18

merged 51 commits into from
Jul 10, 2023

Conversation

funnysunny08
Copy link
Contributor

๐Ÿšฉ ๊ด€๋ จ ์ด์Šˆ

๐Ÿ“‹ ๊ตฌํ˜„ ๊ธฐ๋Šฅ ๋ช…์„ธ

  • [x]

๐Ÿ“Œ PR Point

  • ๋ฌด์Šจ ์ด์œ ๋กœ ์–ด๋–ป๊ฒŒ ์ฝ”๋“œ๋ฅผ ๋ณ€๊ฒฝํ–ˆ๋Š”์ง€

  • ์–ด๋–ค ๋ถ€๋ถ„์— ๋ฆฌ๋ทฐ์–ด๊ฐ€ ์ง‘์ค‘ํ•ด์•ผ ํ•˜๋Š”์ง€

  • ๊ฐœ๋ฐœํ•˜๋ฉด์„œ ์–ด๋–ค ์ ์ด ๊ถ๊ธˆํ–ˆ๋Š”์ง€

๐Ÿ“ธ ๊ฒฐ๊ณผ๋ฌผ ์Šคํฌ๋ฆฐ์ƒท

@Pattern(regexp = "^[\\S][๊ฐ€-ํžฃa-zA-Z0-9\\s]{0,20}$", message = "์œ„๋‹ˆ ํ”ผ๋“œ ์ œ๋ชฉ ํ˜•์‹์— ๋งž์ง€ ์•Š์Šต๋‹ˆ๋‹ค.")

๐Ÿ› ๏ธ ํ…Œ์ŠคํŠธ

  • ํ…Œ์ŠคํŠธ

๐Ÿš€ API Endpoint

  • /

funnysunny08 and others added 30 commits July 3, 2023 17:23
@funnysunny08
#1 [FEAT] user, goal, recommend entity ์ž‘์„ฑ ์™„๋ฃŒ
9757593
@funnysunny08
Merge remote-tracking branch 'origin/main' into feat/#1
2a70080
@funnysunny08
Merge remote-tracking branch 'origin/main' into feat/#1
21b5f42
@funnysunny08
Merge pull request #4 from team-winey/feat/#1
c3c777d 
[Feat] domain ์ž‘์„ฑ
@funnysunny08
[Refactor] ์ด์Šˆ ํ…œํ”Œ๋ฆฟ ์ˆ˜์ •
6370d37
@sss4920
#2 Feed,FeedLike domain ์ž‘์„ฑ
b938e52
@sss4920
Merge pull request #5 from team-winey/feat/#2
9eda01e 
#2 Feed,FeedLike domain ์ž‘์„ฑ
@funnysunny08
#7 [Feat] dto ์ž‘์„ฑ
8ec5ee6
@funnysunny08
#7 [Fix] Recommend entity ์ˆ˜์ •
30a7809
@funnysunny08
#7 [Feat] getRecommend dto ์ˆ˜์ • ๋ฐ ์ž‘์„ฑ ์™„๋ฃŒ
b12f7c1
@sss4920
#6 [Feat] FeedController ๊ตฌํ˜„
61d7e95
@sss4920
#6 [Fix] Feed dto ์ˆ˜์ •
de94b32
@funnysunny08
#7 [Feat] getRecommend Service ์ž‘์„ฑ
c238055
@funnysunny08
#7 [Feat] getRecommend Controller ์ž‘์„ฑ
7b63833
@funnysunny08
#7 [Feat] ์˜ˆ์™ธ ์ฒ˜๋ฆฌ ์ถ”๊ฐ€
aa5c661
@funnysunny08
#7 [Refactor] ๋ถˆํ•„์š”ํ•œ ์• ๋„ˆํ…Œ์ด์…˜ ์‚ญ์ œ
c3912c2
@funnysunny08
Merge pull request #8 from team-winey/feat/#7
724a5ae 
[Feat] getRecommend
@sss4920
[Feat] dev์™€ ๋จธ์ง€
6b7fb2b
@sss4920
Merge branch 'dev' of https://github.com/Money-IT/Winey-Server into fโ€ฆ
2671e50 
โ€ฆeat/#6
@sss4920
[Fix] 404 ์›์ธ์ฐพ๊ธฐ
ba436d4
@sss4920
[chore] repush
8c88b7d
@sss4920
[Chore] repush2
fdee12e
@sss4920
[feat] createFeed ์ˆ˜์ • but 500 ํ•ด๊ฒฐ๋ชปํ•จ
e076200
@funnysunny08
#9 [Chore] ํŒŒ์ผ ์ƒ์„ฑ
a201928
@funnysunny08
#9 [Feat] requestDto, responseDto
5384ee6
@funnysunny08
#9 [Feat] Goal Service
177c3bc
@funnysunny08
#9 [Feat] Goal Controller
9938f2d
@funnysunny08
#9 [Feat] targetDay, targetMoney validation ์ถ”๊ฐ€
e02fd7f
@funnysunny08
#9 [Fix] createdAt null ๋ฌธ์ œ ํ•ด๊ฒฐ
82ff208
@funnysunny08
#9 [Fix] Goal defulat ํ•„๋“œ ๋ฌธ์ œ
e5a3fcf
sss4920 and others added 21 commits July 7, 2023 00:18
@sss4920
[Feat] createFeed api ์ž‘์„ฑ
46046fa
@funnysunny08
#6 [Fix] @DynamicInsert
35d9f05
@funnysunny08
#6 [Fix] JpaRepository -> Repository๋กœ ๋ณ€๊ฒฝ
0ce36e5
@funnysunny08
Merge pull request #10 from team-winey/feat/#9
9ac94fc 
[Feat] createGoal
@sss4920
[Feat] merge dev
e0911bf
@funnysunny08
#14 [Fix] goal entity ์ˆ˜์ •
bcfd78f
@sss4920
[Refactor] updateUserGoalAmountAndCountํ•จ์ˆ˜ ๋งŒ๋“ค๊ธฐ, checkUserLevel๋กœ์ง ์ˆ˜์ •, uโ€ฆ
8a88db4 
โ€ฆpdateIsAttained ๋ฆฌํŒฉํ† ๋ง
@funnysunny08
#14 [Feat] UserResponseDto ์ž‘์„ฑ
e66dbb7
@funnysunny08
#14 [Feat] repository
52ef69a
@funnysunny08
#14 [Refactor] dto ์ˆ˜์ •
046e432
@sss4920
#13 [Refactor] createFeed ๋ฆฌ๋ฆฌํŒฉํ† ๋ง
4fa0239
@sss4920
createFeed merge ๋งˆ์ด๋ธŒ๋žœ์น˜
17efe0b
@funnysunny08
#14 [Feat] User Service
4355b47
@funnysunny08
#14 [Fix] targetDays ๊ณ„์‚ฐ ๋ฐฉ๋ฒ• ๋ณ€๊ฒฝ
ee98781
@funnysunny08
[Fix] response ๊ฐ’์ค‘์— isXX ๋ฌธ์ œ ํ•ด๊ฒฐ
897687a
@sss4920
#12 [Refactor] createFeed ๋ฆฌํŒฉํ† ๋ง ์™„๋ฃŒ
888d96a
@funnysunny08
#12 [Refactor] ํ”ผ๋“œ ์‚ญ์ œ ๋ฆฌํŒฉํ„ฐ๋ง
698b620
@funnysunny08
#12 [Fix] ํ”ผ๋“œ ์‚ญ์ œ url ๋ณ€๊ฒฝ
602b0b3
@sss4920
Merge pull request #16 from team-winey/feat/#12
bbe09d9 
Feat/#12 ํ”ผ๋“œ ์‚ญ์ œํ•˜๊ธฐ ๊ตฌํ˜„
@funnysunny08
Merge branch 'dev' into feat/#14
821fa58
@funnysunny08
Merge pull request #17 from team-winey/feat/#14
b55feef 
[Feat] getUser
@funnysunny08 funnysunny08 merged commit 8385d73 into main Jul 10, 2023
1 check 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.
2 participants
@funnysunny08 @sss4920