fix: updated AnalyticsCollection for connector event metrics

juspay · May 6, 2024 · 0872ae2 · 0872ae2
1 parent fa54dd0
commit 0872ae2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/crates/analytics/src/auth_events/metrics/challenge_attempt_count.rs b/crates/analytics/src/auth_events/metrics/challenge_attempt_count.rs
@@ -34,7 +34,7 @@ where
         pool: &T,
     ) -> MetricsResult<Vec<(AuthEventMetricsBucketIdentifier, AuthEventMetricRow)>> {
         let mut query_builder: QueryBuilder<T> =
-            QueryBuilder::new(AnalyticsCollection::ConnectorEvents);
+            QueryBuilder::new(AnalyticsCollection::ConnectorEventsAnalytics);
 
         query_builder
             .add_select_column(Aggregate::Count {

diff --git a/crates/analytics/src/auth_events/metrics/challenge_success_count.rs b/crates/analytics/src/auth_events/metrics/challenge_success_count.rs
@@ -34,7 +34,7 @@ where
         pool: &T,
     ) -> MetricsResult<Vec<(AuthEventMetricsBucketIdentifier, AuthEventMetricRow)>> {
         let mut query_builder: QueryBuilder<T> =
-            QueryBuilder::new(AnalyticsCollection::ConnectorEvents);
+            QueryBuilder::new(AnalyticsCollection::ConnectorEventsAnalytics);
 
         query_builder
             .add_select_column(Aggregate::Count {

diff --git a/crates/analytics/src/clickhouse.rs b/crates/analytics/src/clickhouse.rs
@@ -136,7 +136,7 @@ impl AnalyticsDataSource for ClickhouseClient {
             AnalyticsCollection::SdkEvents
             | AnalyticsCollection::ApiEvents
             | AnalyticsCollection::ConnectorEvents
-            | AnalyticsCollection::AuthEvents
+            | AnalyticsCollection::ConnectorEventsAnalytics
             | AnalyticsCollection::OutgoingWebhookEvent => TableEngine::BasicTree,
         }
     }
@@ -373,7 +373,8 @@ impl ToSql<ClickhouseClient> for AnalyticsCollection {
             Self::Payment => Ok("payment_attempts".to_string()),
             Self::Refund => Ok("refunds".to_string()),
             Self::SdkEvents => Ok("sdk_events_audit".to_string()),
-            Self::ApiEvents | Self::AuthEvents => Ok("api_events_audit".to_string()),
+            Self::ApiEvents => Ok("api_events_audit".to_string()),
+            Self::ConnectorEventsAnalytics => Ok("connector_events".to_string()),
             Self::PaymentIntent => Ok("payment_intents".to_string()),
             Self::ConnectorEvents => Ok("connector_events_audit".to_string()),
             Self::OutgoingWebhookEvent => Ok("outgoing_webhook_events_audit".to_string()),

diff --git a/crates/analytics/src/sqlx.rs b/crates/analytics/src/sqlx.rs
@@ -512,13 +512,13 @@ impl ToSql<SqlxClient> for AnalyticsCollection {
             Self::Refund => Ok("refund".to_string()),
             Self::SdkEvents => Err(error_stack::report!(ParsingError::UnknownError)
                 .attach_printable("SdkEvents table is not implemented for Sqlx"))?,
-            Self::AuthEvents => Err(error_stack::report!(ParsingError::UnknownError)
-                .attach_printable("ApiEvents table is not implemented for Sqlx"))?,
             Self::ApiEvents => Err(error_stack::report!(ParsingError::UnknownError)
                 .attach_printable("ApiEvents table is not implemented for Sqlx"))?,
             Self::PaymentIntent => Ok("payment_intent".to_string()),
-            Self::ConnectorEvents => Err(error_stack::report!(ParsingError::UnknownError)
-                .attach_printable("ConnectorEvents table is not implemented for Sqlx"))?,
+            Self::ConnectorEvents | Self::ConnectorEventsAnalytics => {
+                Err(error_stack::report!(ParsingError::UnknownError)
+                    .attach_printable("ConnectorEvents table is not implemented for Sqlx"))?
+            }
             Self::OutgoingWebhookEvent => Err(error_stack::report!(ParsingError::UnknownError)
                 .attach_printable("OutgoingWebhookEvents table is not implemented for Sqlx"))?,
             Self::Dispute => Ok("dispute".to_string()),

diff --git a/crates/analytics/src/types.rs b/crates/analytics/src/types.rs
@@ -31,7 +31,7 @@ pub enum AnalyticsCollection {
     ConnectorEvents,
     OutgoingWebhookEvent,
     Dispute,
-    AuthEvents,
+    ConnectorEventsAnalytics,
 }
 
 #[allow(dead_code)]