Main

build.gradle

@@ -64,7 +64,9 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
     implementation 'org.springframework.kafka:spring-kafka'
+    implementation 'com.github.ben-manes.caffeine:caffeine'
     runtimeOnly 'software.amazon.msk:aws-msk-iam-auth:2.3.5'
     runtimeOnly 'org.postgresql:postgresql'
     compileOnly 'org.projectlombok:lombok'

src/main/java/site/holliverse/HolliverseApplication.java

@@ -2,7 +2,9 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
 
+@EnableCaching
 @SpringBootApplication(
         scanBasePackages = "site.holliverse"
 )

src/main/java/site/holliverse/admin/application/usecase/HandleLogFeatureUseCase.java

@@ -18,6 +18,8 @@
 @Profile("admin")
 public class HandleLogFeatureUseCase {
 
+    private static final ZoneId BASE_DATE_ZONE = ZoneId.of("Asia/Seoul");
+
     private final CalculateLogChurnScoreService calculateLogChurnScoreService;
 
     /**
@@ -35,7 +37,7 @@ public void execute(LogFeatureWebhookRequest request) {
 
         calculateLogChurnScoreService.calculateAndStore(
                 request.memberId(),
-                LocalDate.from(request.timeStamp()),
+                resolveBaseDate(request.timeStamp()),
                 List.of(new LogFeatureEvent(
                         resolveEventId(request),
                         request.timeStamp(),
@@ -55,4 +57,11 @@ private long resolveEventId(LogFeatureWebhookRequest request) {
         return Integer.toUnsignedLong((request.memberId() + "|" + request.eventType() + "|" + request.timeStamp()).hashCode());
     }
 
+    private LocalDate resolveBaseDate(Instant timestamp) {
+        return Optional.ofNullable(timestamp)
+                .orElseGet(Instant::now)
+                .atZone(BASE_DATE_ZONE)
+                .toLocalDate();
+    }
+
 }

src/main/java/site/holliverse/admin/application/usecase/RetrieveRegionalMetricUseCase.java

@@ -1,12 +1,14 @@
 package site.holliverse.admin.application.usecase;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import site.holliverse.admin.query.dao.AdminRegionalMetricDao;
 import site.holliverse.admin.query.dao.RegionalMetricRawData;
 import site.holliverse.admin.web.dto.analytics.AdminRegionalMetricRequestDto;
+import site.holliverse.shared.config.cache.CacheConfig;
 import site.holliverse.shared.alert.AlertOwner;
 import site.holliverse.shared.logging.SystemLogEvent;
 
@@ -24,6 +26,7 @@ public class RetrieveRegionalMetricUseCase {
     @Transactional(readOnly = true)
     @SystemLogEvent("admin.regional.metrics")
     @AlertOwner("bm")
+    @Cacheable(cacheNames = CacheConfig.REGIONAL_METRICS_CACHE, key = "#requestDto.yyyymm()",sync = true)
     public List<RegionalMetricRawData> execute(AdminRegionalMetricRequestDto requestDto) {
         return adminRegionalMetricDao.findRegionalAverages(requestDto.yyyymm());
     }

src/main/java/site/holliverse/admin/application/usecase/RetrieveRegionalTopPlanUseCase.java

@@ -1,12 +1,14 @@
 package site.holliverse.admin.application.usecase;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import site.holliverse.admin.query.dao.AdminRegionalTopPlanDao;
 import site.holliverse.admin.query.dao.RegionalSubscriberCountRawData;
 import site.holliverse.admin.query.dao.RegionalTopPlanRawData;
+import site.holliverse.shared.config.cache.CacheConfig;
 import site.holliverse.shared.alert.AlertOwner;
 import site.holliverse.shared.logging.SystemLogEvent;
 
@@ -43,6 +45,7 @@ public class RetrieveRegionalTopPlanUseCase {
     @Transactional(readOnly = true)
     @SystemLogEvent("admin.regional.topN")
     @AlertOwner("bm")
+    @Cacheable(cacheNames = CacheConfig.REGIONAL_TOP_PLANS_CACHE, sync = true)
     public List<RegionalTopPlanSummary> execute() {
 
         // 지역별

src/main/java/site/holliverse/admin/query/dao/AdminRegionalTopPlanDao.java

@@ -20,6 +20,7 @@
  * 지역별 Top 요금제/가입자 수 집계를 담당하는 DAO.
  * - 전지역 단위로 한 번에 집계한다.
  * - 기준 데이터는 활성 구독만 사용한다.
+ *
  * @author nonstop
  * @version 1.0.0
  * @since 2026-02-23
@@ -34,60 +35,82 @@ public class AdminRegionalTopPlanDao {
 
     /**
      * 전지역의 Top N 요금제명을 조회한다.
-     *
      * 정렬 기준(지역 내부):
      * 1) 요금제 가입자 수 내림차순
      * 2) 요금제명 오름차순 (이유 : 요금제명 오름차순을 안하면 같은 구독자일시 매번 요금제명이 달라질 수 있음)
-     *
      * 반환:
      * 지역과 top3 요금제
      */
     public List<RegionalTopPlanRawData> findTopPlansByAllProvinces(int limit) {
         Field<String> province = ADDRESS.PROVINCE.as("province");
+        Field<Long> memberId = MEMBER.MEMBER_ID.as("memberId");
         Field<String> planName = PRODUCT.NAME.as("planName");
-        // 지역별 순위를 만들기 위한 윈도우 함수(row_number)
-        Field<Integer> rankNo = DSL.rowNumber().over(
-                DSL.partitionBy(ADDRESS.PROVINCE)
-                        .orderBy(DSL.countDistinct(MEMBER.MEMBER_ID).desc(), PRODUCT.NAME.asc())
-        ).as("rankNo");
 
-        // 1단계: (지역, 요금제)별 가입자 수를 집계하고 지역 내부 순위를 계산
-        Table<?> ranked = dsl
-                .select(province, planName, rankNo)
+        //1. 먼저 지역 + 회원 + 요금제 기준으로 중복을 제거
+        // 원래 countDistinct(member_id)로 하던 일을 앞단의 distinct로 옮긴 단계였음.
+        Table<?> base = dsl
+                .selectDistinct(province, memberId, planName)
                 .from(SUBSCRIPTION)
                 .join(MEMBER).on(MEMBER.MEMBER_ID.eq(SUBSCRIPTION.MEMBER_ID))
                 .join(ADDRESS).on(ADDRESS.ADDRESS_ID.eq(MEMBER.ADDRESS_ID))
                 .join(PRODUCT).on(PRODUCT.PRODUCT_ID.eq(SUBSCRIPTION.PRODUCT_ID))
                 .where(SUBSCRIPTION.STATUS.isTrue())
                 .and(PRODUCT.PRODUCT_TYPE.eq(ProductTypeEnum.MOBILE_PLAN))
-                .groupBy(ADDRESS.PROVINCE, PRODUCT.NAME)
-                .asTable("ranked");
+                .asTable("base");
+        Field<String> baseProvince = base.field("province", String.class);
+        Field<String> basePlanName = base.field("planName", String.class);
 
-        Field<String> rankedProvince = ranked.field(province);
-        Field<String> rankedPlanName = ranked.field(planName);
-        Field<Integer> rankedRankNo = ranked.field(rankNo);
+        //2. 중복 제거된 결과에서 지역 + 요금제별 가입자 수를 카운트
+        // 개선안 : 여기서는 이미 회원 중복이 제거 됐으므로 countDistinct가 아니라 count(*)면 됨
+        Field<Integer> subscriberCount = DSL.count().as("subscriberCount");
+        Table<?> planCounts = dsl
+                .select(
+                        baseProvince,
+                        basePlanName,
+                        subscriberCount
+                )
+                .from(base)
+                .groupBy(baseProvince, basePlanName)
+                .asTable("planCounts");
 
-        // 2단계: 지역별 순위가 limit 이하인 데이터만 추출
-        return dsl
+        Field<String> countedProvince = planCounts.field("province", String.class);
+        Field<String> countedPlanName = planCounts.field("planName", String.class);
+        Field<Integer> countedSubscriberCount = planCounts.field("subscriberCount", Integer.class);
+
+        // 3. 지역별로 가입자 수 내림차순, 요금제명 오름차순 기준 rank를 만듬
+        Field<Integer> rankNo = DSL.rowNumber().over(
+                DSL.partitionBy(countedProvince)
+                        .orderBy(countedSubscriberCount.desc(), countedPlanName.asc())
+        ).as("rankNo");
+
+        Table<?> ranked = dsl
                 .select(
-                        rankedProvince,
-                        rankedPlanName
+                        countedProvince,
+                        countedPlanName,
+                        rankNo
                 )
+                .from(planCounts)
+                .asTable("ranked");
+
+        Field<String> rankedProvince = ranked.field("province", String.class);
+        Field<String> rankedPlanName = ranked.field("planName", String.class);
+        Field<Integer> rankedRankNo = ranked.field("rankNo", Integer.class);
+
+        // 4. 지역별 상위 N개만 추출하고 기존 DTO 형태로 반환
+        return dsl
+                .select(rankedProvince, rankedPlanName)
                 .from(ranked)
                 .where(rankedRankNo.le(limit))
-                .orderBy(
-                        rankedProvince.asc(),
-                        rankedRankNo.asc()
-                )
+                .orderBy(rankedProvince.asc(), rankedRankNo.asc())
                 .fetch(r -> new RegionalTopPlanRawData(
                         r.get(rankedProvince),
                         r.get(rankedPlanName)
                 ));
+
     }
 
     /**
      * 전지역 총 가입자 수를 조회한다.
-     *
      * 규칙:
      * - distinct(member_id) 기준
      * - 활성 구독(status=true)만 포함

src/main/java/site/holliverse/admin/web/controller/InternalLogFeatureController.java

@@ -9,7 +9,9 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import site.holliverse.admin.application.usecase.HandleLogFeatureUseCase;
+import site.holliverse.admin.application.usecase.LogFeaturesUseCase;
 import site.holliverse.admin.web.dto.log.LogFeatureWebhookRequest;
+import site.holliverse.admin.web.dto.log.LogFeaturesRequestDto;
 
 /**
  * 실시간 로그 기반 feature customer -> admin 전송 로직
@@ -20,6 +22,7 @@
 @RequiredArgsConstructor
 public class InternalLogFeatureController {
     private final HandleLogFeatureUseCase useCase;
+    private final LogFeaturesUseCase batchUseCase;
 
 
     @PostMapping
@@ -29,4 +32,11 @@ public ResponseEntity<Void> receive (@RequestBody @Valid LogFeatureWebhookReques
         return ResponseEntity.accepted().build();
     }
 
+    @PostMapping("/batch")
+    public ResponseEntity<Void> receiveBatch(@RequestBody @Valid LogFeaturesRequestDto request) {
+        batchUseCase.execute(request);
+
+        return ResponseEntity.accepted().build();
+    }
+
 }

src/main/java/site/holliverse/customer/application/usecase/log/AdminLogFeatureDispatchService.java

@@ -0,0 +1,59 @@
+package site.holliverse.customer.application.usecase.log;
+
+import lombok.extern.slf4j.Slf4j;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Profile;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import site.holliverse.customer.integration.external.AdminLogFeaturesClient;
+import site.holliverse.customer.persistence.entity.UserLogAdminDispatchOutbox;
+
+import java.util.List;
+
+/**
+ * admin log-feature 별도 executor로 분리
+ */
+@Slf4j
+@Service
+@Profile("customer")
+@RequiredArgsConstructor
+public class AdminLogFeatureDispatchService {
+
+    private final AdminLogFeaturesClient adminLogFeaturesClient;
+    private final UserLogAdminDispatchOutboxStateService stateService;
+
+    @Async("adminLogFeatureTaskExecutor")
+    public void dispatchBatch(List<UserLogAdminDispatchOutbox> rows) {
+        if (rows == null || rows.isEmpty()) {
+            return;
+        }
+
+        List<Long> eventIds = rows.stream()
+                .map(UserLogAdminDispatchOutbox::getEventId)
+                .toList();
+
+        try {
+            var result = adminLogFeaturesClient.sendLogFeaturesBatch(
+                    rows.get(0).getMemberId(),
+                    rows.stream()
+                            .map(row -> new AdminLogFeaturesClient.BatchLogEvent(
+                                    row.getEventId(),
+                                    row.getEventTimestamp().toString(),
+                                    row.getEventType(),
+                                    row.getEventName(),
+                                    row.getPayload().path("event_properties")
+                            ))
+                            .toList()
+            );
+
+            if (result.success()) {
+                stateService.markAcked(eventIds);
+                return;
+            }
+
+            stateService.markRetry(eventIds, result.errorMessage());
+        } catch (Exception e) {
+            stateService.markRetry(eventIds, e.getClass().getSimpleName() + ":" + e.getMessage());
+        }
+    }
+}