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

1차 릴리즈 #88

Merged
merged 541 commits into from
Dec 19, 2023
Merged

1차 릴리즈 #88

merged 541 commits into from
Dec 19, 2023

Conversation

hi-june
Copy link
Member

@hi-june hi-june commented Dec 19, 2023

1차 릴리즈용 pr 입니다.

BeommoKoo-dev and others added 30 commits November 18, 2023 14:14
@BeommoKoo-dev
NABI-250--chore : yml 수정
ac448b0
@BeommoKoo-dev
Merge pull request #45 from team-nabi/NABI-257--beommo-fix-batch-and-…
c6f6857 
…dto-fields

NABI-257--fix : batch insert, field명 수정
@hi-june
Merge branch 'dev' into NABI-255--junhyuk--fix--card-list-read-with-c…
91c9f19 
…ursor-paging
@born-A
Merge branch 'dev' into NABI-252--yejin--fix--suggestion-available-cards
0f4a12d
@born-A
Merge pull request #46 from team-nabi/NABI-252--yejin--fix--suggestio…
0f9f1f4 
…n-available-cards

Nabi-252--fix  suggestion available cards 조회 이슈 해결. poke validation 조건 추가
@hi-june
Merge branch 'dev' into NABI-255--junhyuk--fix--card-list-read-with-c…
e7e1204 
…ursor-paging
@hi-june
Merge pull request #47 from team-nabi/NABI-255--junhyuk--fix--card-li…
2b327bb 
…st-read-with-cursor-paging

NABI-255--fix  card list read with cursor paging
@BeommoKoo-dev
Merge branch 'dev' into NABI-250--beommo-feat--famous-cards
7456fec
@BeommoKoo-dev
NABI-250--feat : 인기상품 조회 구현
e8f9fee
@BeommoKoo-dev
NABI-250--refactor : 잘못된 로직 수정, yml 수정
7680364
@BeommoKoo-dev
NABI-250--chore : sql script 수정
03744ee
@BeommoKoo-dev
NABI-250--refactor : 인기상품 controller에서 size받도록 수정
5b1a79e
@BeommoKoo-dev
Revert "NABI-250--refactor : 인기상품 controller에서 size받도록 수정"
e50c6b7 
This reverts commit 5b1a79e.
@BeommoKoo-dev
NO-JIRA--hotfix : 유저 프로필 업데이트 body로 받도록 변경
e71d198
@BeommoKoo-dev
Merge pull request #48 from team-nabi/NABI-250--beommo-feat--famous-c…
6e88f54 
…ards

NABI-250--feat : 인기상품 조회 기능 추가
@BeommoKoo-dev
Merge branch 'dev' into NO-JIRA--beommo--user-profile-update-hotfix
e833a12
@BeommoKoo-dev
NO-JIRA--remove : 미사용 메소드 삭제
633bc74
@born-A
NABI-252--refactor : batch update void 변경
4e19ab7
@BeommoKoo-dev
Merge pull request #49 from team-nabi/NO-JIRA--beommo--user-profile-u…
0ec3eba 
…pdate-hotfix

NO-JIRA--hotfix : 유저 프로필 업데이트 body로 받도록 변경
@born-A
NABI-NO-JIRA--style : cursorId -> nextCursorId
8368563
@hi-june
NABI-258--feat : OrderSpecifier(정렬 기준)을 반환하는 메소드 util에 추가
e567028
@hi-june
NABI-258--feat : 정렬 조건을 받을 수 있는 enum 추가
2d5e199
@hi-june
NABI-258--feat : 커서 기반 paging에 공통적으로 필요한 interface 추가
641e56f
@hi-june
NABI-258--feat : 정렬 조건에 따라 paging 하도록 추가
f633dcf
@born-A
Merge remote-tracking branch 'origin/dev' into NABI-252--yejin--fix--…
0fea86d 
…suggestion-available-cards
@born-A
Merge pull request #50 from team-nabi/NABI-252--yejin--fix--suggestio…
1ad1b36 
…n-available-cards

Nabi-NO-JIRA-fix : 이미지 다중 업로드 에러 로직 제거
@hi-june
NABI-258--hot-fix : 정렬 조건 추가
ca052ff
@born-A
NABI-261-fix : 제안 가능 카드 유형 poke. offer 조건 수정
0f15fd2
@BeommoKoo-dev
NO-JIRA--refactor : 프론트 요청에 따라 images에 thumbnail append 삭제
b1b3120
@born-A
NABI-261-fix : 제안 가능 카드 목록 조회 시 썸네일 null 들어가는 이슈 해결
b0ea8dd
born-A and others added 24 commits December 1, 2023 14:38
@born-A
NO-JIRA-chore : reissue 관련 merge --> push
d9ae7fb
@born-A
NO-JIRA-chore : reissue 관련 merge --> push
74305e7
@born-A
NO-JIRA-chore : reissue 관련 merge --> push
6ebc490
@born-A
NO-JIRA-hotfix : 거래성사요청 수락/거절 시 예외 던지지 않기
aa8f43f
@BeommoKoo-dev
Merge branch 'dev' into NO-JIRA--yejin--hotfix--suggestion-complete-r…
f8543d1 
…equest-bug
@BeommoKoo-dev
Merge pull request #84 from team-nabi/NO-JIRA--yejin--hotfix--suggest…
7992273 
…ion-complete-request-bug

No-jira-hotfix  : 거래 성사 제안 요청 시 예외를 던져 커밋이 안되는 이슈 해결
@hi-june
Merge branch 'dev' into NABI-351--feat--redisson-aply-update
632e70b 
# Conflicts:
#	src/main/java/org/prgrms/nabimarketbe/domain/card/repository/CardRepository.java
@hi-june
NABI-351--refactor : 누락된 메소드 추가
eb110a0
@BeommoKoo-dev
Merge pull request #85 from team-nabi/NABI-351--feat--redisson-aply-u…
b054809 
…pdate

NABI-351: Card ViewCount Cache
@BeommoKoo-dev
NO-JIRA--chore : oAuth2 패키지 domain으로 변경
e448cb3
@BeommoKoo-dev
NO-JIRA--chore : Role Enum user entity패키지로 변경
66a55a8
@BeommoKoo-dev
Merge pull request #86 from team-nabi/NO-JIRA--beommo--package-migration
68c6a70 
NO-JIRA--chore : package migration
@hi-june
NABI-374--feat : card 도메인 api 명세 추가
afe7256
@hi-june
NABI-374--feat : card 도메인 api 명세 추가
0b5548a
@hi-june
NABI-374--feat : chatroom 도메인 api 명세 추가
897eb08
@hi-june
NABI-374--feat : 거래 성사 도메인 api 명세 추가
55ef14f
@hi-june
NABI-374--feat : 찜하기 도메인 api 명세 추가
dc8a27d
@hi-june
NABI-374--feat : 알림 도메인 api 명세 추가
ccdfa72
@hi-june
NABI-374--feat : 거래제안 도메인 api 명세 추가
10c81e2
@hi-june
NABI-374--feat : user 도메인 api 명세 추가
73162f2
@hi-june
NABI-374--feat : 이미지 업로드 관련 api 명세 추가
88ab685
@hi-june
NABI-374--feat : 소셜 로그인 관련 api 명세 추가
f60ccdf
@hi-june
Merge branch 'dev' into NABI-374--junhyuk--chore--api-spec
cfe7cde 
# Conflicts:
#	src/main/java/org/prgrms/nabimarketbe/domain/oauth2/google/api/GoogleOAuth2Controller.java
#	src/main/java/org/prgrms/nabimarketbe/domain/oauth2/kakao/api/OAuth2Controller.java
@hi-june
Merge pull request #87 from team-nabi/NABI-374--junhyuk--chore--api-spec
878dcdd 
NABI-374 : API 명세 정리
@hi-june hi-june self-assigned this Dec 19, 2023
@hi-june hi-june merged commit dca1551 into main Dec 19, 2023
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BeommoKoo-dev BeommoKoo-dev BeommoKoo-dev approved these changes

@born-A born-A born-A approved these changes

Assignees

@hi-june hi-june

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hi-june @born-A @BeommoKoo-dev