updated

wpcodevo · wpcodevo · commit 232e4fe5fd87 · 2022-07-12T20:34:40.000Z
diff --git a/app/routers/post.py b/app/routers/post.py
@@ -8,13 +8,13 @@
 router = APIRouter()
 
 
-@router.get('/')
+@router.get('/', response_model=schemas.ListPostResponse)
 def get_posts(db: Session = Depends(get_db), limit: int = 10, page: int = 1, search: str = '', user_id: str = Depends(require_user)):
     skip = (page - 1) * limit
 
     posts = db.query(models.Post).group_by(models.Post.id).filter(
         models.Post.title.contains(search)).limit(limit).offset(skip).all()
-    return {'status': 'success', 'results': len(posts), 'data': posts}
+    return {'status': 'success', 'results': len(posts), 'posts': posts}
 
 
 @router.post('/', status_code=status.HTTP_201_CREATED, response_model=schemas.PostResponse)
@@ -28,14 +28,14 @@ def create_post(post: schemas.CreatePostSchema, db: Session = Depends(get_db), o
 
 
 @router.put('/{id}', response_model=schemas.PostResponse)
-def update_post(id: str, post: schemas.CreatePostSchema, db: Session = Depends(get_db), user_id: str = Depends(require_user)):
+def update_post(id: str, post: schemas.UpdatePostSchema, db: Session = Depends(get_db), user_id: str = Depends(require_user)):
     post_query = db.query(models.Post).filter(models.Post.id == id)
     updated_post = post_query.first()
 
     if not updated_post:
         raise HTTPException(status_code=status.HTTP_200_OK,
                             detail=f'No post with this id: {id} found')
-    if updated_post.owner_id != user_id:
+    if updated_post.user_id != uuid.UUID(user_id):
         raise HTTPException(status_code=status.HTTP_403_FORBIDDEN,
                             detail='You are not allowed to perform this action')
     post_query.update(post.dict(), synchronize_session=False)
diff --git a/app/schemas.py b/app/schemas.py
@@ -1,4 +1,5 @@
 from datetime import datetime
+from typing import List
 import uuid
 from pydantic import BaseModel, EmailStr, constr
 
@@ -30,6 +31,10 @@ class UserResponse(UserBaseSchema):
     updated_at: datetime
 
 
+class FilteredUserResponse(UserBaseSchema):
+    pass
+
+
 class PostBaseSchema(BaseModel):
     title: str
     content: str
@@ -44,9 +49,24 @@ class Config:
 class CreatePostSchema(PostBaseSchema):
     pass
 
+class UpdatePostSchema(BaseModel):
+    title: str | None = None
+    content: str | None = None
+    category: str | None = None
+    image: str | None = None
+
+    class Config:
+        orm_mode = True
+
 
 class PostResponse(PostBaseSchema):
     id: uuid.UUID
-    user: UserResponse
+    user: FilteredUserResponse
     created_at: datetime
     updated_at: datetime
+
+
+class ListPostResponse(BaseModel):
+    status: str
+    results: int
+    posts: List[PostResponse]
