testing

backend/routers/entries.py

@@ -5,6 +5,7 @@ from models import JournalEntryCreate, JournalEntryUpdate, JournalEntry, Entries
 from datetime import datetime, timedelta
 from typing import List, Optional
 from bson import ObjectId
+from bson.errors import InvalidId
 from utils import format_ist_timestamp
 
 router = APIRouter()
@@ -50,7 +51,10 @@ async def create_entry(user_id: str, entry_data: JournalEntryCreate):
 
     try:
         user_oid = ObjectId(user_id)
+    except InvalidId:
+        raise HTTPException(status_code=400, detail="Invalid user ID format")
 
+    try:
         # Verify user exists
         user = db.users.find_one({"_id": user_oid})
         if not user:
@@ -91,9 +95,6 @@ async def create_entry(user_id: str, entry_data: JournalEntryCreate):
     except HTTPException:
         raise
     except Exception as e:
-        if "invalid ObjectId" in str(e).lower():
-            raise HTTPException(
-                status_code=400, detail="Invalid user ID format")
         raise HTTPException(
             status_code=500, detail=f"Failed to create entry: {str(e)}")
 
@@ -113,7 +114,10 @@ async def get_user_entries(
 
     try:
         user_oid = ObjectId(user_id)
+    except InvalidId:
+        raise HTTPException(status_code=400, detail="Invalid user ID format")
 
+    try:
         # Verify user exists
         user = db.users.find_one({"_id": user_oid})
         if not user:
@@ -142,10 +146,9 @@ async def get_user_entries(
                 "hasMore": has_more
             }
         }
+    except HTTPException:
+        raise
     except Exception as e:
-        if "invalid ObjectId" in str(e).lower():
-            raise HTTPException(
-                status_code=400, detail="Invalid user ID format")
         raise HTTPException(
             status_code=500, detail=f"Failed to fetch entries: {str(e)}")
 
@@ -158,7 +161,10 @@ async def get_entry(user_id: str, entry_id: str):
     try:
         user_oid = ObjectId(user_id)
         entry_oid = ObjectId(entry_id)
+    except InvalidId:
+        raise HTTPException(status_code=400, detail="Invalid ID format")
 
+    try:
         entry = db.entries.find_one({
             "_id": entry_oid,
             "userId": user_oid
@@ -168,9 +174,9 @@ async def get_entry(user_id: str, entry_id: str):
             raise HTTPException(status_code=404, detail="Entry not found")
 
         return _format_entry(entry)
+    except HTTPException:
+        raise
     except Exception as e:
-        if "invalid ObjectId" in str(e).lower():
-            raise HTTPException(status_code=400, detail="Invalid ID format")
         raise HTTPException(
             status_code=500, detail=f"Failed to fetch entry: {str(e)}")
 
@@ -183,7 +189,10 @@ async def update_entry(user_id: str, entry_id: str, entry_data: JournalEntryUpda
     try:
         user_oid = ObjectId(user_id)
         entry_oid = ObjectId(entry_id)
+    except InvalidId:
+        raise HTTPException(status_code=400, detail="Invalid ID format")
 
+    try:
         update_data = entry_data.model_dump(exclude_unset=True)
         update_data["updatedAt"] = datetime.utcnow()
 
@@ -206,9 +215,9 @@ async def update_entry(user_id: str, entry_id: str, entry_data: JournalEntryUpda
         # Fetch and return updated entry
         entry = db.entries.find_one({"_id": entry_oid})
         return _format_entry(entry)
+    except HTTPException:
+        raise
     except Exception as e:
-        if "invalid ObjectId" in str(e).lower():
-            raise HTTPException(status_code=400, detail="Invalid ID format")
         raise HTTPException(
             status_code=500, detail=f"Failed to update entry: {str(e)}")
 
@@ -221,7 +230,10 @@ async def delete_entry(user_id: str, entry_id: str):
     try:
         user_oid = ObjectId(user_id)
         entry_oid = ObjectId(entry_id)
+    except InvalidId:
+        raise HTTPException(status_code=400, detail="Invalid ID format")
 
+    try:
         result = db.entries.delete_one({
             "_id": entry_oid,
             "userId": user_oid
@@ -231,9 +243,9 @@ async def delete_entry(user_id: str, entry_id: str):
             raise HTTPException(status_code=404, detail="Entry not found")
 
         return {"message": "Entry deleted successfully"}
+    except HTTPException:
+        raise
     except Exception as e:
-        if "invalid ObjectId" in str(e).lower():
-            raise HTTPException(status_code=400, detail="Invalid ID format")
         raise HTTPException(
             status_code=500, detail=f"Failed to delete entry: {str(e)}")
 
@@ -249,7 +261,10 @@ async def get_entries_by_date(user_id: str, date_str: str):
 
     try:
         user_oid = ObjectId(user_id)
+    except InvalidId:
+        raise HTTPException(status_code=400, detail="Invalid user ID format")
 
+    try:
         # Parse date
         target_date = datetime.strptime(date_str, "%Y-%m-%d")
         next_date = target_date + timedelta(days=1)
@@ -274,10 +289,9 @@ async def get_entries_by_date(user_id: str, date_str: str):
     except ValueError:
         raise HTTPException(
             status_code=400, detail="Invalid date format. Use YYYY-MM-DD")
+    except HTTPException:
+        raise
     except Exception as e:
-        if "invalid ObjectId" in str(e).lower():
-            raise HTTPException(
-                status_code=400, detail="Invalid user ID format")
         raise HTTPException(
             status_code=500, detail=f"Failed to fetch entries: {str(e)}")
 
@@ -293,7 +307,10 @@ async def get_entries_by_month(user_id: str, year: int, month: int, limit: int =
 
     try:
         user_oid = ObjectId(user_id)
+    except InvalidId:
+        raise HTTPException(status_code=400, detail="Invalid user ID format")
 
+    try:
         if not (1 <= month <= 12):
             raise HTTPException(
                 status_code=400, detail="Month must be between 1 and 12")
@@ -325,10 +342,9 @@ async def get_entries_by_month(user_id: str, year: int, month: int, limit: int =
         }
     except ValueError:
         raise HTTPException(status_code=400, detail="Invalid year or month")
+    except HTTPException:
+        raise
     except Exception as e:
-        if "invalid ObjectId" in str(e).lower():
-            raise HTTPException(
-                status_code=400, detail="Invalid user ID format")
         raise HTTPException(
             status_code=500, detail=f"Failed to fetch entries: {str(e)}")
 
@@ -347,6 +363,8 @@ async def convert_utc_to_ist(data: dict):
             "utc": utc_timestamp,
             "ist": ist_timestamp
         }
+    except HTTPException:
+        raise
     except ValueError as e:
         raise HTTPException(status_code=400, detail=str(e))
     except Exception as e: