Skip to content

fix/327 랭킹 json 직렬화 문제 해결 #336

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

Merged
merged 2 commits into from
Jan 23, 2025
Merged

fix/327 랭킹 json 직렬화 문제 해결 #336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe6eb25
fix: 랭킹 json 직렬화 문제 해결
7zrv Jan 23, 2025
41ff1da
test: 누락된 테스트 클래스 추가
7zrv Jan 23, 2025
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
27 changes: 24 additions & 3 deletions ...java/com/somemore/domains/volunteerrecord/repository/VolunteerRankingRedisRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.somemore.domains.volunteerrecord.repository;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.somemore.domains.volunteerrecord.dto.response.VolunteerMonthlyRankingResponseDto;
import com.somemore.domains.volunteerrecord.dto.response.VolunteerRankingResponseDto;
import com.somemore.domains.volunteerrecord.dto.response.VolunteerTotalRankingResponseDto;
Expand Down Expand Up @@ -31,13 +34,29 @@ public void saveRanking(VolunteerRankingResponseDto rankings) {

@SuppressWarnings("unchecked")
public Optional<VolunteerRankingResponseDto> getRankings() {
ObjectMapper mapper = new ObjectMapper();

mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
mapper.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);

List<VolunteerTotalRankingResponseDto> totalRanking =
(List<VolunteerTotalRankingResponseDto>) redisTemplate.opsForValue().get(TOTAL_RANKING_KEY);
(List<VolunteerTotalRankingResponseDto>) Optional.ofNullable(redisTemplate.opsForValue().get(TOTAL_RANKING_KEY))
.map(obj -> mapper.convertValue(obj,
mapper.getTypeFactory().constructCollectionType(List.class, VolunteerTotalRankingResponseDto.class)))
.orElse(null);

List<VolunteerMonthlyRankingResponseDto> monthlyRanking =
(List<VolunteerMonthlyRankingResponseDto>) redisTemplate.opsForValue().get(MONTHLY_RANKING_KEY);
(List<VolunteerMonthlyRankingResponseDto>) Optional.ofNullable(redisTemplate.opsForValue().get(MONTHLY_RANKING_KEY))
.map(obj -> mapper.convertValue(obj,
mapper.getTypeFactory().constructCollectionType(List.class, VolunteerMonthlyRankingResponseDto.class)))
.orElse(null);

List<VolunteerWeeklyRankingResponseDto> weeklyRanking =
(List<VolunteerWeeklyRankingResponseDto>) redisTemplate.opsForValue().get(WEEKLY_RANKING_KEY);
(List<VolunteerWeeklyRankingResponseDto>) Optional.ofNullable(redisTemplate.opsForValue().get(WEEKLY_RANKING_KEY))
.map(obj -> mapper.convertValue(obj,
mapper.getTypeFactory().constructCollectionType(List.class, VolunteerWeeklyRankingResponseDto.class)))
.orElse(null);

if (totalRanking == null || monthlyRanking == null || weeklyRanking == null) {
return Optional.empty();
Expand All @@ -49,4 +68,6 @@ public Optional<VolunteerRankingResponseDto> getRankings() {
weeklyRanking
));
}


}
5 changes: 5 additions & 0 deletions src/main/java/com/somemore/global/redis/config/RedisConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.somemore.global.redis.config;

import com.somemore.domains.volunteerrecord.dto.response.VolunteerRankingResponseDto;
import com.somemore.global.common.event.ServerEventType;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -51,6 +52,10 @@ public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connec
template.setKeySerializer(new StringRedisSerializer());
template.setValueSerializer(new CustomJacksonRedisSerializer<>(Object.class));


template.setValueSerializer(new CustomJacksonRedisSerializer<>(VolunteerRankingResponseDto.class));
template.setHashValueSerializer(new CustomJacksonRedisSerializer<>(VolunteerRankingResponseDto.class));

return template;
}

Expand Down
Loading