refactor(user_roles): make org and merchant id nullable

crates/diesel_models/src/enums.rs

@@ -19,7 +19,8 @@ pub mod diesel_exports {
         DbRequestIncrementalAuthorization as RequestIncrementalAuthorization,
         DbRoleScope as RoleScope, DbRoutingAlgorithmKind as RoutingAlgorithmKind,
         DbTotpStatus as TotpStatus, DbTransactionType as TransactionType,
-        DbUserStatus as UserStatus, DbWebhookDeliveryAttempt as WebhookDeliveryAttempt,
+        DbUserRoleVersion as UserRoleVersion, DbUserStatus as UserStatus,
+        DbWebhookDeliveryAttempt as WebhookDeliveryAttempt,
     };
 }
 pub use common_enums::*;
@@ -298,3 +299,24 @@ pub enum TotpStatus {
     #[default]
     NotSet,
 }
+
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Default,
+    Eq,
+    PartialEq,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::EnumString,
+    strum::Display,
+)]
+#[diesel_enum(storage_type = "db_enum")]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
+pub enum UserRoleVersion {
+    #[default]
+    V1,
+    V2,
+}

crates/diesel_models/src/query/user_role.rs

@@ -1,7 +1,10 @@
 use common_utils::id_type;
 use diesel::{associations::HasTable, BoolExpressionMethods, ExpressionMethods};
 
-use crate::{query::generics, schema::user_roles::dsl, user_role::*, PgPooledConn, StorageResult};
+use crate::{
+    enums::UserRoleVersion, query::generics, schema::user_roles::dsl, user_role::*, PgPooledConn,
+    StorageResult,
+};
 
 impl UserRoleNew {
     pub async fn insert(self, conn: &PgPooledConn) -> StorageResult<UserRole> {
@@ -10,10 +13,14 @@ impl UserRoleNew {
 }
 
 impl UserRole {
-    pub async fn find_by_user_id(conn: &PgPooledConn, user_id: String) -> StorageResult<Self> {
+    pub async fn find_by_user_id(
+        conn: &PgPooledConn,
+        user_id: String,
+        version: UserRoleVersion,
+    ) -> StorageResult<Self> {
         generics::generic_find_one::<<Self as HasTable>::Table, _, _>(
             conn,
-            dsl::user_id.eq(user_id),
+            dsl::user_id.eq(user_id).and(dsl::version.eq(version)),
         )
         .await
     }
@@ -22,12 +29,14 @@ impl UserRole {
         conn: &PgPooledConn,
         user_id: String,
         merchant_id: id_type::MerchantId,
+        version: UserRoleVersion,
     ) -> StorageResult<Self> {
         generics::generic_find_one::<<Self as HasTable>::Table, _, _>(
             conn,
             dsl::user_id
                 .eq(user_id)
-                .and(dsl::merchant_id.eq(merchant_id)),
+                .and(dsl::merchant_id.eq(merchant_id))
+                .and(dsl::version.eq(version)),
         )
         .await
     }
@@ -37,6 +46,7 @@ impl UserRole {
         user_id: String,
         merchant_id: id_type::MerchantId,
         update: UserRoleUpdate,
+        version: UserRoleVersion,
     ) -> StorageResult<Self> {
         generics::generic_update_with_unique_predicate_get_result::<
             <Self as HasTable>::Table,
@@ -47,7 +57,8 @@ impl UserRole {
             conn,
             dsl::user_id
                 .eq(user_id)
-                .and(dsl::merchant_id.eq(merchant_id)),
+                .and(dsl::merchant_id.eq(merchant_id))
+                .and(dsl::version.eq(version)),
             UserRoleUpdateInternal::from(update),
         )
         .await
@@ -58,10 +69,14 @@ impl UserRole {
         user_id: String,
         org_id: id_type::OrganizationId,
         update: UserRoleUpdate,
+        version: UserRoleVersion,
     ) -> StorageResult<Vec<Self>> {
         generics::generic_update_with_results::<<Self as HasTable>::Table, _, _, _>(
             conn,
-            dsl::user_id.eq(user_id).and(dsl::org_id.eq(org_id)),
+            dsl::user_id
+                .eq(user_id)
+                .and(dsl::org_id.eq(org_id))
+                .and(dsl::version.eq(version)),
             UserRoleUpdateInternal::from(update),
         )
         .await
@@ -71,20 +86,26 @@ impl UserRole {
         conn: &PgPooledConn,
         user_id: String,
         merchant_id: id_type::MerchantId,
+        version: UserRoleVersion,
     ) -> StorageResult<Self> {
         generics::generic_delete_one_with_result::<<Self as HasTable>::Table, _, _>(
             conn,
             dsl::user_id
                 .eq(user_id)
-                .and(dsl::merchant_id.eq(merchant_id)),
+                .and(dsl::merchant_id.eq(merchant_id))
+                .and(dsl::version.eq(version)),
         )
         .await
     }
 
-    pub async fn list_by_user_id(conn: &PgPooledConn, user_id: String) -> StorageResult<Vec<Self>> {
+    pub async fn list_by_user_id(
+        conn: &PgPooledConn,
+        user_id: String,
+        version: UserRoleVersion,
+    ) -> StorageResult<Vec<Self>> {
         generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(
             conn,
-            dsl::user_id.eq(user_id),
+            dsl::user_id.eq(user_id).and(dsl::version.eq(version)),
             None,
             None,
             Some(dsl::created_at.asc()),
@@ -95,10 +116,13 @@ impl UserRole {
     pub async fn list_by_merchant_id(
         conn: &PgPooledConn,
         merchant_id: id_type::MerchantId,
+        version: UserRoleVersion,
     ) -> StorageResult<Vec<Self>> {
         generics::generic_filter::<<Self as HasTable>::Table, _, _, _>(
             conn,
-            dsl::merchant_id.eq(merchant_id),
+            dsl::merchant_id
+                .eq(merchant_id)
+                .and(dsl::version.eq(version)),
             None,
             None,
             Some(dsl::created_at.asc()),

crates/diesel_models/src/schema.rs

@@ -1243,23 +1243,30 @@ diesel::table! {
     use diesel::sql_types::*;
     use crate::enums::diesel_exports::*;
 
-    user_roles (user_id, merchant_id) {
+    user_roles (id) {
         id -> Int4,
         #[max_length = 64]
         user_id -> Varchar,
         #[max_length = 64]
-        merchant_id -> Varchar,
+        merchant_id -> Nullable<Varchar>,
         #[max_length = 64]
         role_id -> Varchar,
         #[max_length = 64]
-        org_id -> Varchar,
+        org_id -> Nullable<Varchar>,
         status -> UserStatus,
         #[max_length = 64]
         created_by -> Varchar,
         #[max_length = 64]
         last_modified_by -> Varchar,
         created_at -> Timestamp,
         last_modified -> Timestamp,
+        #[max_length = 64]
+        profile_id -> Nullable<Varchar>,
+        #[max_length = 64]
+        entity_id -> Nullable<Varchar>,
+        #[max_length = 64]
+        entity_type -> Nullable<Varchar>,
+        version -> UserRoleVersion,
     }
 }
 

crates/diesel_models/src/schema_v2.rs

@@ -1252,23 +1252,30 @@ diesel::table! {
     use diesel::sql_types::*;
     use crate::enums::diesel_exports::*;
 
-    user_roles (user_id, merchant_id) {
+    user_roles (id) {
         id -> Int4,
         #[max_length = 64]
         user_id -> Varchar,
         #[max_length = 64]
-        merchant_id -> Varchar,
+        merchant_id -> Nullable<Varchar>,
         #[max_length = 64]
         role_id -> Varchar,
         #[max_length = 64]
-        org_id -> Varchar,
+        org_id -> Nullable<Varchar>,
         status -> UserStatus,
         #[max_length = 64]
         created_by -> Varchar,
         #[max_length = 64]
         last_modified_by -> Varchar,
         created_at -> Timestamp,
         last_modified -> Timestamp,
+        #[max_length = 64]
+        profile_id -> Nullable<Varchar>,
+        #[max_length = 64]
+        entity_id -> Nullable<Varchar>,
+        #[max_length = 64]
+        entity_type -> Nullable<Varchar>,
+        version -> UserRoleVersion,
     }
 }
 

crates/diesel_models/src/user_role.rs

@@ -9,28 +9,36 @@ use crate::{enums, schema::user_roles};
 pub struct UserRole {
     pub id: i32,
     pub user_id: String,
-    pub merchant_id: id_type::MerchantId,
+    pub merchant_id: Option<id_type::MerchantId>,
     pub role_id: String,
-    pub org_id: id_type::OrganizationId,
+    pub org_id: Option<id_type::OrganizationId>,
     pub status: enums::UserStatus,
     pub created_by: String,
     pub last_modified_by: String,
     pub created_at: PrimitiveDateTime,
     pub last_modified: PrimitiveDateTime,
+    pub profile_id: Option<String>,
+    pub entity_id: Option<String>,
+    pub entity_type: Option<String>,
+    pub version: enums::UserRoleVersion,
 }
 
 #[derive(router_derive::Setter, Clone, Debug, Insertable, router_derive::DebugAsDisplay)]
 #[diesel(table_name = user_roles)]
 pub struct UserRoleNew {
     pub user_id: String,
-    pub merchant_id: id_type::MerchantId,
+    pub merchant_id: Option<id_type::MerchantId>,
     pub role_id: String,
-    pub org_id: id_type::OrganizationId,
+    pub org_id: Option<id_type::OrganizationId>,
     pub status: enums::UserStatus,
     pub created_by: String,
     pub last_modified_by: String,
     pub created_at: PrimitiveDateTime,
     pub last_modified: PrimitiveDateTime,
+    pub profile_id: Option<String>,
+    pub entity_id: Option<String>,
+    pub entity_type: Option<String>,
+    pub version: enums::UserRoleVersion,
 }
 
 #[derive(Clone, Debug, AsChangeset, router_derive::DebugAsDisplay)]