feat: add task assignment creation functionality and streamline task assignment deletion process

Author: AnujChhikara

todo/services/task_assignment_service.py

@@ -3,6 +3,7 @@
 from todo.dto.task_assignment_dto import TaskAssignmentResponseDTO, CreateTaskAssignmentDTO
 from todo.dto.responses.create_task_assignment_response import CreateTaskAssignmentResponse
 from todo.models.common.pyobjectid import PyObjectId
+from todo.models.task_assignment import TaskAssignmentModel
 from todo.repositories.task_assignment_repository import TaskAssignmentRepository
 from todo.repositories.task_repository import TaskRepository
 from todo.repositories.user_repository import UserRepository
@@ -58,6 +59,18 @@ def create_task_assignment(cls, dto: CreateTaskAssignmentDTO, user_id: str) -> C
                 raise ValueError("Failed to update task assignment")
             assignment = updated_assignment
 
+        else:
+            # Create new assignment
+            task_assignment = TaskAssignmentModel(
+                task_id=PyObjectId(dto.task_id),
+                assignee_id=PyObjectId(dto.assignee_id),
+                user_type=dto.user_type,
+                created_by=PyObjectId(user_id),
+                updated_by=None,
+                team_id=PyObjectId(dto.team_id) if dto.team_id else None,
+            )
+            assignment = TaskAssignmentRepository.create(task_assignment)
+
         # If new assignment is to a team, log assignment
         if assignment.user_type == "team":
             AuditLogRepository.create(
@@ -133,9 +146,7 @@ def get_task_assignment(cls, task_id: str) -> Optional[TaskAssignmentResponseDTO
 
     @classmethod
     def delete_task_assignment(cls, task_id: str, user_id: str) -> bool:
-        assignment = TaskAssignmentRepository.get_by_task_id(task_id)
-
-        success = TaskAssignmentRepository.delete_assignment(task_id, user_id)
-
-        if success and assignment:
-            return success
+        """
+        Delete task assignment by task ID.
+        """
+        return TaskAssignmentRepository.delete_assignment(task_id, user_id)

todo/services/task_service.py

@@ -435,7 +435,6 @@ def update_task_with_assignee_from_dict(cls, task_id: str, validated_data: dict,
             and current_task.deferredDetails
         ):
             update_payload["deferredDetails"] = None
-            cls._remove_deferred_details_from_postgres(task_id)
 
         if validated_data.get("status") == TaskStatus.DEFERRED.value:
             update_payload["status"] = current_task.status
@@ -682,7 +681,6 @@ def delete_task(cls, task_id: str, user_id: str) -> None:
         deleted_task_model = TaskRepository.delete_by_id(task_id, user_id)
         if deleted_task_model is None:
             raise TaskNotFoundException(task_id)
-
         return None
 
     @classmethod

todo/services/team_service.py

@@ -13,7 +13,6 @@
 from todo.repositories.audit_log_repository import AuditLogRepository
 from todo.dto.responses.error_response import ApiErrorResponse, ApiErrorDetail
 
-
 DEFAULT_ROLE_ID = "1"
 
 
@@ -284,6 +283,7 @@ def join_team_by_invite_code(cls, invite_code: str, user_id: str) -> TeamDTO:
         )
         UserTeamDetailsRepository.create(user_team)
 
+        # NEW: Assign default member role using new role system
         cls._assign_user_role(user_id, str(team.id), "member")
 
         # Audit log for team join
@@ -442,6 +442,7 @@ def add_team_members(cls, team_id: str, member_ids: List[str], added_by_user_id:
             if new_user_teams:
                 UserTeamDetailsRepository.create_many(new_user_teams)
 
+                # NEW: Assign default member roles using new role system
                 for member_id in member_ids:
                     cls._assign_user_role(member_id, team_id, "member")
 
@@ -479,19 +480,17 @@ class TeamOrUserNotFound(Exception):
     def remove_member_from_team(cls, user_id: str, team_id: str, removed_by_user_id: str = None):
         from todo.repositories.user_team_details_repository import UserTeamDetailsRepository
 
-        user_team_details = UserTeamDetailsRepository.get_by_user_and_team(user_id, team_id)
-
         success = UserTeamDetailsRepository.remove_member_from_team(user_id=user_id, team_id=team_id)
         if not success:
             raise cls.TeamOrUserNotFound()
 
-        if user_team_details:
-            AuditLogRepository.create(
-                AuditLogModel(
-                    team_id=PyObjectId(team_id),
-                    action="member_removed_from_team",
-                    performed_by=PyObjectId(removed_by_user_id) if removed_by_user_id else PyObjectId(user_id),
-                )
+        # Audit log for team member removal
+        AuditLogRepository.create(
+            AuditLogModel(
+                team_id=PyObjectId(team_id),
+                action="member_removed_from_team",
+                performed_by=PyObjectId(removed_by_user_id) if removed_by_user_id else PyObjectId(user_id),
             )
+        )
 
         return True

todo/services/user_role_service.py

@@ -36,23 +36,16 @@ def assign_role(cls, user_id: str, role_name: str, scope: str, team_id: Optional
             role_enum = RoleName(role_name)
             scope_enum = RoleScope(scope)
 
-            user_role = UserRoleRepository.assign_role(user_id, role_enum, scope_enum, team_id)
-
-            if user_role:
-                return True
+            UserRoleRepository.assign_role(user_id, role_enum, scope_enum, team_id)
+            return True
         except Exception as e:
             logger.error(f"Failed to assign role: {str(e)}")
             return False
 
     @classmethod
     def remove_role_by_id(cls, user_id: str, role_id: str, scope: str, team_id: Optional[str] = None) -> bool:
         try:
-            user_role = UserRoleRepository.get_by_user_role_scope_team(user_id, role_id, scope, team_id)
-
-            success = UserRoleRepository.remove_role_by_id(user_id, role_id, scope, team_id)
-
-            if success and user_role:
-                return success
+            return UserRoleRepository.remove_role_by_id(user_id, role_id, scope, team_id)
         except Exception as e:
             logger.error(f"Failed to remove role: {str(e)}")
             return False

todo/services/user_service.py

@@ -16,9 +16,7 @@ class UserService:
     def create_or_update_user(cls, google_user_data: dict) -> UserModel:
         try:
             cls._validate_google_user_data(google_user_data)
-            user = UserRepository.create_or_update(google_user_data)
-
-            return user
+            return UserRepository.create_or_update(google_user_data)
         except (UserNotFoundException, APIException, DRFValidationError):
             raise
         except Exception as e:

todo/services/watchlist_service.py

@@ -137,8 +137,6 @@ def update_task(cls, taskId: ObjectId, dto: UpdateWatchlistDTO, userId: ObjectId
         if not updated_watchlist:
             raise TaskNotFoundException(taskId)
 
-        return CreateWatchlistResponse(data=updated_watchlist)
-
     @classmethod
     def _prepare_label_dtos(cls, label_ids: list[str]) -> list[LabelDTO]:
         object_ids = [ObjectId(id) for id in label_ids]  # Convert here!

todo/views/task_assignment.py

@@ -238,7 +238,6 @@ def patch(self, request: Request, task_id: str):
                     {"error": "Failed to update assignment. Check server logs for details."},
                     status=status.HTTP_500_INTERNAL_SERVER_ERROR,
                 )
-
         except Exception as e:
             print(f"DEBUG: Exception in update_executor: {str(e)}")
             import traceback