feat(multitenancy): move users and tenants to global schema

crates/common_utils/src/consts.rs

@@ -87,6 +87,9 @@ pub const MAX_TTL_FOR_EXTENDED_CARD_INFO: u16 = 60 * 60 * 2;
 /// Default tenant to be used when multitenancy is disabled
 pub const DEFAULT_TENANT: &str = "public";
 
+/// Global tenant to be used when multitenancy is enabled
+pub const GLOBAL_TENANT: &str = "global";
+
 /// Max Length for MerchantReferenceId
 pub const MAX_ALLOWED_MERCHANT_REFERENCE_ID_LENGTH: u8 = 64;
 

crates/diesel_models/src/query/user.rs

@@ -110,4 +110,17 @@ impl User {
                 _ => report!(err).change_context(errors::DatabaseError::Others),
             })
     }
+
+    pub async fn find_users_by_user_ids(
+        conn: &PgPooledConn,
+        user_ids: Vec<String>,
+    ) -> StorageResult<Vec<Self>> {
+        generics::generic_filter::<
+            <Self as HasTable>::Table,
+            _,
+            <<Self as HasTable>::Table as diesel::Table>::PrimaryKey,
+            _,
+        >(conn, users_dsl::user_id.eq_any(user_ids), None, None, None)
+        .await
+    }
 }

crates/diesel_models/src/query/user_role.rs

@@ -90,4 +90,18 @@ impl UserRole {
         )
         .await
     }
+
+    pub async fn list_by_merchant_id(
+        conn: &PgPooledConn,
+        merchant_id: String,
+    ) -> StorageResult<Vec<Self>> {
+        generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(
+            conn,
+            dsl::merchant_id.eq(merchant_id),
+            None,
+            None,
+            Some(dsl::created_at.asc()),
+        )
+        .await
+    }
 }

crates/router/src/analytics.rs

@@ -444,7 +444,7 @@ pub mod routes {
             &req,
             json_payload.into_inner(),
             |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {
-                let user = UserInterface::find_user_by_id(&*state.store, &user_id)
+                let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)
                     .await
                     .change_context(AnalyticsError::UnknownError)?;
 
@@ -486,7 +486,7 @@ pub mod routes {
             &req,
             json_payload.into_inner(),
             |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {
-                let user = UserInterface::find_user_by_id(&*state.store, &user_id)
+                let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)
                     .await
                     .change_context(AnalyticsError::UnknownError)?;
 
@@ -528,7 +528,7 @@ pub mod routes {
             &req,
             json_payload.into_inner(),
             |state, (auth, user_id): auth::AuthenticationDataWithUserId, payload, _| async move {
-                let user = UserInterface::find_user_by_id(&*state.store, &user_id)
+                let user = UserInterface::find_user_by_id(&*state.global_store, &user_id)
                     .await
                     .change_context(AnalyticsError::UnknownError)?;
 

crates/router/src/configs/settings.rs

@@ -163,6 +163,21 @@ impl storage_impl::config::TenantConfig for Tenant {
     }
 }
 
+#[derive(Debug, Deserialize, Clone, Default)]
+pub struct GlobalTenant {
+    pub schema: String,
+    pub redis_key_prefix: String,
+}
+
+impl storage_impl::config::TenantConfig for GlobalTenant {
+    fn get_schema(&self) -> &str {
+        self.schema.as_str()
+    }
+    fn get_redis_key_prefix(&self) -> &str {
+        self.redis_key_prefix.as_str()
+    }
+}
+
 #[derive(Debug, Deserialize, Clone, Default)]
 pub struct UnmaskedHeaders {
     #[serde(deserialize_with = "deserialize_hashset")]