Feature/restore-recipe-functionality (#810)

* feat(frontend): ✨ add back support for assets

* feat(backend): ✨ add back support for assets

* feat(frontend): ✨ add support for recipe tools

* feat(backend): ✨ add support for recipe tools

* feat(frontend): ✨ add onHand support for recipe toosl

* feat(backend): ✨ add onHand support for backend

* refactor(frontend): ♻️ move items to recipe folder and break apart types

* feat(frontend): ✨ add support for recipe comments

* feat(backend): ✨ Add support for recipe comments

* fix(backend): 💥 disable comments import

* fix(frontend): 🐛 fix rendering issue with titles when moving steps

* add tools to changelog

* fix type errors

Co-authored-by: hay-kot <hay-kot@pm.me>

mealie/routes/__init__.py

@@ -1,6 +1,20 @@
 from fastapi import APIRouter
 
-from . import admin, app, auth, categories, groups, parser, recipe, shopping_lists, tags, unit_and_foods, users
+from . import (
+    admin,
+    app,
+    auth,
+    categories,
+    comments,
+    groups,
+    parser,
+    recipe,
+    shopping_lists,
+    tags,
+    tools,
+    unit_and_foods,
+    users,
+)
 
 router = APIRouter(prefix="/api")
 
@@ -9,8 +23,10 @@ router.include_router(auth.router)
 router.include_router(users.router)
 router.include_router(groups.router)
 router.include_router(recipe.router)
+router.include_router(comments.router)
 router.include_router(parser.router)
 router.include_router(unit_and_foods.router)
+router.include_router(tools.router)
 router.include_router(categories.router)
 router.include_router(tags.router)
 router.include_router(shopping_lists.router)

mealie/routes/comments/__init__.py

@@ -0,0 +1,8 @@
+from fastapi import APIRouter
+
+from mealie.services._base_http_service.router_factory import RouterFactory
+from mealie.services.recipe.recipe_comments_service import RecipeCommentsService
+
+router = APIRouter()
+
+router.include_router(RouterFactory(RecipeCommentsService, prefix="/comments", tags=["Recipe: Comments"]))

mealie/routes/recipe/comments.py

@@ -1,58 +1,20 @@
-from http.client import HTTPException
-
-from fastapi import Depends, status
+from fastapi import Depends
 from sqlalchemy.orm.session import Session
 
-from mealie.core.dependencies import get_current_user
 from mealie.db.database import get_database
 from mealie.db.db_setup import generate_session
 from mealie.routes.routers import UserAPIRouter
-from mealie.schema.recipe import CommentOut, CreateComment, SaveComment
-from mealie.schema.user import PrivateUser
+from mealie.schema.recipe.recipe_comments import RecipeCommentOut
 
 router = UserAPIRouter()
 
 
-@router.post("/{slug}/comments")
-async def create_comment(
+@router.get("/{slug}/comments", response_model=list[RecipeCommentOut])
+async def get_recipe_comments(
     slug: str,
-    new_comment: CreateComment,
     session: Session = Depends(generate_session),
-    current_user: PrivateUser = Depends(get_current_user),
 ):
-    """Create comment in the Database"""
+    """Get all comments for a recipe"""
     db = get_database(session)
-
-    new_comment = SaveComment(user=current_user.id, text=new_comment.text, recipe_slug=slug)
-    return db.comments.create(new_comment)
-
-
-@router.put("/{slug}/comments/{id}")
-async def update_comment(
-    id: int,
-    new_comment: CreateComment,
-    session: Session = Depends(generate_session),
-    current_user: PrivateUser = Depends(get_current_user),
-):
-    """Update comment in the Database"""
-    db = get_database(session)
-    old_comment: CommentOut = db.comments.get(id)
-
-    if current_user.id != old_comment.user.id:
-        raise HTTPException(status.HTTP_403_FORBIDDEN)
-
-    return db.comments.update(id, new_comment)
-
-
-@router.delete("/{slug}/comments/{id}")
-async def delete_comment(
-    id: int, session: Session = Depends(generate_session), current_user: PrivateUser = Depends(get_current_user)
-):
-    """Delete comment from the Database"""
-    db = get_database(session)
-    comment: CommentOut = db.comments.get(id)
-    if current_user.id == comment.user.id or current_user.admin:
-        db.comments.delete(id)
-        return
-
-    raise HTTPException(status.HTTP_403_FORBIDDEN)
+    recipe = db.recipes.get_one(slug)
+    return db.comments.multi_query({"recipe_id": recipe.id})

mealie/routes/tools/__init__.py

@@ -0,0 +1,8 @@
+from fastapi import APIRouter
+
+from mealie.services._base_http_service.router_factory import RouterFactory
+from mealie.services.recipe.recipe_tool_service import RecipeToolService
+
+router = APIRouter()
+
+router.include_router(RouterFactory(RecipeToolService, prefix="/tools", tags=["Recipes: Tools"]))