Update app.py

app.py

@@ -42,11 +42,15 @@ class TokenData(BaseModel):
     username: Optional[str] = None
 
 class EpisodeUpdate(BaseModel):
+    """Data required to add an episode to the watch history."""
     show_id: str
-    show_title: str
     season_number: int
     episode_number: int
 
+class WatchedEpisode(EpisodeUpdate):
+    """Represents a single episode in the user's watch history, including the timestamp."""
+    watch_timestamp: datetime
+
 class UserBase(BaseModel):
     username: str
 
@@ -247,17 +251,63 @@ async def upload_profile_picture(
     )
 
 
-@app.post("/users/me/watch-history", status_code=status.HTTP_200_OK, tags=["User"])
+import status
+from fastapi import Depends, APIRouter
+from pydantic import BaseModel
+from datetime import datetime, timezone
+from typing import List
+
+# Assume these are defined elsewhere in your application
+# from .dependencies import get_current_user, load_users, save_users
+# from .models import UserInDB
+
+# --- Pydantic Models ---
+# It's good practice to define your data models clearly.
+
+
+
+
+
+
+@app.get("/users/me/watch-history", response_model=List[WatchedEpisode])
+async def get_watch_history(
+    current_user: UserInDB = Depends(get_current_user)
+):
+    """
+    Retrieves the current user's watch history, sorted by most recently watched.
+    """
+    users_db = load_users()
+    user_data = users_db.get(current_user.username, {})
+    
+    # Get the watch history, defaulting to an empty list if it doesn't exist
+    watch_history = user_data.get("watch_history", [])
+    
+    # Optional: Sort the history so the most recently watched items are first
+    # The `key` lambda function handles cases where an old item might not have a timestamp.
+    watch_history.sort(
+        key=lambda item: item.get("watch_timestamp", "1970-01-01T00:00:00Z"), 
+        reverse=True
+    )
+    
+    return watch_history
+
+
+@app.post("/users/me/watch-history", status_code=status.HTTP_200_OK)
 async def update_watch_history(
     episode_data: EpisodeUpdate,
     current_user: UserInDB = Depends(get_current_user)
 ):
     """
-    Adds a new episode to the user's watch history.
+    Adds a new episode with a timestamp to the user's watch history.
+    If the episode already exists, its timestamp is not updated.
     """
     users_db = load_users()
     user_data = users_db[current_user.username]
     
+    # Ensure watch_history list exists
+    if "watch_history" not in user_data:
+        user_data["watch_history"] = []
+
     # Create a unique identifier for the episode to prevent duplicates
     episode_id = f"{episode_data.show_id}_{episode_data.season_number}_{episode_data.episode_number}"
     
@@ -268,7 +318,13 @@ async def update_watch_history(
     )
 
     if not is_already_watched:
-        user_data["watch_history"].append(episode_data.dict())
+        # Convert the Pydantic model to a dictionary to add the new field
+        new_episode_record = episode_data.dict()
+        
+        # Add the UTC timestamp in standard ISO format
+        new_episode_record["watch_timestamp"] = datetime.now(timezone.utc).isoformat()
+        
+        user_data["watch_history"].append(new_episode_record)
         save_users(users_db)
         return {"message": "Watch history updated."}