New wtchlist fix (#248)

* Update watchlist_dto.py

* Update watchlist_repository.py

* Update test_watchlist_service.py

Author: iamitprakash

todo/dto/watchlist_dto.py

@@ -4,6 +4,7 @@
 
 from todo.constants.task import TaskPriority, TaskStatus
 from todo.models.task import DeferredDetailsModel
+from todo.dto.user_dto import UserDTO
 
 
 class AssigneeDTO(BaseModel):
@@ -25,7 +26,7 @@ class WatchlistDTO(BaseModel):
     labels: list = []
     dueAt: Optional[datetime] = None
     createdAt: datetime
-    createdBy: str
+    createdBy: UserDTO
     watchlistId: str
     assignee: Optional[AssigneeDTO] = None
 

todo/repositories/watchlist_repository.py

@@ -144,7 +144,14 @@ def get_watchlisted_tasks(cls, page, limit, user_id) -> Tuple[int, List[Watchlis
                                             "watchlistId": {"$toString": "$_id"},
                                             "taskId": {"$toString": "$task._id"},
                                             "deferredDetails": "$task.deferredDetails",
-                                            "createdBy": {"$arrayElemAt": ["$created_by_user.name", 0]},
+                                            "createdBy": {
+                                                "id": {"$toString": {"$arrayElemAt": ["$created_by_user._id", 0]}},
+                                                "name": {"$arrayElemAt": ["$created_by_user.name", 0]},
+                                                "addedOn": {"$arrayElemAt": ["$created_by_user.addedOn", 0]},
+                                                "tasksAssignedCount": {
+                                                    "$arrayElemAt": ["$created_by_user.tasksAssignedCount", 0]
+                                                },
+                                            },
                                             "assignee": {
                                                 "$cond": {
                                                     "if": {"$gt": [{"$size": "$assignee_user"}, 0]},
@@ -199,9 +206,11 @@ def get_watchlisted_tasks(cls, page, limit, user_id) -> Tuple[int, List[Watchlis
             if not task.get("assignee"):
                 task["assignee"] = cls._get_assignee_for_task(task.get("taskId"))
 
-            # If createdBy is null or still an ID, try to fetch user name separately
-            if not task.get("createdBy") or ObjectId.is_valid(task.get("createdBy", "")):
-                task["createdBy"] = cls._get_user_name_for_id(task.get("createdBy"))
+            # If createdBy is null or still an ID, try to fetch user details separately
+            if not task.get("createdBy") or (
+                isinstance(task.get("createdBy"), str) and ObjectId.is_valid(task.get("createdBy", ""))
+            ):
+                task["createdBy"] = cls._get_user_dto_for_id(task.get("createdBy"))
 
         tasks = [WatchlistDTO(**doc) for doc in tasks]
 
@@ -246,9 +255,9 @@ def _get_assignee_for_task(cls, task_id: str):
         return None
 
     @classmethod
-    def _get_user_name_for_id(cls, user_id: str):
+    def _get_user_dto_for_id(cls, user_id: str):
         """
-        Fallback method to get user name for createdBy field.
+        Fallback method to get user details for createdBy field.
         """
         if not user_id:
             return None
@@ -259,7 +268,12 @@ def _get_user_name_for_id(cls, user_id: str):
             # Get user details
             user = UserRepository.get_by_id(user_id)
             if user:
-                return user.name
+                return {
+                    "id": str(user.id),
+                    "name": user.name,
+                    "addedOn": getattr(user, "addedOn", None),
+                    "tasksAssignedCount": getattr(user, "tasksAssignedCount", None),
+                }
         except Exception:
             # If any error occurs, return None
             pass

todo/tests/unit/services/test_watchlist_service.py

@@ -5,6 +5,7 @@
 
 from todo.services.watchlist_service import WatchlistService
 from todo.dto.watchlist_dto import CreateWatchlistDTO, WatchlistDTO, AssigneeDTO
+from todo.dto.user_dto import UserDTO
 from todo.models.task import TaskModel
 from todo.models.watchlist import WatchlistModel
 from todo.constants.messages import ApiErrors
@@ -63,7 +64,7 @@ def test_get_watchlisted_tasks_with_assignee(self):
             labels=[],
             dueAt=None,
             createdAt=datetime.now(timezone.utc),
-            createdBy="Test User",
+            createdBy=UserDTO(id=user_id, name="Test User"),
             watchlistId=str(ObjectId()),
             assignee=assignee_dto,
         )
@@ -102,7 +103,7 @@ def test_get_watchlisted_tasks_without_assignee(self):
             labels=[],
             dueAt=None,
             createdAt=datetime.now(timezone.utc),
-            createdBy=user_id,
+            createdBy=UserDTO(id=user_id, name="Test User"),
             watchlistId=str(ObjectId()),
             assignee=None,
         )