fix: korbit suggestion

Author: lakshayman

todo/constants/messages.py

@@ -1,6 +1,7 @@
 # Application Messages
 class AppMessages:
     TASK_CREATED = "Task created successfully"
+    TEAM_CREATED = "Team created successfully"
     GOOGLE_LOGIN_SUCCESS = "Successfully logged in with Google"
     GOOGLE_LOGOUT_SUCCESS = "Successfully logged out"
     TOKEN_REFRESHED = "Access token refreshed successfully"

todo/dto/responses/create_team_response.py

@@ -4,4 +4,4 @@
 
 class CreateTeamResponse(BaseModel):
     team: TeamDTO
-    message: str = "Team created successfully"
+    message: str

todo/dto/team_dto.py

@@ -1,14 +1,42 @@
-from pydantic import BaseModel
+from pydantic import BaseModel, validator
 from typing import List, Optional
 from datetime import datetime
+from todo.repositories.user_repository import UserRepository
 
 
 class CreateTeamDTO(BaseModel):
     name: str
     description: Optional[str] = None
-    member_ids: List[str] = []
+    member_ids: Optional[List[str]] = None
     poc_id: str
 
+    @validator('member_ids')
+    def validate_member_ids(cls, value):
+        """Validate that all member IDs exist in the database."""
+        if value is None:
+            return value
+        
+        invalid_ids = []
+        for member_id in value:
+            user = UserRepository.get_by_id(member_id)
+            if not user:
+                invalid_ids.append(member_id)
+        
+        if invalid_ids:
+            raise ValueError(f'Invalid member IDs: {invalid_ids}')
+        return value
+
+    @validator('poc_id')
+    def validate_poc_id(cls, value):
+        """Validate that the POC ID exists in the database."""
+        if value is None:
+            return value
+        
+        user = UserRepository.get_by_id(value)
+        if not user:
+            raise ValueError(f'Invalid POC ID: {value}')
+        return value
+
 
 class TeamDTO(BaseModel):
     id: str

todo/models/team.py

@@ -1,4 +1,4 @@
-from pydantic import Field
+from pydantic import Field, validator
 from typing import ClassVar
 from datetime import datetime, timezone
 
@@ -13,7 +13,7 @@ class TeamModel(Document):
 
     collection_name: ClassVar[str] = "teams"
 
-    name: str
+    name: str = Field(..., min_length=1, max_length=100)
     description: str | None = None
     poc_id: PyObjectId
     created_by: PyObjectId
@@ -22,13 +22,22 @@ class TeamModel(Document):
     updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     is_deleted: bool = False
 
+    @validator('created_by', 'updated_by')
+    def validate_user_id(cls, v):
+        """Validate that the user ID is a valid ObjectId format."""
+        if v is None:
+            raise ValueError('User ID cannot be None')
+        if not PyObjectId.is_valid(v):
+            raise ValueError(f'Invalid user ID format: {v}')
+        return v
+
 
 class UserTeamDetailsModel(Document):
     """
     Model for user-team relationships.
     """
 
-    collection_name: ClassVar[str] = "userTeamDetails"
+    collection_name: ClassVar[str] = "user_team_details"
 
     user_id: PyObjectId
     team_id: PyObjectId
@@ -38,3 +47,12 @@ class UserTeamDetailsModel(Document):
     updated_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))
     created_by: PyObjectId
     updated_by: PyObjectId
+
+    @validator('user_id', 'team_id', 'created_by', 'updated_by')
+    def validate_object_ids(cls, v):
+        """Validate that the ObjectId fields are in valid format."""
+        if v is None:
+            raise ValueError('ObjectId cannot be None')
+        if not PyObjectId.is_valid(v):
+            raise ValueError(f'Invalid ObjectId format: {v}')
+        return v

todo/services/team_service.py

@@ -4,6 +4,7 @@
 from todo.models.common.pyobjectid import PyObjectId
 from todo.repositories.team_repository import TeamRepository, UserTeamDetailsRepository
 from todo.repositories.user_repository import UserRepository
+from todo.constants.messages import AppMessages
 
 
 class TeamService:
@@ -13,18 +14,8 @@ def create_team(cls, dto: CreateTeamDTO, created_by_user_id: str) -> CreateTeamR
         Create a new team with members and POC.
         """
         try:
-            # Validate that all member IDs exist
-            if dto.member_ids:
-                for user_id in dto.member_ids:
-                    user = UserRepository.get_by_id(user_id)
-                    if not user:
-                        raise ValueError(f"User with ID {user_id} not found")
-
-            # Validate POC exists if provided
-            if dto.poc_id:
-                poc_user = UserRepository.get_by_id(dto.poc_id)
-                if not poc_user:
-                    raise ValueError(f"POC user with ID {dto.poc_id} not found")
+            # Member IDs and POC ID validation is handled at DTO level
+            member_ids = dto.member_ids or []
 
             # Create team
             team = TeamModel(
@@ -41,8 +32,8 @@ def create_team(cls, dto: CreateTeamDTO, created_by_user_id: str) -> CreateTeamR
             user_teams = []
 
             # Add members to the team
-            if dto.member_ids:
-                for user_id in dto.member_ids:
+            if member_ids:
+                for user_id in member_ids:
                     user_team = UserTeamDetailsModel(
                         user_id=PyObjectId(user_id),
                         team_id=created_team.id,
@@ -53,7 +44,7 @@ def create_team(cls, dto: CreateTeamDTO, created_by_user_id: str) -> CreateTeamR
                     user_teams.append(user_team)
 
             # Add POC if not already in member_ids
-            if dto.poc_id and dto.poc_id not in dto.member_ids:
+            if dto.poc_id and dto.poc_id not in member_ids:
                 poc_user_team = UserTeamDetailsModel(
                     user_id=PyObjectId(dto.poc_id),
                     team_id=created_team.id,
@@ -64,7 +55,7 @@ def create_team(cls, dto: CreateTeamDTO, created_by_user_id: str) -> CreateTeamR
                 user_teams.append(poc_user_team)
 
             # Add creator if not already in member_ids
-            if created_by_user_id not in dto.member_ids:
+            if created_by_user_id not in member_ids:
                 creator_user_team = UserTeamDetailsModel(
                     user_id=PyObjectId(created_by_user_id),
                     team_id=created_team.id,
@@ -90,7 +81,7 @@ def create_team(cls, dto: CreateTeamDTO, created_by_user_id: str) -> CreateTeamR
                 updated_at=created_team.updated_at,
             )
 
-            return CreateTeamResponse(team=team_dto)
+            return CreateTeamResponse(team=team_dto, message=AppMessages.TEAM_CREATED)
 
         except Exception as e:
             raise ValueError(str(e))

todo/utils/google_jwt_utils.py

@@ -1,4 +1,5 @@
 import jwt
+import logging
 from datetime import datetime, timedelta, timezone
 from django.conf import settings
 
@@ -10,6 +11,8 @@
 
 from todo.constants.messages import AuthErrorMessages
 
+logger = logging.getLogger(__name__)
+
 
 def generate_google_access_token(user_data: dict) -> str:
     try:
@@ -34,7 +37,8 @@ def generate_google_access_token(user_data: dict) -> str:
         return token
 
     except Exception as e:
-        raise GoogleTokenInvalidError(f"Token generation failed: {str(e)}")
+        logger.error(f"Token generation failed: {str(e)}")  # Log the detailed error internally
+        raise GoogleTokenInvalidError(AuthErrorMessages.GOOGLE_TOKEN_INVALID)  # Return generic message to client
 
 
 def generate_google_refresh_token(user_data: dict) -> str:
@@ -59,7 +63,8 @@ def generate_google_refresh_token(user_data: dict) -> str:
         return token
 
     except Exception as e:
-        raise GoogleTokenInvalidError(f"Refresh token generation failed: {str(e)}")
+        logger.error(f"Refresh token generation failed: {str(e)}")  # Log the detailed error internally
+        raise GoogleTokenInvalidError(AuthErrorMessages.GOOGLE_TOKEN_INVALID)  # Return generic message to client
 
 
 def validate_google_access_token(token: str) -> dict:
@@ -76,9 +81,11 @@ def validate_google_access_token(token: str) -> dict:
     except jwt.ExpiredSignatureError:
         raise GoogleTokenExpiredError()
     except jwt.InvalidTokenError as e:
-        raise GoogleTokenInvalidError(f"Invalid token: {str(e)}")
+        logger.error(f"Invalid token: {str(e)}")  # Log the detailed error internally
+        raise GoogleTokenInvalidError(AuthErrorMessages.GOOGLE_TOKEN_INVALID)  # Return generic message to client
     except Exception as e:
-        raise GoogleTokenInvalidError(f"Token validation failed: {str(e)}")
+        logger.error(f"Token validation failed: {str(e)}")  # Log the detailed error internally
+        raise GoogleTokenInvalidError(AuthErrorMessages.GOOGLE_TOKEN_INVALID)  # Return generic message to client
 
 
 def validate_google_refresh_token(token: str) -> dict:
@@ -94,9 +101,11 @@ def validate_google_refresh_token(token: str) -> dict:
     except jwt.ExpiredSignatureError:
         raise GoogleRefreshTokenExpiredError()
     except jwt.InvalidTokenError as e:
-        raise GoogleTokenInvalidError(f"Invalid refresh token: {str(e)}")
+        logger.error(f"Invalid refresh token: {str(e)}")  # Log the detailed error internally
+        raise GoogleTokenInvalidError(AuthErrorMessages.GOOGLE_TOKEN_INVALID)  # Return generic message to client
     except Exception as e:
-        raise GoogleTokenInvalidError(f"Refresh token validation failed: {str(e)}")
+        logger.error(f"Refresh token validation failed: {str(e)}")  # Log the detailed error internally
+        raise GoogleTokenInvalidError(AuthErrorMessages.GOOGLE_TOKEN_INVALID)  # Return generic message to client
 
 
 def generate_google_token_pair(user_data: dict) -> dict: