pet and guest api changes

app/models/guest_model.py

@@ -4,23 +4,15 @@ from typing import List, Optional, Dict, Any
 import uuid
 import logging
 
+from app.utils.db import prepare_for_db
+
 logger = logging.getLogger(__name__)
 
 class GuestModel:
     """Model for managing guest profiles in the database"""
     
     @staticmethod
-    async def create_guest(
-        customer_id: str,
-        first_name: str,
-        last_name: Optional[str] = None,
-        email: Optional[str] = None,
-        phone_number: Optional[str] = None,
-        gender: Optional[str] = None,
-        date_of_birth: Optional[datetime] = None,
-        relationship: Optional[str] = None,
-        notes: Optional[str] = None
-    ) -> Optional[str]:
+    async def create_guest(customer_id: str,guest_data:dict) -> Optional[str]:
         """
         Create a new guest profile for a user.
         
@@ -43,21 +35,24 @@ class GuestModel:
             
             guest_id = str(uuid.uuid4())
             current_time = datetime.utcnow()
+            print("gusest_data",guest_data)
             
             guest_data = {
                 "guest_id": guest_id,
                 "customer_id": customer_id,
-                "first_name": first_name,
-                "last_name": last_name,
-                "email": email,
-                "phone_number": phone_number,
-                "gender": gender,
-                "date_of_birth": date_of_birth,
-                "relationship": relationship,
-                "notes": notes,
+                "first_name": guest_data["first_name"],
+                "last_name": guest_data["last_name"],
+                "email": guest_data["email"],
+                "phone_number": guest_data["phone_number"],
+                "gender": guest_data["gender"].value,
+                "date_of_birth": guest_data["date_of_birth"],
+                "relationship": guest_data['relationship'].value,
+                "notes": guest_data['notes'],
                 "created_at": current_time,
                 "updated_at": current_time
             }
+
+            guest_data = prepare_for_db(guest_data)
             
             result = await guests_collection.insert_one(guest_data)
             

app/models/pet_model.py

@@ -4,6 +4,8 @@ from typing import List, Optional, Dict, Any
 import uuid
 import logging
 
+from app.utils.db import prepare_for_db
+
 logger = logging.getLogger(__name__)
 
 class PetModel:
@@ -12,17 +14,7 @@ class PetModel:
     @staticmethod
     async def create_pet(
         customer_id: str,
-        pet_name: str,
-        species: str,
-        breed: Optional[str] = None,
-        date_of_birth: Optional[datetime] = None,
-        age: Optional[int] = None,
-        weight: Optional[float] = None,
-        gender: Optional[str] = None,
-        temperament: Optional[str] = None,
-        health_notes: Optional[str] = None,
-        is_vaccinated: bool = False,
-        pet_photo_url: Optional[str] = None
+        pet_data:dict
     ) -> Optional[str]:
         """
         Create a new pet profile for a user.
@@ -49,24 +41,28 @@ class PetModel:
             
             pet_id = str(uuid.uuid4())
             current_time = datetime.utcnow()
+
+            print("petdata",pet_data)
             
             pet_data = {
                 "pet_id": pet_id,
                 "customer_id": customer_id,
-                "pet_name": pet_name,
-                "species": species,
-                "breed": breed,
-                "date_of_birth": date_of_birth,
-                "age": age,
-                "weight": weight,
-                "gender": gender,
-                "temperament": temperament,
-                "health_notes": health_notes,
-                "is_vaccinated": is_vaccinated,
-                "pet_photo_url": pet_photo_url,
+                "pet_name": pet_data['pet_name'],
+                "species": pet_data['species'].value,
+                "breed": pet_data['breed'],
+                "date_of_birth": pet_data['date_of_birth'],
+                "age": pet_data['age'],
+                "weight": pet_data['weight'],
+                "gender": pet_data['gender'].value,
+                "temperament": pet_data['temperament'].value,
+                "health_notes": pet_data['health_notes'],
+                "is_vaccinated": pet_data['is_vaccinated'],
+                "pet_photo_url": pet_data['pet_photo_url'],
                 "created_at": current_time,
                 "updated_at": current_time
             }
+
+            pet_data = prepare_for_db(pet_data)
             
             result = await pets_collection.insert_one(pet_data)
             

app/routers/guest_router.py

@@ -36,9 +36,8 @@ async def get_current_user(token: str = Depends(security)) -> Dict[str, Any]:
             detail="Invalid or expired token"
         )
 
-@router.get("/{customer_id}/guests", response_model=GuestListResponse)
+@router.get("/guests", response_model=GuestListResponse)
 async def get_user_guests(
-    customer_id: str,
     current_user: Dict[str, Any] = Depends(get_current_user)
 ):
     """
@@ -49,11 +48,7 @@ async def get_user_guests(
     """
     try:
         # Verify user can only access their own guests
-        if current_user.get("customer_id") != customer_id:
-            raise HTTPException(
-                status_code=status.HTTP_403_FORBIDDEN,
-                detail="Access denied. You can only view your own guests."
-            )
+        customer_id=current_user.get("customer_id")
         
         guests_data = await GuestModel.get_user_guests(customer_id)
         
@@ -73,9 +68,8 @@ async def get_user_guests(
             detail="Failed to retrieve guests"
         )
 
-@router.post("/{customer_id}/guests", response_model=GuestResponse, status_code=status.HTTP_201_CREATED)
+@router.post("/guests", response_model=GuestResponse, status_code=status.HTTP_201_CREATED)
 async def create_guest(
-    customer_id: str,
     guest_data: GuestCreateRequest,
     current_user: Dict[str, Any] = Depends(get_current_user)
 ):
@@ -88,24 +82,11 @@ async def create_guest(
     """
     try:
         # Verify user can only create guests for themselves
-        if current_user.get("customer_id") != customer_id:
-            raise HTTPException(
-                status_code=status.HTTP_403_FORBIDDEN,
-                detail="Access denied. You can only create guests for yourself."
-            )
+        customer_id=current_user.get("customer_id")
         
         # Create guest in database
-        guest_id = await GuestModel.create_guest(
-            customer_id=customer_id,
-            first_name=guest_data.first_name,
-            last_name=guest_data.last_name,
-            email=guest_data.email,
-            phone_number=guest_data.phone_number,
-            gender=guest_data.gender.value if guest_data.gender else None,
-            date_of_birth=guest_data.date_of_birth,
-            relationship=guest_data.relationship.value if guest_data.relationship else None,
-            notes=guest_data.notes
-        )
+
+        guest_id=await GuestModel.create_guest(customer_id,guest_data.dict())
         
         if not guest_id:
             raise HTTPException(
@@ -132,9 +113,8 @@ async def create_guest(
             detail="Failed to create guest profile"
         )
 
-@router.put("/{customer_id}/guests/{guest_id}", response_model=GuestResponse)
+@router.put("/guests/{guest_id}", response_model=GuestResponse)
 async def update_guest(
-    customer_id: str,
     guest_id: str,
     guest_data: GuestUpdateRequest,
     current_user: Dict[str, Any] = Depends(get_current_user)
@@ -149,11 +129,7 @@ async def update_guest(
     """
     try:
         # Verify user can only update their own guests
-        if current_user.get("customer_id") != customer_id:
-            raise HTTPException(
-                status_code=status.HTTP_403_FORBIDDEN,
-                detail="Access denied. You can only update your own guests."
-            )
+        customer_id=current_user.get("customer_id")
         
         # Check if guest exists and belongs to user
         existing_guest = await GuestModel.get_guest_by_id(guest_id)
@@ -211,9 +187,8 @@ async def update_guest(
             detail="Failed to update guest profile"
         )
 
-@router.delete("/{customer_id}/guests/{guest_id}", response_model=GuestDeleteResponse)
+@router.delete("/guests/{guest_id}", response_model=GuestDeleteResponse)
 async def delete_guest(
-    customer_id: str,
     guest_id: str,
     current_user: Dict[str, Any] = Depends(get_current_user)
 ):
@@ -226,11 +201,7 @@ async def delete_guest(
     """
     try:
         # Verify user can only delete their own guests
-        if current_user.get("customer_id") != customer_id:
-            raise HTTPException(
-                status_code=status.HTTP_403_FORBIDDEN,
-                detail="Access denied. You can only delete your own guests."
-            )
+        customer_id=current_user.get("customer_id")
         
         # Check if guest exists and belongs to user
         existing_guest = await GuestModel.get_guest_by_id(guest_id)

app/routers/pet_router.py

@@ -36,9 +36,8 @@ async def get_current_user(token: str = Depends(security)) -> Dict[str, Any]:
             detail="Invalid or expired token"
         )
 
-@router.get("/{customer_id}/pets", response_model=PetListResponse)
+@router.get("/pets", response_model=PetListResponse)
 async def get_user_pets(
-    customer_id: str,
     current_user: Dict[str, Any] = Depends(get_current_user)
 ):
     """
@@ -49,11 +48,7 @@ async def get_user_pets(
     """
     try:
         # Verify user can only access their own pets
-        if current_user.get("customer_id") != customer_id:
-            raise HTTPException(
-                status_code=status.HTTP_403_FORBIDDEN,
-                detail="Access denied. You can only view your own pets."
-            )
+        customer_id=current_user.get("customer_id")
         
         pets_data = await PetModel.get_user_pets(customer_id)
         
@@ -73,9 +68,8 @@ async def get_user_pets(
             detail="Failed to retrieve pets"
         )
 
-@router.post("/{customer_id}/pets", response_model=PetResponse, status_code=status.HTTP_201_CREATED)
+@router.post("/pets", response_model=PetResponse, status_code=status.HTTP_201_CREATED)
 async def create_pet(
-    customer_id: str,
     pet_data: PetCreateRequest,
     current_user: Dict[str, Any] = Depends(get_current_user)
 ):
@@ -88,27 +82,11 @@ async def create_pet(
     """
     try:
         # Verify user can only create pets for themselves
-        if current_user.get("customer_id") != customer_id:
-            raise HTTPException(
-                status_code=status.HTTP_403_FORBIDDEN,
-                detail="Access denied. You can only create pets for yourself."
-            )
-        
+        customer_id=current_user.get("customer_id")
+
+
+        pet_id = await PetModel.create_pet(customer_id,pet_data.dict())
         # Create pet in database
-        pet_id = await PetModel.create_pet(
-            customer_id=customer_id,
-            pet_name=pet_data.pet_name,
-            species=pet_data.species.value,
-            breed=pet_data.breed,
-            date_of_birth=pet_data.date_of_birth,
-            age=pet_data.age,
-            weight=pet_data.weight,
-            gender=pet_data.gender.value if pet_data.gender else None,
-            temperament=pet_data.temperament.value if pet_data.temperament else None,
-            health_notes=pet_data.health_notes,
-            is_vaccinated=pet_data.is_vaccinated,
-            pet_photo_url=pet_data.pet_photo_url
-        )
         
         if not pet_id:
             raise HTTPException(
@@ -135,9 +113,8 @@ async def create_pet(
             detail="Failed to create pet profile"
         )
 
-@router.put("/{customer_id}/pets/{pet_id}", response_model=PetResponse)
+@router.put("/pets/{pet_id}", response_model=PetResponse)
 async def update_pet(
-    customer_id: str,
     pet_id: str,
     pet_data: PetUpdateRequest,
     current_user: Dict[str, Any] = Depends(get_current_user)
@@ -152,11 +129,7 @@ async def update_pet(
     """
     try:
         # Verify user can only update their own pets
-        if current_user.get("customer_id") != customer_id:
-            raise HTTPException(
-                status_code=status.HTTP_403_FORBIDDEN,
-                detail="Access denied. You can only update your own pets."
-            )
+        customer_id=current_user.get("customer_id")
         
         # Check if pet exists and belongs to user
         existing_pet = await PetModel.get_pet_by_id(pet_id)
@@ -214,9 +187,8 @@ async def update_pet(
             detail="Failed to update pet profile"
         )
 
-@router.delete("/{customer_id}/pets/{pet_id}", response_model=PetDeleteResponse)
+@router.delete("/pets/{pet_id}", response_model=PetDeleteResponse)
 async def delete_pet(
-    customer_id: str,
     pet_id: str,
     current_user: Dict[str, Any] = Depends(get_current_user)
 ):
@@ -229,11 +201,7 @@ async def delete_pet(
     """
     try:
         # Verify user can only delete their own pets
-        if current_user.get("customer_id") != customer_id:
-            raise HTTPException(
-                status_code=status.HTTP_403_FORBIDDEN,
-                detail="Access denied. You can only delete your own pets."
-            )
+        customer_id=current_user.get("customer_id")
         
         # Check if pet exists and belongs to user
         existing_pet = await PetModel.get_pet_by_id(pet_id)

app/schemas/guest_schema.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel, Field, validator, EmailStr
 from typing import Optional, List
-from datetime import datetime
+from datetime import datetime,date
 from enum import Enum
 
 class GenderEnum(str, Enum):
@@ -21,7 +21,7 @@ class GuestCreateRequest(BaseModel):
     email: Optional[EmailStr] = Field(None, description="Guest's email address")
     phone_number: Optional[str] = Field(None, max_length=20, description="Guest's phone number")
     gender: Optional[GenderEnum] = Field(None, description="Guest's gender")
-    date_of_birth: Optional[datetime] = Field(None, description="Guest's date of birth for age calculation")
+    date_of_birth: Optional[date] = Field(None, description="Guest's date of birth for age calculation")
     relationship: Optional[RelationshipEnum] = Field(None, description="Relationship to the user")
     notes: Optional[str] = Field(None, max_length=500, description="Additional notes about the guest")
     
@@ -49,10 +49,10 @@ class GuestCreateRequest(BaseModel):
     @validator('date_of_birth')
     def validate_date_of_birth(cls, v):
         if v is not None:
-            if v > datetime.now():
+            if v > date.today():
                 raise ValueError('Date of birth cannot be in the future')
             # Check if age would be reasonable (not more than 120 years old)
-            age = (datetime.now() - v).days // 365
+            age = (date.today() - v).days // 365
             if age > 120:
                 raise ValueError('Date of birth indicates unrealistic age')
         return v
@@ -92,10 +92,10 @@ class GuestUpdateRequest(BaseModel):
     @validator('date_of_birth')
     def validate_date_of_birth(cls, v):
         if v is not None:
-            if v > datetime.now():
+            if v > date.today():
                 raise ValueError('Date of birth cannot be in the future')
             # Check if age would be reasonable (not more than 120 years old)
-            age = (datetime.now() - v).days // 365
+            age = (date.today() - v).days // 365
             if age > 120:
                 raise ValueError('Date of birth indicates unrealistic age')
         return v

app/schemas/pet_schema.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel, Field, validator
 from typing import Optional, List
-from datetime import datetime
+from datetime import datetime,date
 from enum import Enum
 
 class SpeciesEnum(str, Enum):
@@ -24,7 +24,7 @@ class PetCreateRequest(BaseModel):
     pet_name: str = Field(..., min_length=1, max_length=100, description="Name of the pet")
     species: SpeciesEnum = Field(..., description="Species of the pet")
     breed: Optional[str] = Field(None, max_length=100, description="Breed of the pet")
-    date_of_birth: Optional[datetime] = Field(None, description="Pet's date of birth")
+    date_of_birth: Optional[date] = Field(None, description="Pet's date of birth")
     age: Optional[int] = Field(None, ge=0, le=50, description="Pet's age in years")
     weight: Optional[float] = Field(None, ge=0, le=200, description="Pet's weight in kg")
     gender: Optional[GenderEnum] = Field(None, description="Pet's gender")
@@ -52,7 +52,7 @@ class PetUpdateRequest(BaseModel):
     pet_name: Optional[str] = Field(None, min_length=1, max_length=100, description="Name of the pet")
     species: Optional[SpeciesEnum] = Field(None, description="Species of the pet")
     breed: Optional[str] = Field(None, max_length=100, description="Breed of the pet")
-    date_of_birth: Optional[datetime] = Field(None, description="Pet's date of birth")
+    date_of_birth: Optional[date] = Field(None, description="Pet's date of birth")
     age: Optional[int] = Field(None, ge=0, le=50, description="Pet's age in years")
     weight: Optional[float] = Field(None, ge=0, le=200, description="Pet's weight in kg")
     gender: Optional[GenderEnum] = Field(None, description="Pet's gender")

app/utils/db.py

@@ -0,0 +1,26 @@
+from datetime import datetime,date
+from decimal import Decimal
+from typing import Any
+from pydantic import BaseModel
+
+def prepare_for_db(obj: Any) -> Any:
+    """
+    Recursively sanitizes the object to be MongoDB-compatible:
+    - Converts Decimal to float
+    - Converts datetime with tzinfo to naive datetime
+    - Converts Pydantic BaseModel to dict
+    """
+    if isinstance(obj, Decimal):
+        return float(obj)
+    elif isinstance(obj, date) and not isinstance(obj, datetime):
+        return datetime(obj.year, obj.month, obj.day)
+    elif isinstance(obj, datetime):
+        return obj.replace(tzinfo=None)
+    elif isinstance(obj, BaseModel):
+        return prepare_for_db(obj.dict())
+    elif isinstance(obj, dict):
+        return {k: prepare_for_db(v) for k, v in obj.items()}
+    elif isinstance(obj, list):
+        return [prepare_for_db(v) for v in obj]
+    else:
+        return obj