feature/fix: user profile updated route added & service, schema and utils fixes

Author: DataRohit

pkg/errors.py

@@ -0,0 +1,59 @@
+from datetime import datetime
+
+import bcrypt
+from fastapi import Cookie, HTTPException, status
+from itsdangerous import URLSafeTimedSerializer
+
+from .config import Config
+
+url_safe_timed_serializer = URLSafeTimedSerializer(
+    secret_key=Config.JWT_SECRET, salt=Config.JWT_SALT
+)
+
+
+def generate_password_hash(password: str) -> str:
+    salt = bcrypt.gensalt(rounds=Config.BCRYPT_ROUND)
+    return bcrypt.hashpw(password.encode("utf-8"), salt).decode("utf-8")
+
+
+def verify_password(password: str, hashed_password: str) -> bool:
+    return bcrypt.checkpw(password.encode("utf-8"), hashed_password.encode("utf-8"))
+
+
+def generate_url_safe_token(data: dict) -> str:
+    return url_safe_timed_serializer.dumps(data)
+
+
+def decode_url_safe_token(token: str) -> dict:
+    return url_safe_timed_serializer.loads(token)
+
+
+def verify_url_safe_token(token: str) -> str:
+    data = decode_url_safe_token(token)
+
+    user_uid = data.get("user_uid")
+    expires_at = data.get("expires_at")
+
+    if not user_uid or not expires_at:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Invalid access token",
+        )
+
+    if datetime.now().timestamp() > expires_at:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Access token expired",
+        )
+
+    return user_uid
+
+
+def get_current_user_uid(access_token: str = Cookie(None)) -> str:
+    if access_token is None:
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Access token required",
+        )
+
+    return verify_url_safe_token(access_token)

pkg/utils.py

@@ -1,8 +1,8 @@
 from fastapi import FastAPI
 
-from pkg.errors import register_all_errors
 from pkg.middleware import register_middleware
 from src.auth.routes import auth_router
+from src.profile.routes import profile_router
 
 version = "v1"
 
@@ -31,8 +31,8 @@
 )
 
 
-register_all_errors(app)
 register_middleware(app)
 
 
 app.include_router(auth_router, prefix=f"{version_prefix}/auth", tags=["auth"])
+app.include_router(profile_router, prefix=f"{version_prefix}/profile", tags=["profile"])

src/__init__.py

@@ -7,8 +7,13 @@
 
 from pkg.config import Config
 from pkg.db import get_session
-from pkg.errors import UserAlreadyExists
 from pkg.tasks import send_email_task
+from pkg.utils import (
+    decode_url_safe_token,
+    generate_password_hash,
+    generate_url_safe_token,
+    verify_password,
+)
 
 from .schemas import (
     UserCreateResponseSchema,
@@ -19,12 +24,6 @@
 )
 from .service import PasswordResetLogService, TokenBlackListService, UserService
 from .tasks import create_user_profile_task
-from .utils import (
-    decode_url_safe_token,
-    generate_password_hash,
-    generate_url_safe_token,
-    verify_password,
-)
 
 auth_router = APIRouter()
 
@@ -39,7 +38,10 @@ async def register_user(
     session: AsyncSession = Depends(get_session),
 ):
     if await user_service.user_exists(user_data.email, session):
-        raise UserAlreadyExists
+        return JSONResponse(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            content={"message": "User with email already exists"},
+        )
 
     user = await user_service.create_user(user_data, session)
 

src/auth/routes.py

@@ -3,11 +3,11 @@
 from sqlalchemy import delete, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
+from pkg.utils import generate_password_hash
 from src.profile.models import UserProfile
 
 from .models import PasswordResetLog, TokenBlacklist, User
 from .schemas import UserCreateSchema
-from .utils import generate_password_hash
 
 
 class UserService:

src/auth/service.py

@@ -0,0 +1,41 @@
+import json
+
+from fastapi import APIRouter, Depends, status
+from fastapi.responses import JSONResponse
+from sqlmodel.ext.asyncio.session import AsyncSession
+
+from pkg.db import get_session
+from pkg.utils import get_current_user_uid
+from src.auth.service import UserService
+
+from .schemas import UserProfileResponseSchema, UserProfileUpdateSchema
+from .service import UserProfileService
+
+profile_router = APIRouter()
+
+user_service = UserService()
+user_profile_service = UserProfileService()
+
+
+@profile_router.put("/", status_code=status.HTTP_200_OK)
+async def update_user_profile(
+    profile_data: UserProfileUpdateSchema,
+    session: AsyncSession = Depends(get_session),
+    user_uid: str = Depends(get_current_user_uid),
+):
+    user_profile = await user_profile_service.get_user_profile_by_user_uid(
+        user_uid, session
+    )
+    user_profile = await user_profile_service.update_user_profile(
+        user_profile, profile_data.model_dump(), session
+    )
+
+    return JSONResponse(
+        status_code=status.HTTP_200_OK,
+        content={
+            "message": "User profile updated successfully",
+            "user_profile": UserProfileResponseSchema(
+                **json.loads(user_profile.model_dump_json())
+            ).model_dump(),
+        },
+    )

src/auth/utils.py

@@ -6,16 +6,11 @@ class UserProfileUpdateSchema(BaseModel):
         max_length=500,
         description="Tell the Bookly community a little about yourself! You can mention your favorite genres, what kinds of books you're currently reading or offering, and whether you're open to lending, borrowing, or selling books. Help others get to know your reading style and what you're looking for!",
     )
-    avatar: str = Field(
-        max_length=200,
-        description="A URL to an avatar image. Use a service like DiceBear to generate a random avatar: https://avatars.dicebear.com/",
-    )
 
     model_config = {
         "json_schema_extra": {
             "example": {
                 "bio": "I love reading science fiction and fantasy novels. I'm currently reading the latest book in the Wheel of Time series and I'm open to lending and borrowing books.",
-                "avatar": "https://api.dicebear.com/9.x/adventurer-neutral/png?seed=Adrian",
             }
         }
     }