-
Notifications
You must be signed in to change notification settings - Fork 1
[#23] pg수수료 ApplicationStartedEvent 로컬캐싱 전환 #28
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,11 +5,18 @@ | |
| import com.commerce.platform.core.domain.enums.PayProvider; | ||
| import com.commerce.platform.core.domain.enums.PgProvider; | ||
| import com.commerce.platform.infrastructure.adaptor.PgCacheService; | ||
| import com.commerce.platform.infrastructure.persistence.PgFeeInfo; | ||
| import com.commerce.platform.infrastructure.persistence.PgFeeInfoRepository; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.boot.context.event.ApplicationStartedEvent; | ||
| import org.springframework.context.event.EventListener; | ||
| import org.springframework.scheduling.annotation.Scheduled; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import java.util.Comparator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.TreeSet; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
|
|
@@ -23,22 +30,33 @@ public class PaymentPgRouter { | |
|
|
||
| private final Map<PgProvider, PgStrategy> pgStrategies; | ||
| private final PgCacheService pgCacheService; | ||
| private final PgFeeInfoRepository feeInfoRepository; | ||
| //결제방식 + 카드사/통신사 별 수수료기준 정렬됨 | ||
| private Map<PayMethod, Map<PayProvider, TreeSet<PgFeeInfo>>> pgFeeCache = null; | ||
|
|
||
| public PaymentPgRouter(List<PgStrategy> list, PgCacheService pgCacheService) { | ||
| public PaymentPgRouter(List<PgStrategy> list, PgCacheService pgCacheService, PgFeeInfoRepository feeInfoRepository) { | ||
| this.pgStrategies = list.stream() | ||
| .collect(Collectors.toMap(PgStrategy::getPgProvider, pg -> pg)); | ||
| this.pgCacheService = pgCacheService; | ||
| this.feeInfoRepository = feeInfoRepository; | ||
| } | ||
|
|
||
| @EventListener(ApplicationStartedEvent.class) | ||
| public void initPgCache() { | ||
| setPgFeeCache(); | ||
| } | ||
|
|
||
| /** | ||
| * 결제유형+카드사에 따라 PG 선택 | ||
| * Redis에서 캐싱 | ||
| * 결제유형 + 카드사 => 유효 PG 추출 | ||
| * redis 캐싱된 health check | ||
| */ | ||
| public PgStrategy routePg(PayMethod payMethod, PayProvider payProvider) { | ||
|
|
||
| List<PgProvider> supportedPgs = PgProvider.getByPayMethod(payMethod, payProvider); | ||
|
|
||
| PgProvider selectedPg = pgCacheService.getBestPg(payMethod, payProvider, supportedPgs); | ||
| PgProvider selectedPg = pgFeeCache.get(payMethod).get(payProvider) | ||
| .stream() | ||
| .filter(pgFeeInfo -> pgCacheService.isHealthy(pgFeeInfo.getPgProvider())) | ||
| .toList() | ||
| .getFirst() | ||
| .getPgProvider(); | ||
|
|
||
| if (selectedPg == null) { | ||
| throw new IllegalStateException("현재 사용 가능한 PG사가 없습니다"); | ||
|
|
@@ -48,7 +66,7 @@ public PgStrategy routePg(PayMethod payMethod, PayProvider payProvider) { | |
| } | ||
|
|
||
| /** | ||
| * PG Provider => Strategy 조회 | ||
| * PG Provider => Strategy bean 추출 | ||
| */ | ||
| public PgStrategy getPgStrategyByProvider(PgProvider pgProvider) { | ||
| PgStrategy strategy = pgStrategies.get(pgProvider); | ||
|
|
@@ -57,4 +75,20 @@ public PgStrategy getPgStrategyByProvider(PgProvider pgProvider) { | |
| } | ||
| return strategy; | ||
| } | ||
|
|
||
| @Scheduled(cron = "0 * * * * *") | ||
| private void refreshPgCache() { | ||
| setPgFeeCache(); | ||
| } | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 수수료 로컬캐시를 매일 0시에 업데이트 되는 코드를 추가했습니다.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
||
| private void setPgFeeCache() { | ||
| pgFeeCache = feeInfoRepository.findAllActiveAndValid() | ||
| .stream() | ||
| .collect(Collectors.groupingBy(PgFeeInfo::getPayMethod, | ||
| Collectors.groupingBy(PgFeeInfo::getPayProvider, | ||
| Collectors.toCollection(() -> | ||
| new TreeSet<>(Comparator.comparing(PgFeeInfo::getFeeRate)) | ||
| ) | ||
| ))); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,118 +1,25 @@ | ||
| package com.commerce.platform.infrastructure.adaptor; | ||
|
|
||
| import com.commerce.platform.core.domain.enums.PayMethod; | ||
| import com.commerce.platform.core.domain.enums.PayProvider; | ||
| import com.commerce.platform.core.domain.enums.PgProvider; | ||
| import com.commerce.platform.infrastructure.persistence.PgFeeInfo; | ||
| import com.commerce.platform.infrastructure.persistence.PgFeeInfoRepository; | ||
| import jakarta.annotation.PostConstruct; | ||
| import lombok.RequiredArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import org.springframework.data.redis.core.StringRedisTemplate; | ||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import java.util.Comparator; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * PG 라우팅을 위한 Redis 캐시 서비스 | ||
| * 수수료 낮은 순으로 정렬된 PG 목록 관리 | ||
| * 장애 PG는 제외 | ||
| * 장애 PG 캐싱 | ||
| */ | ||
| @Slf4j | ||
| @Service | ||
| @RequiredArgsConstructor | ||
| public class PgCacheService { | ||
|
|
||
| private final StringRedisTemplate redisTemplate; | ||
| private final PgFeeInfoRepository feeInfoRepository; | ||
|
|
||
| private static final String ROUTE_KEY_PREFIX = "pg:route:"; | ||
| private static final String HEALTH_KEY_PREFIX = "pg:health:"; | ||
|
|
||
| /** | ||
| * ZSet에 캐싱 확인 및 캐싱 | ||
| * key= pg:route:CARD:SHIN_HAN | ||
| * score: 수수료율 | ||
| */ | ||
| @PostConstruct | ||
| public void initPgCache() { | ||
| Set<String> keys = redisTemplate.keys(ROUTE_KEY_PREFIX + "*"); | ||
|
|
||
| if(!keys.isEmpty()) return; | ||
|
|
||
| // 전체 캐싱 | ||
| feeInfoRepository.findAllActiveAndValid() | ||
| .forEach(feeInfo -> { | ||
| String key = buildRouteKey(feeInfo.getPayMethod(), feeInfo.getPayProvider()); | ||
|
|
||
| redisTemplate.opsForZSet().add( | ||
| key, | ||
| feeInfo.getPgProvider().name(), | ||
| feeInfo.getFeeRate().doubleValue()); | ||
| }); | ||
| } | ||
|
|
||
| public PgProvider getBestPg(PayMethod payMethod, PayProvider payProvider, List<PgProvider> supportedPgs) { | ||
| // redis 조회 | ||
| Set<String> pgProviders = getAvailablePgsFromCache(payMethod, payProvider); | ||
|
|
||
| // miss | ||
| if (pgProviders == null || pgProviders.isEmpty()) { | ||
| pgProviders = refreshCache(payMethod, payProvider); | ||
| } | ||
|
|
||
| // 장애 PG 제외 첫번째 선택 | ||
| PgProvider bestPg = null; | ||
| for (String pgName : pgProviders) { | ||
| bestPg = PgProvider.getByPgName(pgName); | ||
| if (supportedPgs.contains(bestPg) && isHealthy(bestPg)) { | ||
| return bestPg; | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| /** | ||
| * ZSet 수수료 asc | ||
| */ | ||
| private Set<String> getAvailablePgsFromCache(PayMethod payMethod, PayProvider payProvider) { | ||
| String key = buildRouteKey(payMethod, payProvider); | ||
| return redisTemplate.opsForZSet().range(key, 0, -1); | ||
| } | ||
|
|
||
| /** | ||
| * DB에서 수수료 조회 및 Redis 캐싱 | ||
| * ZSet score: 수수료율 | ||
| */ | ||
| public Set<String> refreshCache(PayMethod payMethod, PayProvider payProvider) { | ||
| String key = buildRouteKey(payMethod, payProvider); | ||
| // DB 조회: 수수료 낮은 순 | ||
| List<PgFeeInfo> configs = feeInfoRepository | ||
| .findByPayMethodAndPayProvider(payMethod, payProvider); | ||
|
|
||
| // todo 별도 스레드로 하는것이 좋을지 | ||
| // 기존 캐시 삭제 | ||
| redisTemplate.delete(key); | ||
|
|
||
| for (PgFeeInfo config : configs) { | ||
| redisTemplate.opsForZSet().add( | ||
| key, | ||
| config.getPgProvider().name(), | ||
| config.getFeeRate().doubleValue() | ||
| ); | ||
| } | ||
| private static final String HEALTH_KEY_PREFIX = "pg:health:"; | ||
|
|
||
| return configs.stream() | ||
| .sorted(Comparator.comparing(PgFeeInfo::getFeeRate)) | ||
| .map(pgFeeInfo -> pgFeeInfo.getPgProvider().name()) | ||
| .collect(Collectors.toSet()); | ||
| } | ||
|
|
||
| /** | ||
| * PG 헬스 체크 | ||
| */ | ||
|
|
@@ -129,11 +36,4 @@ public void markPgAsUnhealthy(PgProvider pgProvider) { | |
| String healthKey = HEALTH_KEY_PREFIX + pgProvider.name(); | ||
| redisTemplate.opsForValue().set(healthKey, "ERROR", 30, TimeUnit.MINUTES); | ||
| } | ||
|
|
||
| /** | ||
| * Redis Key 생성: pg:route:CARD:SHIN_HAN | ||
| */ | ||
| private String buildRouteKey(PayMethod payMethod, PayProvider payProvider) { | ||
| return ROUTE_KEY_PREFIX + payMethod.name() + ":" + payProvider.name(); | ||
| } | ||
| } | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @f-lab-lyan 🙂 |
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@f-lab-lyan 🙂
PostConstruct 는 싱글톤 생성 락에서 실행되어, 외부bean작업 포함되는게 좋지 않다고해서
ApplicationStartedEvent 시에 초기화하는 방향으로 수정해봤습니다.