chore(analytics): moved TenantID to common_utils crate

crates/analytics/src/clickhouse.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use actix_web::http::StatusCode;
-use common_utils::errors::ParsingError;
+use common_utils::{errors::ParsingError, types::TenantID};
 use error_stack::{report, Report, ResultExt};
 use router_env::logger;
 use time::PrimitiveDateTime;
@@ -28,7 +28,6 @@ use crate::{
  outgoing_webhook_event::events::OutgoingWebhookLogsResult,
  sdk_events::events::SdkEventsResult,
  types::TableEngine,
- TenantID,
 };
 
 pub type ClickhouseResult<T> = error_stack::Result<T, ClickhouseError>;

crates/analytics/src/lib.rs

@@ -18,7 +18,7 @@ pub mod search;
 mod sqlx;
 mod types;
 use api_event::metrics::{ApiEventMetric, ApiEventMetricRow};
-use common_utils::errors::CustomResult;
+use common_utils::{errors::CustomResult, types::TenantID};
 use disputes::metrics::{DisputeMetric, DisputeMetricRow};
 use hyperswitch_interfaces::secrets_interface::{
  secret_handler::SecretsHandler,
@@ -67,14 +67,6 @@ use self::{
  types::MetricsError,
 };
 
-#[derive(Clone, Debug)]
-pub struct TenantID(String);
-impl Default for TenantID {
- fn default() -> Self {
- Self(String::from("default"))
- }
-}
-
 #[derive(Clone, Debug)]
 pub enum AnalyticsProvider {
  Sqlx(SqlxClient),

crates/analytics/src/sqlx.rs

@@ -4,7 +4,10 @@ use api_models::{
  analytics::refunds::RefundType,
  enums::{DisputeStage, DisputeStatus},
 };
-use common_utils::errors::{CustomResult, ParsingError};
+use common_utils::{
+ errors::{CustomResult, ParsingError},
+ types::TenantID,
+};
 use diesel_models::enums::{
  AttemptStatus, AuthenticationType, Currency, PaymentMethod, RefundStatus,
 };
@@ -19,8 +22,6 @@ use sqlx::{
 use storage_impl::config::Database;
 use time::PrimitiveDateTime;
 
-use crate::TenantID;
-
 use super::{
  health_check::HealthCheck,
  query::{Aggregate, ToSql, Window},
@@ -33,6 +34,7 @@ use super::{
 #[derive(Debug, Clone)]
 pub struct SqlxClient {
  pool: Pool<Postgres>,
+ #[allow(unused)]
  tenant_id: TenantID,
 }
 

crates/common_utils/src/types.rs

@@ -212,3 +212,13 @@ where
  <serde_json::Value as ToSql<Jsonb, diesel::pg::Pg>>::to_sql(&value, &mut out.reborrow())
  }
 }
+
+/// This struct represnts the Tenant Id and stores it in a String
+#[derive(Clone, Debug)]
+pub struct TenantID(#[allow(unused)] String);
+
+impl Default for TenantID {
+ fn default() -> Self {
+ Self(String::from("default"))
+ }
+}