Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 0 additions & 14 deletions src/main/java/com/planetrush/planetrush/core/config/AppConfig.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
package com.planetrush.planetrush.core.config;

import java.util.concurrent.TimeUnit;

import org.springframework.cache.CacheManager;
import org.springframework.cache.caffeine.CaffeineCacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.retry.annotation.EnableRetry;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.web.client.RestTemplate;

import com.github.benmanes.caffeine.cache.Caffeine;

@EnableAsync
@EnableRetry
@Configuration
Expand All @@ -22,12 +16,4 @@ public RestTemplate restTemplate() {
return new RestTemplate();
}

@Bean
public CacheManager cacheManager() {
CaffeineCacheManager cacheManager = new CaffeineCacheManager("challengeProgressAvg");
cacheManager.setCaffeine(
Caffeine.newBuilder().expireAfterWrite(24, TimeUnit.HOURS).recordStats()
);
return cacheManager;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package com.planetrush.planetrush.core.config;

import java.util.concurrent.TimeUnit;

import org.springframework.cache.CacheManager;
import org.springframework.cache.caffeine.CaffeineCacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import com.github.benmanes.caffeine.cache.Caffeine;

import lombok.AllArgsConstructor;
import lombok.Getter;

@Configuration
public class CacheConfig {

@Bean
public CacheManager cacheManager() {
CaffeineCacheManager cacheManager = new CaffeineCacheManager();
CacheType[] values = CacheType.values();
for (CacheType ct : CacheType.values()) {
cacheManager.registerCustomCache(ct.getCacheName(),
Caffeine.newBuilder().expireAfterWrite(ct.getDuration(), ct.getTimeUnit()).build());
}
return cacheManager;
}

@Getter
@AllArgsConstructor
enum CacheType {
CHALLENGE_AVG("challenge-avg", 24, TimeUnit.HOURS);

final String cacheName;
final int duration;
final TimeUnit timeUnit;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ public void addCorsMappings(CorsRegistry registry) {
public void addInterceptors(InterceptorRegistry registry) {
registry.addInterceptor(jwtInterceptor)
.addPathPatterns("/api/**")
.excludePathPatterns("/api/v1/members/auth/login/kakao", "/api/v1/members/auth/reissue", "/api/v1/planets/detail/**");
.excludePathPatterns("/api/v1/auth/login/kakao", "/api/v1/auth/reissue", "/api/v1/planets/detail/**");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public List<PlanetCollectionDto> getPlanetCollections(CollectionSearchCond searc
* <p>이 메서드는 반환값을 캐싱하여 관리합니다.</p>
* <p>캐시 미스가 발생하는 경우에만 플라스크 서버로 API 요청을 전송하여 새로운 데이터로 캐시에 저장합니다.</p>
*/
@Cacheable(cacheNames = "challengeProgressAvg", key = "#memberId")
@Cacheable(cacheNames = "challenge-avg", key = "#memberId")
@Override
public GetMyProgressAvgDto getMyProgressAvgPer(Long memberId) {
Member member = memberRepository.findById(memberId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

import com.planetrush.planetrush.core.jwt.JwtTokenProvider;
import com.planetrush.planetrush.core.jwt.dto.JwtToken;
import com.planetrush.planetrush.infra.oauth.dto.KakaoUserInfo;
import com.planetrush.planetrush.infra.oauth.util.KakaoUtil;
import com.planetrush.planetrush.member.domain.Member;
import com.planetrush.planetrush.member.domain.Nickname;
Expand Down Expand Up @@ -40,14 +39,16 @@ public class OAuthServiceImpl implements OAuthService {
*/
@Override
public LoginDto kakaoLogin(String accessToken) {
KakaoUserInfo kakaoUserInfo = kakaoUtil.getUserInfo(accessToken);
String email = kakaoUserInfo.getKakaoAccount().getEmail();
// KakaoUserInfo kakaoUserInfo = kakaoUtil.getUserInfo(accessToken);
// String email = kakaoUserInfo.getKakaoAccount().getEmail();
String email = "test@gmail.com";
Member member = memberRepository.findByEmailAndProviderAndStatus(email, Provider.KAKAO, Status.ACTIVE);
/* 회원가입 진행 */
if (member == null) {
member = memberRepository.save(Member.builder()
.email(email)
.ci(kakaoUserInfo.getId().toString())
// .ci(kakaoUserInfo.getId().toString())
.ci(accessToken)
.nickname(Nickname.getRandomKoreanNickname())
.provider(Provider.KAKAO)
.status(Status.ACTIVE)
Expand Down
Loading