refactor: remove old watchlist models and update user role structure for enhanced functionality

Author: AnujChhikara

todo/migrations/0001_initial_postgres_models.py

@@ -3,27 +3,16 @@
 
 
 class PostgresUserRole(models.Model):
-    """
-    Postgres model for user roles.
-    """
-
-    # MongoDB ObjectId as string for reference
     mongo_id = models.CharField(max_length=24, unique=True, null=True, blank=True)
 
-    # User role fields
-    user_mongo_id = models.CharField(max_length=24)  # MongoDB ObjectId as string
-    role_mongo_id = models.CharField(max_length=24)  # MongoDB ObjectId as string
-    team_mongo_id = models.CharField(max_length=24, null=True, blank=True)  # MongoDB ObjectId as string
-
-    # Timestamps
+    user_id = models.CharField(max_length=24)
+    role_name = models.CharField(max_length=50)
+    scope = models.CharField(max_length=20)
+    team_id = models.CharField(max_length=24, null=True, blank=True)
+    is_active = models.BooleanField(default=True)
     created_at = models.DateTimeField(default=timezone.now)
-    updated_at = models.DateTimeField(null=True, blank=True)
+    created_by = models.CharField(max_length=24, default="system")
 
-    # References
-    created_by = models.CharField(max_length=24)  # MongoDB ObjectId as string
-    updated_by = models.CharField(max_length=24, null=True, blank=True)  # MongoDB ObjectId as string
-
-    # Sync metadata
     last_sync_at = models.DateTimeField(auto_now=True)
     sync_status = models.CharField(
         max_length=20,
@@ -38,20 +27,16 @@ class PostgresUserRole(models.Model):
 
     class Meta:
         db_table = "postgres_user_roles"
-        unique_together = ["user_mongo_id", "role_mongo_id", "team_mongo_id"]
+        unique_together = ["user_id", "role_name", "scope", "team_id"]
         indexes = [
             models.Index(fields=["mongo_id"]),
-            models.Index(fields=["user_mongo_id"]),
-            models.Index(fields=["role_mongo_id"]),
-            models.Index(fields=["team_mongo_id"]),
+            models.Index(fields=["user_id"]),
+            models.Index(fields=["role_name"]),
+            models.Index(fields=["scope"]),
+            models.Index(fields=["team_id"]),
+            models.Index(fields=["is_active"]),
             models.Index(fields=["sync_status"]),
         ]
 
     def __str__(self):
-        return f"User {self.user_mongo_id} has Role {self.role_mongo_id}"
-
-    def save(self, *args, **kwargs):
-        if not self.pk:  # New instance
-            self.created_at = timezone.now()
-        self.updated_at = timezone.now()
-        super().save(*args, **kwargs)
+        return f"User {self.user_id} has Role {self.role_name} ({self.scope})"

todo/migrations/0001_initial_setup.py

@@ -6,6 +6,7 @@
 from todo.models.user_role import UserRoleModel
 from todo.repositories.common.mongo_repository import MongoRepository
 from todo.constants.role import RoleScope, RoleName
+from todo.services.enhanced_dual_write_service import EnhancedDualWriteService
 
 logger = logging.getLogger(__name__)
 
@@ -38,6 +39,27 @@ def create(cls, user_role: UserRoleModel) -> UserRoleModel:
         user_role_dict = user_role.model_dump(mode="json", by_alias=True, exclude_none=True)
         result = collection.insert_one(user_role_dict)
         user_role.id = result.inserted_id
+
+        dual_write_service = EnhancedDualWriteService()
+        user_role_data = {
+            "user_id": user_role.user_id,
+            "role_name": user_role.role_name.value if hasattr(user_role.role_name, "value") else user_role.role_name,
+            "scope": user_role.scope.value if hasattr(user_role.scope, "value") else user_role.scope,
+            "team_id": user_role.team_id,
+            "is_active": user_role.is_active,
+            "created_at": user_role.created_at,
+            "created_by": user_role.created_by,
+        }
+
+        dual_write_success = dual_write_service.create_document(
+            collection_name="user_roles", data=user_role_data, mongo_id=str(user_role.id)
+        )
+
+        if not dual_write_success:
+            import logging
+            logger = logging.getLogger(__name__)
+            logger.warning(f"Failed to sync user role {user_role.id} to Postgres")
+
         return user_role
 
     @classmethod

todo/migrations/0002_remove_old_watchlist_tables.py

@@ -407,15 +407,14 @@ def _transform_user_team_details_data(self, data: Dict[str, Any]) -> Dict[str, A
         }
 
     def _transform_user_role_data(self, data: Dict[str, Any]) -> Dict[str, Any]:
-        """Transform user role data for Postgres."""
         return {
-            "user_mongo_id": str(data.get("user_id", "")),
-            "role_mongo_id": str(data.get("role_id", "")),
-            "team_mongo_id": str(data.get("team_id", "")) if data.get("team_id") else None,
-            "created_by": str(data.get("created_by", "")),
-            "updated_by": str(data.get("updated_by", "")) if data.get("updated_by") else None,
+            "user_id": str(data.get("user_id", "")),
+            "role_name": data.get("role_name"),
+            "scope": data.get("scope"),
+            "team_id": str(data.get("team_id", "")) if data.get("team_id") else None,
+            "is_active": data.get("is_active", True),
             "created_at": data.get("created_at"),
-            "updated_at": data.get("updated_at"),
+            "created_by": str(data.get("created_by", "")),
         }
 
     def _transform_audit_log_data(self, data: Dict[str, Any]) -> Dict[str, Any]: