-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:juspay/hyperswitch into multiple-cr…
…ed-cypress * 'main' of github.com:juspay/hyperswitch: chore(version): 2024.11.27.0 fix(core): add payment_id as query param in merchant return url (#6665) feat(connector): [Netcetera] add sca exemption (#6611) feat(payments): propagate additional payment method data for google pay during MIT (#6644) feat: Added grpc based health check (#6441) feat(analytics): add `sessionized_metrics` for disputes analytics (#6573)
- Loading branch information
Showing
35 changed files
with
893 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
crates/analytics/src/disputes/metrics/sessionized_metrics/dispute_status_metric.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| use std::collections::HashSet; | ||
|
|
||
| use api_models::analytics::{ | ||
| disputes::{DisputeDimensions, DisputeFilters, DisputeMetricsBucketIdentifier}, | ||
| Granularity, TimeRange, | ||
| }; | ||
| use common_utils::errors::ReportSwitchExt; | ||
| use error_stack::ResultExt; | ||
| use time::PrimitiveDateTime; | ||
|
|
||
| use super::DisputeMetricRow; | ||
| use crate::{ | ||
| enums::AuthInfo, | ||
| query::{Aggregate, GroupByClause, QueryBuilder, QueryFilter, SeriesBucket, ToSql, Window}, | ||
| types::{AnalyticsCollection, AnalyticsDataSource, MetricsError, MetricsResult}, | ||
| }; | ||
| #[derive(Default)] | ||
| pub(crate) struct DisputeStatusMetric {} | ||
|
|
||
| #[async_trait::async_trait] | ||
| impl<T> super::DisputeMetric<T> for DisputeStatusMetric | ||
| where | ||
| T: AnalyticsDataSource + super::DisputeMetricAnalytics, | ||
| PrimitiveDateTime: ToSql<T>, | ||
| AnalyticsCollection: ToSql<T>, | ||
| Granularity: GroupByClause<T>, | ||
| Aggregate<&'static str>: ToSql<T>, | ||
| Window<&'static str>: ToSql<T>, | ||
| { | ||
| async fn load_metrics( | ||
| &self, | ||
| dimensions: &[DisputeDimensions], | ||
| auth: &AuthInfo, | ||
| filters: &DisputeFilters, | ||
| granularity: &Option<Granularity>, | ||
| time_range: &TimeRange, | ||
| pool: &T, | ||
| ) -> MetricsResult<HashSet<(DisputeMetricsBucketIdentifier, DisputeMetricRow)>> | ||
| where | ||
| T: AnalyticsDataSource + super::DisputeMetricAnalytics, | ||
| { | ||
| let mut query_builder = QueryBuilder::new(AnalyticsCollection::DisputeSessionized); | ||
|
|
||
| for dim in dimensions { | ||
| query_builder.add_select_column(dim).switch()?; | ||
| } | ||
|
|
||
| query_builder.add_select_column("dispute_status").switch()?; | ||
|
|
||
| query_builder | ||
| .add_select_column(Aggregate::Count { | ||
| field: None, | ||
| alias: Some("count"), | ||
| }) | ||
| .switch()?; | ||
| query_builder | ||
| .add_select_column(Aggregate::Min { | ||
| field: "created_at", | ||
| alias: Some("start_bucket"), | ||
| }) | ||
| .switch()?; | ||
| query_builder | ||
| .add_select_column(Aggregate::Max { | ||
| field: "created_at", | ||
| alias: Some("end_bucket"), | ||
| }) | ||
| .switch()?; | ||
|
|
||
| filters.set_filter_clause(&mut query_builder).switch()?; | ||
|
|
||
| auth.set_filter_clause(&mut query_builder).switch()?; | ||
|
|
||
| time_range.set_filter_clause(&mut query_builder).switch()?; | ||
|
|
||
| for dim in dimensions { | ||
| query_builder.add_group_by_clause(dim).switch()?; | ||
| } | ||
|
|
||
| query_builder | ||
| .add_group_by_clause("dispute_status") | ||
| .switch()?; | ||
|
|
||
| if let Some(granularity) = granularity.as_ref() { | ||
| granularity | ||
| .set_group_by_clause(&mut query_builder) | ||
| .switch()?; | ||
| } | ||
|
|
||
| query_builder | ||
| .execute_query::<DisputeMetricRow, _>(pool) | ||
| .await | ||
| .change_context(MetricsError::QueryBuildingError)? | ||
| .change_context(MetricsError::QueryExecutionFailure)? | ||
| .into_iter() | ||
| .map(|i| { | ||
| Ok(( | ||
| DisputeMetricsBucketIdentifier::new( | ||
| i.dispute_stage.as_ref().map(|i| i.0), | ||
| i.connector.clone(), | ||
| TimeRange { | ||
| start_time: match (granularity, i.start_bucket) { | ||
| (Some(g), Some(st)) => g.clip_to_start(st)?, | ||
| _ => time_range.start_time, | ||
| }, | ||
| end_time: granularity.as_ref().map_or_else( | ||
| || Ok(time_range.end_time), | ||
| |g| i.end_bucket.map(|et| g.clip_to_end(et)).transpose(), | ||
| )?, | ||
| }, | ||
| ), | ||
| i, | ||
| )) | ||
| }) | ||
| .collect::<error_stack::Result< | ||
| HashSet<(DisputeMetricsBucketIdentifier, DisputeMetricRow)>, | ||
| crate::query::PostProcessingError, | ||
| >>() | ||
| .change_context(MetricsError::PostProcessingFailure) | ||
| } | ||
| } |
8 changes: 8 additions & 0 deletions
8
crates/analytics/src/disputes/metrics/sessionized_metrics/mod.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| mod dispute_status_metric; | ||
| mod total_amount_disputed; | ||
| mod total_dispute_lost_amount; | ||
| pub(super) use dispute_status_metric::DisputeStatusMetric; | ||
| pub(super) use total_amount_disputed::TotalAmountDisputed; | ||
| pub(super) use total_dispute_lost_amount::TotalDisputeLostAmount; | ||
|
|
||
| pub use super::{DisputeMetric, DisputeMetricAnalytics, DisputeMetricRow}; |
Oops, something went wrong.