Use scalars

ArcLightSlavik · ArcLightSlavik · commit db9b2cfdb628 · 2020-11-15T08:58:52.000+02:00
diff --git a/docs_src/async_sql_databases/sql_app/crud.py b/docs_src/async_sql_databases/sql_app/crud.py
@@ -6,17 +6,17 @@
 
 async def get_user(db: AsyncSession, user_id: int):
     db_execute = await db.execute(select(models.User).where(models.User.id == user_id))
-    return db_execute.first()
+    return db_execute.scalars().first()
 
 
 async def get_user_by_email(db: AsyncSession, email: str):
     db_execute = await db.execute(select(models.User).where(models.User.email == email))
-    return db_execute.first()
+    return db_execute.scalars().first()
 
 
 async def get_users(db: AsyncSession, skip: int = 0, limit: int = 100):
     db_execute = await db.execute(select(models.User).offset(skip).limit(limit))
-    return db_execute.all()
+    return db_execute.scalars().all()
 
 
 async def create_user(db: AsyncSession, user: schemas.UserCreate):
@@ -30,7 +30,7 @@ async def create_user(db: AsyncSession, user: schemas.UserCreate):
 
 async def get_items(db: AsyncSession, skip: int = 0, limit: int = 100):
     db_execute = await db.execute(select(models.Item).offset(skip).limit(limit))
-    return db_execute.all()
+    return db_execute.scalars().all()
 
 
 async def create_user_item(db: AsyncSession, item: schemas.ItemCreate, user_id: int):
diff --git a/docs_src/async_sql_databases/sql_app/main.py b/docs_src/async_sql_databases/sql_app/main.py
@@ -1,3 +1,5 @@
+from typing import List
+
 from fastapi import Depends, FastAPI, HTTPException
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -23,37 +25,37 @@ async def get_db():
         await session.close()
 
 
-@app.post("/users/")
+@app.post("/users/", response_model=schemas.User)
 async def create_user(user: schemas.UserCreate, db: AsyncSession = Depends(get_db)):
     db_user = await crud.get_user_by_email(db, email=user.email)
     if db_user:
         raise HTTPException(status_code=400, detail="Email already registered")
     return await crud.create_user(db=db, user=user)
 
 
-@app.get("/users/")
+@app.get("/users/", response_model=List[schemas.User])
 async def read_users(
     skip: int = 0, limit: int = 100, db: AsyncSession = Depends(get_db)
 ):
     return await crud.get_users(db, skip=skip, limit=limit)
 
 
-@app.get("/users/{user_id}")
+@app.get("/users/{user_id}", response_model=schemas.User)
 async def read_user(user_id: int, db: AsyncSession = Depends(get_db)):
     db_user = await crud.get_user(db, user_id=user_id)
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
     return db_user
 
 
-@app.post("/users/{user_id}/items/")
+@app.post("/users/{user_id}/items/", response_model=schemas.Item)
 async def create_item_for_user(
     user_id: int, item: schemas.ItemCreate, db: AsyncSession = Depends(get_db)
 ):
     return await crud.create_user_item(db=db, item=item, user_id=user_id)
 
 
-@app.get("/items/")
+@app.get("/items/", response_model=List[schemas.Item])
 async def read_items(
     skip: int = 0, limit: int = 100, db: AsyncSession = Depends(get_db)
 ):
