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

M3-288 유저 탈퇴시 레디스 삭제 안되는 문제 #64

Merged
merged 2 commits into from
Aug 17, 2024
Merged

M3-288 유저 탈퇴시 레디스 삭제 안되는 문제 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3db311a
Refactor : 회원 탈퇴 시 랭킹에서 삭제하는 기능 추가
qjvk2880 Aug 13, 2024
8d1ff5e
Feat : 테스트 추가
qjvk2880 Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/main/java/com/m3pro/groundflip/repository/RankingRedisRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,22 @@ public void decreaseCurrentPixelCount(Long userId) {
}
}

public void saveUserInRedis(Long userId) {
public void saveUserInRanking(Long userId) {
Double score = zSetOperations.score(RANKING_KEY, userId.toString());

if (score == null) {
zSetOperations.add(RANKING_KEY, userId.toString(), 0);
}
}

public void deleteUserInRanking(Long userId) {
Double score = zSetOperations.score(RANKING_KEY, userId.toString());

if (score != null) {
zSetOperations.remove(RANKING_KEY, userId.toString());
}
}

public List<Ranking> getRankingsWithCurrentPixelCount() {
Set<ZSetOperations.TypedTuple<String>> typedTuples = zSetOperations.reverseRangeWithScores(RANKING_KEY,
RANKING_START_INDEX, RANKING_END_INDEX);
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/m3pro/groundflip/service/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void putUserInfo(Long userId, UserInfoRequest userInfoRequest, MultipartF
user.updateStatus(UserStatus.COMPLETE);
user.updateProfileImage(fileS3Url);
userRepository.save(user);
rankingRedisRepository.saveUserInRedis(user.getId());
rankingRedisRepository.saveUserInRanking(user.getId());
}

private Date convertToDate(int year) {
Expand Down Expand Up @@ -133,6 +133,8 @@ public void deleteUser(Long userId, UserDeleteRequest userDeleteRequest) {

jwtProvider.expireToken(userDeleteRequest.getAccessToken());
jwtProvider.expireToken(userDeleteRequest.getRefreshToken());

rankingRedisRepository.deleteUserInRanking(userId);
}

private void revokeAppleToken(Long userId) {
Expand Down
31 changes: 23 additions & 8 deletions src/test/java/com/m3pro/groundflip/repository/RankingRedisRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ void increaseCurrentPixelCountTest() {
//Given
ZSetOperations<String, String> zSetOperations = redisTemplate.opsForZSet();
Long userId = 1L;
rankingRedisRepository.saveUserInRedis(userId);
rankingRedisRepository.saveUserInRanking(userId);

// When
rankingRedisRepository.increaseCurrentPixelCount(userId);
Expand Down Expand Up @@ -71,7 +71,7 @@ void decreaseCurrentPixelCountTest() {
//Given
ZSetOperations<String, String> zSetOperations = redisTemplate.opsForZSet();
Long userId = 1L;
rankingRedisRepository.saveUserInRedis(userId);
rankingRedisRepository.saveUserInRanking(userId);
rankingRedisRepository.increaseCurrentPixelCount(userId);
rankingRedisRepository.increaseCurrentPixelCount(userId);

Expand All @@ -89,7 +89,7 @@ void decreaseCurrentPixelCountTestCaseZero() {
//Given
ZSetOperations<String, String> zSetOperations = redisTemplate.opsForZSet();
Long userId = 1L;
rankingRedisRepository.saveUserInRedis(userId);
rankingRedisRepository.saveUserInRanking(userId);

// When
rankingRedisRepository.decreaseCurrentPixelCount(userId);
Expand All @@ -101,19 +101,34 @@ void decreaseCurrentPixelCountTestCaseZero() {

@Test
@DisplayName("[save] userId 를 넣으면 0으로 초기화 한다.")
void saveUserInRedisTest() {
void saveUserInRankingTest() {
//Given
ZSetOperations<String, String> zSetOperations = redisTemplate.opsForZSet();
Long userId = 1L;

// When
rankingRedisRepository.saveUserInRedis(userId);
rankingRedisRepository.saveUserInRanking(userId);

// Then
Double score = zSetOperations.score(RANKING_KEY, userId.toString());
assertThat(score).isEqualTo(0);
}

@Test
@DisplayName("[delete] userId를 레디스에서 지울 수 있다.")
void deleteUserInRankingTest() {
//Given
ZSetOperations<String, String> zSetOperations = redisTemplate.opsForZSet();
Long userId = 1L;

// When
rankingRedisRepository.deleteUserInRanking(userId);

// Then
Double score = zSetOperations.score(RANKING_KEY, userId.toString());
assertThat(score).isEqualTo(null);
}

@Test
@DisplayName("[getRankingsWithScore] 점수 순으로 내림차순으로 30개가 리스트에 반환된다. 30개가 되지 않는다면 채워진 개수만 반환한다.")
void getRankingsWithScoreTest() {
Expand Down Expand Up @@ -199,9 +214,9 @@ void getUserCurrentPixelCountTestNull() {
}

private void setRanking(Long userId1, Long userId2, Long userId3) {
rankingRedisRepository.saveUserInRedis(userId1);
rankingRedisRepository.saveUserInRedis(userId2);
rankingRedisRepository.saveUserInRedis(userId3);
rankingRedisRepository.saveUserInRanking(userId1);
rankingRedisRepository.saveUserInRanking(userId2);
rankingRedisRepository.saveUserInRanking(userId3);

rankingRedisRepository.increaseCurrentPixelCount(userId1);
rankingRedisRepository.increaseCurrentPixelCount(userId1);
Expand Down
Loading