From 56ca30614746accd5dcab02e086fce624e4dae16 Mon Sep 17 00:00:00 2001
From: RaghavRox <66472483+RaghavRox@users.noreply.github.com>
Date: Thu, 9 May 2024 19:18:16 +0530
Subject: [PATCH] chore(analytics): moved TenantID to common_utils crate

---
 crates/analytics/src/clickhouse.rs |  3 +--
 crates/analytics/src/lib.rs        | 10 +---------
 crates/analytics/src/sqlx.rs       |  8 +++++---
 crates/common_utils/src/types.rs   | 10 ++++++++++
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/crates/analytics/src/clickhouse.rs b/crates/analytics/src/clickhouse.rs
index dc462520191e..3490b755b50c 100644
--- a/crates/analytics/src/clickhouse.rs
+++ b/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>;
diff --git a/crates/analytics/src/lib.rs b/crates/analytics/src/lib.rs
index ca88b92fcdd4..33975addb943 100644
--- a/crates/analytics/src/lib.rs
+++ b/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),
diff --git a/crates/analytics/src/sqlx.rs b/crates/analytics/src/sqlx.rs
index 687ae5338f0f..6f9dce06b786 100644
--- a/crates/analytics/src/sqlx.rs
+++ b/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,
 }
 
diff --git a/crates/common_utils/src/types.rs b/crates/common_utils/src/types.rs
index b15a519caad7..018e484650df 100644
--- a/crates/common_utils/src/types.rs
+++ b/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"))
+    }
+}