feat(analytics): Add card network filter (#6087)

Co-authored-by: hyperswitch-bot[bot] <148525504+hyperswitch-bot[bot]@users.noreply.github.com>
juspay · Sep 26, 2024 · 8049993 · 8049993
1 parent 809c92b
commit 8049993
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 2 deletions.
diff --git a/crates/analytics/src/opensearch.rs b/crates/analytics/src/opensearch.rs
@@ -280,7 +280,10 @@ impl HealthCheck for OpenSearchClient {
         if health.status != OpenSearchHealthStatus::Red {
             Ok(())
         } else {
-            Err(QueryExecutionError::DatabaseError.into())
+            Err::<(), error_stack::Report<QueryExecutionError>>(
+                QueryExecutionError::DatabaseError.into(),
+            )
+            .attach_printable_lazy(|| format!("Opensearch cluster health is red: {health:?}"))
         }
     }
 }

diff --git a/crates/analytics/src/payments/core.rs b/crates/analytics/src/payments/core.rs
@@ -296,6 +296,7 @@ pub async fn get_filters(
             PaymentDimensions::ClientSource => fil.client_source,
             PaymentDimensions::ClientVersion => fil.client_version,
             PaymentDimensions::ProfileId => fil.profile_id,
+            PaymentDimensions::CardNetwork => fil.card_network,
         })
         .collect::<Vec<String>>();
         res.query_data.push(FilterValue {

diff --git a/crates/analytics/src/payments/filters.rs b/crates/analytics/src/payments/filters.rs
@@ -59,4 +59,5 @@ pub struct PaymentFilterRow {
     pub client_source: Option<String>,
     pub client_version: Option<String>,
     pub profile_id: Option<String>,
+    pub card_network: Option<String>,
 }
diff --git a/crates/analytics/src/payments/types.rs b/crates/analytics/src/payments/types.rs
@@ -65,6 +65,25 @@ where
                 .add_filter_in_range_clause(PaymentDimensions::ProfileId, &self.profile_id)
                 .attach_printable("Error adding profile id filter")?;
         }
+        if !self.card_network.is_empty() {
+            let card_networks: Vec<String> = self
+                .card_network
+                .iter()
+                .flat_map(|cn| {
+                    [
+                        format!("\"{cn}\""),
+                        cn.to_string(),
+                        format!("\"{cn}\"").to_uppercase(),
+                    ]
+                })
+                .collect();
+            builder
+                .add_filter_in_range_clause(
+                    PaymentDimensions::CardNetwork,
+                    card_networks.as_slice(),
+                )
+                .attach_printable("Error adding card network filter")?;
+        }
         Ok(())
     }
 }
diff --git a/crates/analytics/src/sqlx.rs b/crates/analytics/src/sqlx.rs
@@ -489,6 +489,10 @@ impl<'a> FromRow<'a, PgRow> for super::payments::filters::PaymentFilterRow {
             ColumnNotFound(_) => Ok(Default::default()),
             e => Err(e),
         })?;
+        let card_network: Option<String> = row.try_get("card_network").or_else(|e| match e {
+            ColumnNotFound(_) => Ok(Default::default()),
+            e => Err(e),
+        })?;
         Ok(Self {
             currency,
             status,
@@ -499,6 +503,7 @@ impl<'a> FromRow<'a, PgRow> for super::payments::filters::PaymentFilterRow {
             client_source,
             client_version,
             profile_id,
+            card_network,
         })
     }
 }

diff --git a/crates/api_models/src/analytics/payments.rs b/crates/api_models/src/analytics/payments.rs
@@ -7,7 +7,8 @@ use common_utils::id_type;
 
 use super::{NameDescription, TimeRange};
 use crate::enums::{
-    AttemptStatus, AuthenticationType, Connector, Currency, PaymentMethod, PaymentMethodType,
+    AttemptStatus, AuthenticationType, CardNetwork, Connector, Currency, PaymentMethod,
+    PaymentMethodType,
 };
 
 #[derive(Clone, Debug, Default, serde::Deserialize, serde::Serialize)]
@@ -29,6 +30,8 @@ pub struct PaymentFilters {
     #[serde(default)]
     pub client_version: Vec<String>,
     #[serde(default)]
+    pub card_network: Vec<CardNetwork>,
+    #[serde(default)]
     pub profile_id: Vec<id_type::ProfileId>,
 }
 
@@ -64,6 +67,7 @@ pub enum PaymentDimensions {
     ClientSource,
     ClientVersion,
     ProfileId,
+    CardNetwork,
 }
 
 #[derive(