Refactor endpoints url.

Author: drmacsika

accounts/endpoints.py

@@ -36,7 +36,7 @@ async def create_user(
 
 
 
-@router.put("/me", response_model=UserOut)
+@router.put("/me/", response_model=UserOut)
 async def update_user_me(
     db: AsyncSession = Depends(get_session),
     first_name: str = Body(None),
@@ -64,7 +64,7 @@ async def update_user_me(
     return await user.update(obj_in=user_in, db=db, slug_field=current_user)
 
 
-@router.get("/me", response_model=UserOut)
+@router.get("/me/", response_model=UserOut)
 def read_user_me(
     db: AsyncSession = Depends(get_session),
     current_user: User = Depends(get_current_active_user),
@@ -75,7 +75,7 @@ def read_user_me(
     return current_user
 
 
-@router.post("/open", response_model=UserOut)
+@router.post("/open/", response_model=UserOut)
 async def create_user_open(
     request: UserCreate,
     db: AsyncSession = Depends(get_session)
@@ -91,7 +91,7 @@ async def create_user_open(
     return await user.create(obj_in=request, db=db)    
 
 
-@router.get("/{user_id}", response_model=UserOut)
+@router.get("/{user_id}/", response_model=UserOut)
 async def read_user_by_id(
     user_id: int,
     current_user: User = Depends(get_current_active_user),
@@ -110,7 +110,7 @@ async def read_user_by_id(
     return user
 
 
-@router.put("/{user_id}", response_model=UserOut)
+@router.put("/{user_id}/", response_model=UserOut)
 async def update_user(
     user_id: int,
     user_in: UserUpdate,

blog/endpoints.py

@@ -13,7 +13,7 @@
 router = APIRouter()
 
 
-@router.get("/blog/", response_model=List[PostOut], tags=["Blog Post"])
+@router.get("/posts/", response_model=List[PostOut], tags=["Blog Post"])
 async def get_all_posts(
     offset: int = 0,
     limit: int = 10,
@@ -22,7 +22,7 @@ async def get_all_posts(
     return await post.get_multiple(db=db, offset=offset, limit=limit)
 
 
-@router.get("/blog/tags/", response_model=List[CategoryOut], tags=["Blog Category"])
+@router.get("/tags/", response_model=List[CategoryOut], tags=["Blog Category"])
 async def get_all_categories(
     offset: int = 0,
     limit: int = 10,
@@ -31,7 +31,7 @@ async def get_all_categories(
     return await category.get_multiple(db=db, offset=offset, limit=limit)
 
 
-@router.post("/blog/", status_code=201, response_model = PostOut, tags=["Blog Post"])
+@router.post("/posts/", status_code=201, response_model = PostOut, tags=["Blog Post"])
 async def create_post(
     request: CreatePost,
     db: AsyncSession = Depends(get_session)) -> Any:
@@ -42,7 +42,7 @@ async def create_post(
     return await post.create(obj_in=request, db=db)
 
 
-@router.post("/blog/tag/", status_code=201, response_model=CategoryOut, tags=["Blog Category"])
+@router.post("/tags/", status_code=201, response_model=CategoryOut, tags=["Blog Category"])
 async def create_category(
     request: CreateCategory,
     db: AsyncSession = Depends(get_session)) -> Any:
@@ -53,27 +53,27 @@ async def create_category(
     return await category.create(obj_in=request, db=db)
 
 
-@router.get("/blog/{slug}/", response_model=PostOut, tags=["Blog Post"])
+@router.get("/posts/{slug}/", response_model=PostOut, tags=["Blog Post"])
 async def get_post(slug: str, db: AsyncSession = Depends(get_session)) -> Any:
     """Endpoint to get single blog post."""
     return await post.get(slug=slug, db=db)
 
 
-@router.get("/blog/tag/{slug}/", response_model=CategoryOut, tags=["Blog Category"])
+@router.get("/tags/{slug}/", response_model=CategoryOut, tags=["Blog Category"])
 async def get_category(slug: str, db: AsyncSession = Depends(get_session)) -> Any:
     """Endpoint to get single blog category."""
     return await category.get(slug=slug, db=db)
 
 
-@router.put("/blog/{slug}/", status_code=200, response_model=PostOut, tags=["Blog Post"])
+@router.put("/posts/{slug}/", status_code=200, response_model=PostOut, tags=["Blog Post"])
 async def update_post(
     request: UpdatePost,
     slug: str, db: AsyncSession = Depends(get_session)) -> Any:
     """Endpoint to update blog post."""
     return await post.update(obj_in=request, db=db, slug_field=slug)
 
 
-@router.put("/blog/tag/{slug}/", status_code=200, response_model=CategoryOut, tags=["Blog Category"])
+@router.put("/tags/{slug}/", status_code=200, response_model=CategoryOut, tags=["Blog Category"])
 async def update_category(
     request: UpdateCategory, 
     slug: str, 
@@ -82,15 +82,15 @@ async def update_category(
     return await category.update(db_obj=Category, obj_in=request, db=db, slug_field=slug)
 
 
-@router.delete("/blog/{slug}/", tags=["Blog Post"])
+@router.delete("/posts/{slug}/", tags=["Blog Post"])
 async def delete_post(
     slug: str,
     db: AsyncSession = Depends(get_session)) -> Any:
     """Endpoint to delete blog post."""
     return await post.delete(slug=slug, db=db)
 
 
-@router.delete("/blog/tag/{slug}/", tags=["Blog Category"])
+@router.delete("/tags/{slug}/", tags=["Blog Category"])
 async def delete_category(
     slug: str,
     db: AsyncSession = Depends(get_session)) -> Any:

contact/endpoints.py

@@ -9,7 +9,7 @@
 
 router = APIRouter()
 
-@router.get("/contacts/", response_model=List[ContactOut])
+@router.get("/", response_model=List[ContactOut])
 async def get_all_contacts(
     offset: int = 0,
     limit: int = 100,
@@ -18,7 +18,7 @@ async def get_all_contacts(
     return await contact.get_multiple(db=db, offset=offset, limit=limit)
 
 
-@router.post("/contact/create/", status_code=201, response_model=ContactOut)
+@router.post("/", status_code=201, response_model=ContactOut)
 async def create_contact(
     request: ContactCreate,
     db: AsyncSession = Depends(get_session)) -> Any:
@@ -29,15 +29,15 @@ async def create_contact(
     return await contact.create(obj_in=request, db=db)
 
 
-@router.get("/contact/{id}")
+@router.get("/{id}/")
 async def get_contact(
     id: int, 
     db: AsyncSession = Depends(get_session)) -> Any:
     """Endpoint to get each contact."""
     return await contact.get(slug=id, db=db)
 
 
-@router.delete("/contact/{id}/delete/")
+@router.delete("/{id}/")
 async def delete_contact(
     id: int,
     db: AsyncSession = Depends(get_session)) -> Any:

core/api_routers.py

@@ -6,10 +6,10 @@
 
 router = APIRouter()
 
-router.include_router(blog_router)
-router.include_router(contact_router, tags=["Contact"])
-router.include_router(accounts_router, tags=["Users"])
-router.include_router(auth_router, tags=["Users Auth"])
+router.include_router(blog_router, prefix="/blog")
+router.include_router(contact_router, prefix="/contact", tags=["Contact"])
+router.include_router(accounts_router, prefix="/accounts", tags=["Users"])
+router.include_router(auth_router, prefix="/accounts", tags=["Users Auth"])
 
 
 @router.get("/", tags=["Home"])