feat: add deferred details to watchlist DTO (#242)

* feat: add deferred details to watchlist DTO and update task status logic

* feat: include deferred details in watchlist DTO for improved task management

---------

Co-authored-by: anuj.k <[email protected]>

Author: AnujChhikara

todo/dto/watchlist_dto.py

@@ -3,6 +3,7 @@
 from typing import Optional
 
 from todo.constants.task import TaskPriority, TaskStatus
+from todo.models.task import DeferredDetailsModel
 
 
 class AssigneeDTO(BaseModel):
@@ -17,6 +18,7 @@ class WatchlistDTO(BaseModel):
     title: str
     description: Optional[str] = None
     priority: Optional[TaskPriority] = None
+    deferredDetails: Optional[DeferredDetailsModel] = None
     status: Optional[TaskStatus] = None
     isAcknowledged: Optional[bool] = None
     isDeleted: Optional[bool] = None

todo/repositories/watchlist_repository.py

@@ -133,6 +133,7 @@ def get_watchlisted_tasks(cls, page, limit, user_id) -> Tuple[int, List[Watchlis
                                         {
                                             "watchlistId": {"$toString": "$_id"},
                                             "taskId": {"$toString": "$task._id"},
+                                            "deferredDetails": "$task.deferredDetails",
                                             "assignee": {
                                                 "$cond": {
                                                     "if": {"$gt": [{"$size": "$assignee_user"}, 0]},

todo/services/watchlist_service.py

@@ -4,6 +4,7 @@
 from urllib.parse import urlencode
 import math
 
+from todo.constants.task import TaskStatus
 from todo.dto.label_dto import LabelDTO
 from todo.dto.responses.paginated_response import LinksData
 from todo.dto.watchlist_dto import CreateWatchlistDTO, UpdateWatchlistDTO, WatchlistDTO
@@ -159,6 +160,13 @@ def prepare_watchlisted_task_dto(cls, watchlist_model: WatchlistDTO) -> Watchlis
         if hasattr(watchlist_model, "assignee") and watchlist_model.assignee:
             assignee = watchlist_model.assignee
 
+        task_status = watchlist_model.status
+
+        if watchlist_model.deferredDetails and watchlist_model.deferredDetails.deferredTill > datetime.now(
+            timezone.utc
+        ):
+            task_status = TaskStatus.DEFERRED.value
+
         return WatchlistDTO(
             taskId=str(watchlist_model.taskId),
             displayId=watchlist_model.displayId,
@@ -168,7 +176,8 @@ def prepare_watchlisted_task_dto(cls, watchlist_model: WatchlistDTO) -> Watchlis
             isDeleted=watchlist_model.isDeleted,
             labels=labels,
             dueAt=watchlist_model.dueAt,
-            status=watchlist_model.status,
+            deferredDetails=watchlist_model.deferredDetails,
+            status=task_status,
             priority=watchlist_model.priority,
             createdAt=watchlist_model.createdAt,
             createdBy=watchlist_model.createdBy,