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

최종 PR #287

Merged
merged 400 commits into from
Sep 20, 2023
Merged

최종 PR #287

merged 400 commits into from
Sep 20, 2023

Conversation

AYoungSn
Copy link
Contributor

📌 개요

  • dev 충돌 해결 완료했습니다!

rrrmina and others added 30 commits August 22, 2023 13:06
@rrrmina
Merge pull request #216 from 42organization/GGBE4-43-fix-normal-game-…
62502d9 
…result

[GGBE4-43-fix-normal-game-result]노말 게임결과 코인 획등량 추가
@rrrmina
Merge pull request #219 from 42organization/GGBE4-17--megaphone-all-l…
73fd4c1 
…ist-api

[GGBE4-17--megaphone-all-list-api] 확성기 전체 조회 api 추가
@FeFe2200
[feat] GGBE4-44 랭크게임 코인 증가량 추가
a052133
@FeFe2200
[test] GGBE4-44 랭크게임 코인 증가량 테스트코드
533f564
@FeFe2200
[style] GGBE4-44 로그 제거
3a9bee2
@FeFe2200
[style] GGBE4-44 로그 제거2
5fa0794
@Sion99
[REFACTOR] 티어가 존재하지 않을때 처리
2464aeb
@Sion99
[FEAT] Tier Repository 추가
deaaaae
@Sion99
[TEST] Tier 테스트 코드 추가
e6e3d1a
@Sion99
[STYLE] Receipt 조회 엔드포인트 수정
0dabe20
@Sion99
Merge pull request #222 from 42organization/GGBE4-31-tier-api
b1772e3 
[GGBE4-31-tier-api] User 정보 조회에 Tier 정보 추가
@kylew1004
Merge pull request #221 from 42organization/GGBE4-44-feat-rank-game-r…
1ba5c9c 
…esult

[Ggbe4-44-feat-rank-game-result]랭크게임결과 코인증가량 추가
@FeFe2200
[fix] GGBE4-53 명세서랑 다른 부분 수정
d2f611e
@FeFe2200
[REFACTOR] GGBE4-54 출석 코인 증가 코인 서비스로 로직 이동 완료
c20ee97
@Sion99
[FEAT] ITEM 수정시 사진 저장기능 추가
ee457f6
@Sion99
[REFACTOR] ITEM UPDATE API put에서 post로 변경
822eb65
@Sion99
[TEST] ITEM UPDATE API 이미지 파일 테스트 코드 작성
bbe969f
@Sion99
[STYLE] 주석 삭제
a08125c
@Sion99
Merge pull request #225 from 42organization/GGBE4-52-Item-api-image
eef9284 
[GGBE4-52-Item-api-image] 아이템 수정 API 사진 업로드 추가
@8luerose
[FEAT] 유저별 아이템 보관함 리스트 조회 API
b1158c9
@FeFe2200
[refactor] GGBE4-54 함수 이름 변경
0ee5307
@8luerose
[REFACTOR] item Entity 수정(content->main,sub 두개로) + 상점 인기순 조회
4164311
@8luerose
[FIX] ItemUpdateRequestDto, @builder Item 병합
cb87bcb
@kylew1004
[FEAT] add profile image post
9d365c5
@kylew1004
[FEAT] add add_userImage_and_user_image_uri.
ee32bbf 
sql
@kylew1004
[FIX] V2.4 migration 수정
6dc08e2
@8luerose
[REFACTOR] 선물하기 하면 알림 발송
cf76009
@8luerose
[REFACTOR] 유저가 보관함 조회할때 BEFORE, USING, WAITING 보여줌
0d858a0
@kylew1004
[TEST] add profile image post test
f89717d
@kylew1004
[FIX] renamed to V2.5 migration
99d73ad
Sion99 and others added 12 commits September 19, 2023 20:32
@Sion99
[REFACTOR] 중복되는 정렬 제거
76039f9
@8luerose
Merge pull request #285 from 42organization/GGBE4-86--ItemStroreRespo…
3e0382d 
…nseDto-TestCode

[GGBE4-86--ItemStroreResponseDto-TestCode] 유저별 아이템 보관함 조회 테스트 코드 삭제
@Sion99
Merge pull request #286 from 42organization/GGBE4-87-ReceiptAdminRepo…
a008329 
…sitorySearch

[GGBE4-87-ReceiptAdminRepositorySearch] 중복되는 정렬 제거
@AYoungSn
Merge pull request #260 from 42organization/final_dev
e5c44d5 
4기 최종 코드리뷰
@Sion99
[REFACTOR] findAllByStatus 를 findAll로 변경
9ecf010
@Sion99
Merge pull request #288 from 42organization/GGBE4-88-GameAdminRepository
c8a2eb1 
[GGBE4-88-GameAdminRepository] GameAdminRepository 오류 수정
@Sion99
[REFACTOR] RankRedisService updateRankUser 추가
f5059dd
@Sion99
Merge pull request #289 from 42organization/GGBE4-89-RankRedis-PPP
f60fc53 
[GGBE4-89-RankRedis-PPP] 랭크게임 후 레디스 에러 해결
@Sion99
[REFACTOR] RankRedisService updateRankUser 수정
b2a6809
@AYoungSn
Merge pull request #290 from 42organization/GGBE4-89-RankRedis-PPP
740ae74 
[REFACTOR] RankRedisService updateRankUser 수정
@Sion99
[REFACTOR] RankRedisService updateRankUser 수정
3483f08
@AYoungSn
Merge pull request #291 from 42organization/GGBE4-89-RankRedis-PPP
6904eca 
[GGBE4-89-RankRedis-PPP] 랭크게임 후 레디스 에러 해결
@AYoungSn AYoungSn self-assigned this Sep 20, 2023
Sion99
Sion99 previously approved these changes Sep 20, 2023
View reviewed changes
8luerose
8luerose approved these changes Sep 20, 2023
View reviewed changes
Copy link
Contributor

@8luerose 8luerose left a comment

Choose a reason for hiding this comment

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

모두 정말로 고생 많으셨습니다!

@Sion99 Sion99 merged commit b035c0f into main Sep 20, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wken5577 wken5577 wken5577 left review comments

@Sion99 Sion99 Sion99 approved these changes

@8luerose 8luerose 8luerose approved these changes

Assignees

@AYoungSn AYoungSn

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@AYoungSn @Sion99 @wken5577 @8luerose @rrrmina @FeFe2200 @kylew1004