mirror of
https://github.com/juspay/hyperswitch.git
synced 2025-11-04 05:59:48 +08:00
feat(analytics): refactor and introduce analytics APIs to accommodate OrgLevel, MerchantLevel and ProfileLevel authentication (#5729)
Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com> Co-authored-by: Sampras Lopes <sampras.lopes@juspay.in>
This commit is contained in:
@ -21,6 +21,7 @@ use super::{
|
||||
metrics::ApiEventMetricRow,
|
||||
};
|
||||
use crate::{
|
||||
enums::AuthInfo,
|
||||
errors::{AnalyticsError, AnalyticsResult},
|
||||
metrics,
|
||||
types::FiltersError,
|
||||
@ -51,7 +52,7 @@ pub async fn api_events_core(
|
||||
pub async fn get_filters(
|
||||
pool: &AnalyticsProvider,
|
||||
req: GetApiEventFiltersRequest,
|
||||
merchant_id: &common_utils::id_type::MerchantId,
|
||||
auth: &AuthInfo,
|
||||
) -> AnalyticsResult<ApiEventFiltersResponse> {
|
||||
use api_models::analytics::{api_event::ApiEventDimensions, ApiEventFilterValue};
|
||||
|
||||
@ -68,8 +69,7 @@ pub async fn get_filters(
|
||||
AnalyticsProvider::Clickhouse(ckh_pool)
|
||||
| AnalyticsProvider::CombinedSqlx(_, ckh_pool)
|
||||
| AnalyticsProvider::CombinedCkh(_, ckh_pool) => {
|
||||
get_api_event_filter_for_dimension(dim, merchant_id, &req.time_range, ckh_pool)
|
||||
.await
|
||||
get_api_event_filter_for_dimension(dim, auth, &req.time_range, ckh_pool).await
|
||||
}
|
||||
}
|
||||
.switch()?
|
||||
@ -92,7 +92,7 @@ pub async fn get_filters(
|
||||
#[instrument(skip_all)]
|
||||
pub async fn get_api_event_metrics(
|
||||
pool: &AnalyticsProvider,
|
||||
merchant_id: &common_utils::id_type::MerchantId,
|
||||
auth: &AuthInfo,
|
||||
req: GetApiEventMetricRequest,
|
||||
) -> AnalyticsResult<MetricsResponse<ApiMetricsBucketResponse>> {
|
||||
let mut metrics_accumulator: HashMap<ApiEventMetricsBucketIdentifier, ApiEventMetricRow> =
|
||||
@ -109,14 +109,14 @@ pub async fn get_api_event_metrics(
|
||||
|
||||
// TODO: lifetime issues with joinset,
|
||||
// can be optimized away if joinset lifetime requirements are relaxed
|
||||
let merchant_id_scoped = merchant_id.to_owned();
|
||||
let auth_scoped = auth.to_owned();
|
||||
set.spawn(
|
||||
async move {
|
||||
let data = pool
|
||||
.get_api_event_metrics(
|
||||
&metric_type,
|
||||
&req.group_by_names.clone(),
|
||||
&merchant_id_scoped,
|
||||
&auth_scoped,
|
||||
&req.filters,
|
||||
&req.time_series.map(|t| t.granularity),
|
||||
&req.time_range,
|
||||
|
||||
Reference in New Issue
Block a user