updates

Backend/src/reviews/routes/favorite_routes.py

@@ -13,8 +13,15 @@ router = APIRouter(prefix='/favorites', tags=['favorites'])
 
 @router.get('/')
 async def get_favorites(current_user: User=Depends(get_current_user), db: Session=Depends(get_db)):
-    role = db.query(Role).filter(Role.id == current_user.role_id).first()
-    if role and role.name in ['admin', 'staff', 'accountant']:
+    # PERFORMANCE: Use eager-loaded role relationship if available
+    if hasattr(current_user, 'role') and current_user.role is not None:
+        role_name = current_user.role.name
+    else:
+        # Fallback: query if relationship wasn't loaded
+        role = db.query(Role).filter(Role.id == current_user.role_id).first()
+        role_name = role.name if role else 'customer'
+    
+    if role_name in ['admin', 'staff', 'accountant']:
         raise HTTPException(status_code=403, detail='Admin, staff, and accountant users cannot have favorites')
     try:
         favorites = db.query(Favorite).filter(Favorite.user_id == current_user.id).order_by(Favorite.created_at.desc()).all()
@@ -35,8 +42,15 @@ async def get_favorites(current_user: User=Depends(get_current_user), db: Sessio
 
 @router.post('/{room_id}')
 async def add_favorite(room_id: int, current_user: User=Depends(get_current_user), db: Session=Depends(get_db)):
-    role = db.query(Role).filter(Role.id == current_user.role_id).first()
-    if role and role.name in ['admin', 'staff', 'accountant']:
+    # PERFORMANCE: Use eager-loaded role relationship if available
+    if hasattr(current_user, 'role') and current_user.role is not None:
+        role_name = current_user.role.name
+    else:
+        # Fallback: query if relationship wasn't loaded
+        role = db.query(Role).filter(Role.id == current_user.role_id).first()
+        role_name = role.name if role else 'customer'
+    
+    if role_name in ['admin', 'staff', 'accountant']:
         raise HTTPException(status_code=403, detail='Admin, staff, and accountant users cannot add favorites')
     try:
         room = db.query(Room).filter(Room.id == room_id).first()
@@ -58,8 +72,15 @@ async def add_favorite(room_id: int, current_user: User=Depends(get_current_user
 
 @router.delete('/{room_id}')
 async def remove_favorite(room_id: int, current_user: User=Depends(get_current_user), db: Session=Depends(get_db)):
-    role = db.query(Role).filter(Role.id == current_user.role_id).first()
-    if role and role.name in ['admin', 'staff', 'accountant']:
+    # PERFORMANCE: Use eager-loaded role relationship if available
+    if hasattr(current_user, 'role') and current_user.role is not None:
+        role_name = current_user.role.name
+    else:
+        # Fallback: query if relationship wasn't loaded
+        role = db.query(Role).filter(Role.id == current_user.role_id).first()
+        role_name = role.name if role else 'customer'
+    
+    if role_name in ['admin', 'staff', 'accountant']:
         raise HTTPException(status_code=403, detail='Admin, staff, and accountant users cannot remove favorites')
     try:
         favorite = db.query(Favorite).filter(Favorite.user_id == current_user.id, Favorite.room_id == room_id).first()
@@ -76,8 +97,15 @@ async def remove_favorite(room_id: int, current_user: User=Depends(get_current_u
 
 @router.get('/check/{room_id}')
 async def check_favorite(room_id: int, current_user: User=Depends(get_current_user), db: Session=Depends(get_db)):
-    role = db.query(Role).filter(Role.id == current_user.role_id).first()
-    if role and role.name in ['admin', 'staff', 'accountant']:
+    # PERFORMANCE: Use eager-loaded role relationship if available
+    if hasattr(current_user, 'role') and current_user.role is not None:
+        role_name = current_user.role.name
+    else:
+        # Fallback: query if relationship wasn't loaded
+        role = db.query(Role).filter(Role.id == current_user.role_id).first()
+        role_name = role.name if role else 'customer'
+    
+    if role_name in ['admin', 'staff', 'accountant']:
         return {'status': 'success', 'data': {'isFavorited': False}}
     try:
         favorite = db.query(Favorite).filter(Favorite.user_id == current_user.id, Favorite.room_id == room_id).first()