refactor(backend): ♻️ New tag naming for group router

This commit is contained in:
hay-kot 2021-08-21 15:13:42 -08:00
parent 34a5587add
commit 19fb6af050
5 changed files with 17 additions and 24 deletions

View File

@ -6,7 +6,6 @@ from mealie.core.config import APP_VERSION, settings
from mealie.core.root_logger import get_logger
from mealie.routes import backup_routes, debug_routes, migration_routes, router, theme_routes, utility_routes
from mealie.routes.about import about_router
from mealie.routes.groups import groups_router
from mealie.routes.mealplans import meal_plan_router
from mealie.routes.media import media_router
from mealie.routes.recipe import recipe_router
@ -35,7 +34,6 @@ def start_scheduler():
def api_routers():
# Authentication
app.include_router(router)
app.include_router(groups_router)
app.include_router(shopping_list_router)
# Recipes
app.include_router(recipe_router)

View File

@ -1,8 +1,9 @@
from fastapi import APIRouter
from . import auth, users
from . import auth, groups, users
router = APIRouter(prefix="/api")
router.include_router(auth.router)
router.include_router(users.router)
router.include_router(groups.router)

View File

@ -1,7 +1,8 @@
from fastapi import APIRouter
from . import groups
from . import crud
groups_router = APIRouter()
router = APIRouter()
groups_router.include_router(groups.router)
router.include_router(crud.user_router)
router.include_router(crud.admin_router)

View File

@ -7,17 +7,8 @@ from mealie.schema.user import GroupBase, GroupInDB, UpdateGroup, UserInDB
from mealie.services.events import create_group_event
from sqlalchemy.orm.session import Session
admin_router = AdminAPIRouter(prefix="/api/groups", tags=["Groups administration"])
user_router = UserAPIRouter(prefix="/api/groups", tags=["Groups"])
@admin_router.get("", response_model=list[GroupInDB])
async def get_all_groups(
session: Session = Depends(generate_session),
):
""" Returns a list of all groups in the database """
return db.groups.get_all(session)
admin_router = AdminAPIRouter(prefix="/api/groups", tags=["Groups: CRUD"])
user_router = UserAPIRouter(prefix="/api/groups", tags=["Groups: CRUD"])
@user_router.get("/self", response_model=GroupInDB)
@ -31,6 +22,15 @@ async def get_current_user_group(
return db.groups.get(session, current_user.group, "name")
@admin_router.get("", response_model=list[GroupInDB])
async def get_all_groups(
session: Session = Depends(generate_session),
):
""" Returns a list of all groups in the database """
return db.groups.get_all(session)
@admin_router.post("", status_code=status.HTTP_201_CREATED, response_model=GroupInDB)
async def create_group(
background_tasks: BackgroundTasks,

View File

@ -1,7 +0,0 @@
from fastapi import APIRouter
from mealie.routes.groups import crud
router = APIRouter()
router.include_router(crud.admin_router)
router.include_router(crud.user_router)