now only querying what's necessary for api endpoints (response_model usually) where possible

Author: igorbenav

src/app/api/v1/posts.py

@@ -23,7 +23,7 @@ async def write_post(
     current_user: Annotated[UserRead, Depends(get_current_user)],
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_user = await crud_users.get(db=db, username=username, is_deleted=False)
+    db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username, is_deleted=False)
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
 
@@ -44,11 +44,11 @@ async def read_posts(
     username: str, 
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_user = await crud_users.get(db=db, username=username, is_deleted=False)
+    db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username, is_deleted=False)
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
 
-    posts = await crud_posts.get_multi(db=db, created_by_user_id=db_user.id, is_deleted=False)
+    posts = await crud_posts.get_multi(db=db, schema_to_select=PostRead, created_by_user_id=db_user.id, is_deleted=False)
     return posts
 
 
@@ -60,11 +60,11 @@ async def read_post(
     id: int, 
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_user = await crud_users.get(db=db, username=username, is_deleted=False)
+    db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username, is_deleted=False)
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
 
-    db_post = await crud_posts.get(db=db, id=id, created_by_user_id=db_user.id, is_deleted=False)
+    db_post = await crud_posts.get(db=db, schema_to_select=PostRead, id=id, created_by_user_id=db_user.id, is_deleted=False)
     if db_post is None:
         raise HTTPException(status_code=404, detail="Post not found")
 
@@ -85,14 +85,14 @@ async def patch_post(
     current_user: Annotated[UserRead, Depends(get_current_user)],
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_user = await crud_users.get(db=db, username=username, is_deleted=False)
+    db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username, is_deleted=False)
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
 
     if current_user.id != db_user.id:
         raise privileges_exception
 
-    db_post = await crud_posts.get(db=db, id=id, is_deleted=False)
+    db_post = await crud_posts.get(db=db, schema_to_select=PostRead, id=id, is_deleted=False)
     if db_post is None:
         raise HTTPException(status_code=404, detail="Post not found")
 
@@ -113,14 +113,14 @@ async def erase_post(
     current_user: Annotated[UserRead, Depends(get_current_user)],
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_user = await crud_users.get(db=db, username=username, is_deleted=False)
+    db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username, is_deleted=False)
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
 
     if current_user.id != db_user.id:
         raise privileges_exception
 
-    db_post = await crud_posts.get(db=db, id=id, is_deleted=False)
+    db_post = await crud_posts.get(db=db, schema_to_select=PostRead, id=id, is_deleted=False)
     if db_post is None:
         raise HTTPException(status_code=404, detail="Post not found")
 
@@ -141,11 +141,11 @@ async def erase_db_post(
     id: int,
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_user = await crud_users.get(db=db, username=username, is_deleted=False)
+    db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username, is_deleted=False)
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
 
-    db_post = await crud_posts.get(db=db, id=id, is_deleted=False)
+    db_post = await crud_posts.get(db=db, schema_to_select=PostRead, id=id, is_deleted=False)
     if db_post is None:
         raise HTTPException(status_code=404, detail="Post not found")
 

src/app/api/v1/users.py

@@ -38,7 +38,7 @@ async def write_user(
 
 @router.get("/users", response_model=List[UserRead])
 async def read_users(request: Request, db: Annotated[AsyncSession, Depends(async_get_db)]):
-    users = await crud_users.get_multi(db=db, is_deleted=False)
+    users = await crud_users.get_multi(db=db, schema_to_select=UserRead, is_deleted=False)
     return users
 
 
@@ -48,12 +48,10 @@ async def read_users_me(
 ):
     return current_user
 
-from app.core.cache import cache
-
 
 @router.get("/user/{username}", response_model=UserRead)
 async def read_user(request: Request, username: str, db: Annotated[AsyncSession, Depends(async_get_db)]):
-    db_user = await crud_users.get(db=db, username=username, is_deleted=False)
+    db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username, is_deleted=False)
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
 
@@ -68,7 +66,7 @@ async def patch_user(
     current_user: Annotated[UserRead, Depends(get_current_user)],
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_user = await crud_users.get(db=db, username=username)
+    db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username)
     if db_user is None:
         raise HTTPException(status_code=404, detail="User not found")
 
@@ -96,11 +94,11 @@ async def erase_user(
     current_user: Annotated[UserRead, Depends(get_current_user)],
     db: Annotated[AsyncSession, Depends(async_get_db)]
 ):
-    db_user = await crud_users.get(db=db, username=username)
-    if db_user is None:
+    db_user = await crud_users.get(db=db, schema_to_select=UserRead, username=username)
+    if not db_user:
         raise HTTPException(status_code=404, detail="User not found")
 
-    if db_user.username != current_user.username:
+    if username != current_user.username:
         raise privileges_exception
 
     await crud_users.delete(db=db, db_row=db_user, username=username)

src/app/crud/crud_base.py

@@ -6,7 +6,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.engine.row import Row
 
-from .helper import _extract_matching_columns_from_schema, _extract_matching_columns_from_kwargs
+from .helper import _extract_matching_columns_from_schema, _extract_matching_columns_from_kwargs, _extract_matching_columns_from_column_names
 
 ModelType = TypeVar("ModelType")
 CreateSchemaType = TypeVar("CreateSchemaType", bound=BaseModel)

src/app/crud/helper.py

@@ -40,3 +40,12 @@ def _extract_matching_columns_from_kwargs(model: Type[Base], kwargs: dict) -> Li
                 column_list.append(getattr(model, column_name))
 
     return column_list
+
+
+def _extract_matching_columns_from_column_names(model: Type[Base], column_names: List) -> List[Any]:
+    column_list = []
+    for column_name in column_names:
+        if hasattr(model, column_name):
+            column_list.append(getattr(model, column_name))
+
+    return column_list

src/app/schemas/user.py

@@ -39,6 +39,10 @@ class UserRead(BaseModel):
         str, 
         Field(min_length=2, max_length=20, pattern=r"^[a-z0-9]+$", examples=["userson"])
     ]
+    email: Annotated[
+        EmailStr, 
+        Field(examples=["[email protected]"])
+    ]
     profile_image_url: str