Skip to content

Refactor/#167 대시보드 성과 집계 방식 개선 - 조직 기반 데이터 집계로 수정 #170

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
ojy0903 merged 9 commits into from
Jul 8, 2026
+15 −12
Merged

Refactor/#167 대시보드 성과 집계 방식 개선 - 조직 기반 데이터 집계로 수정 #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
91224c8
:recycle: refactor: MetricFactRepository 내부 대시보드용 메서드 개선
ojy0903 Jul 7, 2026
cc72a32
:recycle: refactor: DashboardServiceImpl 내부 조직 단위로 Metricfact 최신 시간 값…
ojy0903 Jul 7, 2026
9f89cef
:recycle: refactor: 미사용 import 문 제거
ojy0903 Jul 7, 2026
265ac3d
:recycle: refactor: 집계 기준 날짜 최적화
ojy0903 Jul 7, 2026
def4556
:art: style: 주석 내용 수정
ojy0903 Jul 7, 2026
6e69ffa
Revert ":recycle: refactor: MetricFactRepository 내부 대시보드용 메서드 개선"
ojy0903 Jul 8, 2026
c046e98
:recycle: refactor: MetricFactRepository 커밋 revert 및 가장 최근 timeBucket…
ojy0903 Jul 8, 2026
98b7ad8
Merge remote-tracking branch 'origin/refactor/#167' into refactor/#167
ojy0903 Jul 8, 2026
1ce752e
:art: style: 주석 수정
ojy0903 Jul 8, 2026
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: 6 additions & 4 deletions ...reyouad/WhereYouAd/domains/advertisement/persistence/repository/MetricFactRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ public interface MetricFactRepository extends JpaRepository<MetricFact, Long> {
BigDecimal sumSpendsByUserIdAndOrgIdAndProvider(@Param("userId") Long userId, @Param("orgId") Long orgId,
@Param("provider") Provider provider);

//전체 지표 조회 로직에서 사용
// 해당 프로젝트의 가장 최신 데이터 날짜를 가져오는 쿼리
@Query("SELECT MAX(m.timeBucket) FROM MetricFact m")
Optional<LocalDateTime> findLatestTimeBucket();
// 전체 지표 조회 로직에서 사용
// 해당 조직(orgId)의 가장 최신 timeBucket을 가져오는 쿼리
@Query("SELECT MAX(m.timeBucket) FROM MetricFact m " +
"JOIN m.project p " +
"WHERE p.organization.id = :orgId")
Optional<LocalDateTime> findLatestTimeBucketByOrgId(@Param("orgId") Long orgId);
Comment thread
ojy0903 marked this conversation as resolved.

// orgId에 속한 모든 프로젝트의 지표중 해당 MetricFact 가 속한 AdCampaign 의 status 가 ON_GOING 인 지표를 지정된 기간 범위 합산
@Query("SELECT " +
Expand Down
17 changes: 9 additions & 8 deletions ...java/com/whereyouad/WhereYouAd/domains/dashboard/domain/service/DashboardServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.whereyouad.WhereYouAd.domains.advertisement.domain.constant.Status;
import com.whereyouad.WhereYouAd.domains.advertisement.exception.AdvertisementHandler;
import com.whereyouad.WhereYouAd.domains.advertisement.exception.code.AdvertisementErrorCode;
import com.whereyouad.WhereYouAd.domains.advertisement.domain.constant.BudgetFieldType;
import com.whereyouad.WhereYouAd.domains.advertisement.persistence.entity.BudgetHistory;
import com.whereyouad.WhereYouAd.domains.advertisement.persistence.repository.AdCampaignRepository;
import com.whereyouad.WhereYouAd.domains.advertisement.domain.constant.Provider;
Expand Down Expand Up @@ -109,14 +108,16 @@ public DashboardResponse.AggregatedSummaryResponse getAggregatedMetrics(Long use
throw new DashboardException(ProjectErrorCode.ACCESS_FORBIDDEN);
}

//DB 내부 Mock data 중 가장 최근의 timeBucket 값 추출
LocalDateTime latestDate = metricFactRepository.findLatestTimeBucket()
//DB 내부 Mock data 중 조직별로 가장 최근의 timeBucket 값 추출
LocalDateTime latestDate = metricFactRepository.findLatestTimeBucketByOrgId(orgId)
.orElse(LocalDateTime.now());

//DB 내부 Mock data 중 가장 최근의 timeBucket 값 기반 한달전, 두달전 기준 정립
LocalDateTime oneMonthAgo = latestDate.minusMonths(1);
//집계에서 가장 최신 timeBucket 을 포함하기 위해 하루 뒤를 상한으로 사용
LocalDateTime currentEnd = latestDate.plusDays(1);

LocalDateTime twoMonthsAgo = latestDate.minusMonths(2);
//가장 최근 timeBucket 기준 한달전, 두달전 기준 정립
LocalDateTime oneMonthAgo = currentEnd.minusMonths(1);
LocalDateTime twoMonthsAgo = currentEnd.minusMonths(2);

MetricSumProjection currentProjection;
MetricSumProjection pastProjection;
Expand All @@ -125,7 +126,7 @@ public DashboardResponse.AggregatedSummaryResponse getAggregatedMetrics(Long use
//시간값들과 회원이 속한 project 리스트 기반 projection 으로 DB 에서
//TotalImpressions, TotalClicks, TotalConversions, TotalSpend, TotalRevenue 를 집계해서 가져오기
currentProjection = metricFactRepository.findMetricsSumByOrgIdAndDateRange(
orgId, oneMonthAgo, latestDate, OrgStatus.ACTIVE, Status.ON_GOING
orgId, oneMonthAgo, currentEnd, OrgStatus.ACTIVE, Status.ON_GOING
); //가장 최근 ~ 한달 전의 집계 projection

pastProjection = metricFactRepository.findMetricsSumByOrgIdAndDateRange(
Expand All @@ -141,7 +142,7 @@ public DashboardResponse.AggregatedSummaryResponse getAggregatedMetrics(Long use
throw new DashboardException(DashboardErrorCode.PROVIDER_NOT_VALID);
}
currentProjection = metricFactRepository.findMetricsSumByOrgIdAndProvider(
orgId, provider, oneMonthAgo, latestDate, OrgStatus.ACTIVE, Status.ON_GOING);
orgId, provider, oneMonthAgo, currentEnd, OrgStatus.ACTIVE, Status.ON_GOING);
pastProjection = metricFactRepository.findMetricsSumByOrgIdAndProvider(
orgId, provider, twoMonthsAgo, oneMonthAgo, OrgStatus.ACTIVE, Status.ON_GOING);
}
Expand Down
Loading