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/services/backups/imports.py

@@ -8,15 +8,15 @@ from pydantic.main import BaseModel
 from sqlalchemy.orm.session import Session
 
 from mealie.core.config import get_app_dirs
-
-app_dirs = get_app_dirs()
 from mealie.db.database import get_database
 from mealie.schema.admin import CommentImport, GroupImport, NotificationImport, RecipeImport, UserImport
 from mealie.schema.events import EventNotificationIn
-from mealie.schema.recipe import CommentOut, Recipe
+from mealie.schema.recipe import Recipe, RecipeCommentOut
 from mealie.schema.user import PrivateUser, UpdateGroup
 from mealie.services.image import minify
 
+app_dirs = get_app_dirs()
+
 
 class ImportDatabase:
     def __init__(
@@ -57,7 +57,10 @@ class ImportDatabase:
         successful_imports = {}
 
         recipes = ImportDatabase.read_models_file(
-            file_path=recipe_dir, model=Recipe, single_file=False, migrate=ImportDatabase._recipe_migration
+            file_path=recipe_dir,
+            model=Recipe,
+            single_file=False,
+            migrate=ImportDatabase._recipe_migration,
         )
 
         for recipe in recipes:
@@ -76,7 +79,7 @@ class ImportDatabase:
             )
 
             if import_status.status:
-                successful_imports.update({recipe.slug: recipe})
+                successful_imports[recipe.slug] = recipe
 
             imports.append(import_status)
 
@@ -90,10 +93,10 @@ class ImportDatabase:
         if not comment_dir.exists():
             return
 
-        comments = ImportDatabase.read_models_file(file_path=comment_dir, model=CommentOut)
+        comments = ImportDatabase.read_models_file(file_path=comment_dir, model=RecipeCommentOut)
 
         for comment in comments:
-            comment: CommentOut
+            comment: RecipeCommentOut
 
             self.import_model(
                 db_table=self.db.comments,
@@ -130,6 +133,8 @@ class ImportDatabase:
         if type(recipe_dict["extras"]) == list:
             recipe_dict["extras"] = {}
 
+        recipe_dict["comments"] = []
+
         return recipe_dict
 
     def _import_images(self, successful_imports: list[Recipe]):
@@ -328,8 +333,8 @@ def import_database(
     if import_notifications:
         notification_report = import_session.import_notifications()
 
-    if import_recipes:
-        import_session.import_comments()
+    # if import_recipes:
+    #     import_session.import_comments()
 
     import_session.clean_up()
 

mealie/services/recipe/recipe_comments_service.py

@@ -0,0 +1,52 @@
+from __future__ import annotations
+
+from functools import cached_property
+from uuid import UUID
+
+from fastapi import HTTPException
+
+from mealie.schema.recipe.recipe_comments import (
+    RecipeCommentCreate,
+    RecipeCommentOut,
+    RecipeCommentSave,
+    RecipeCommentUpdate,
+)
+from mealie.services._base_http_service.crud_http_mixins import CrudHttpMixins
+from mealie.services._base_http_service.http_services import UserHttpService
+from mealie.services.events import create_recipe_event
+
+
+class RecipeCommentsService(
+    CrudHttpMixins[RecipeCommentOut, RecipeCommentCreate, RecipeCommentCreate],
+    UserHttpService[UUID, RecipeCommentOut],
+):
+    event_func = create_recipe_event
+    _restrict_by_group = False
+    _schema = RecipeCommentOut
+
+    @cached_property
+    def dal(self):
+        return self.db.comments
+
+    def _check_comment_belongs_to_user(self) -> None:
+        if self.item.user_id != self.user.id and not self.user.admin:
+            raise HTTPException(detail="Comment does not belong to user")
+
+    def populate_item(self, id: UUID) -> RecipeCommentOut:
+        self.item = self.dal.get_one(id)
+        return self.item
+
+    def get_all(self) -> list[RecipeCommentOut]:
+        return self.dal.get_all()
+
+    def create_one(self, data: RecipeCommentCreate) -> RecipeCommentOut:
+        save_data = RecipeCommentSave(text=data.text, user_id=self.user.id, recipe_id=data.recipe_id)
+        return self._create_one(save_data)
+
+    def update_one(self, data: RecipeCommentUpdate, item_id: UUID = None) -> RecipeCommentOut:
+        self._check_comment_belongs_to_user()
+        return self._update_one(data, item_id)
+
+    def delete_one(self, item_id: UUID = None) -> RecipeCommentOut:
+        self._check_comment_belongs_to_user()
+        return self._delete_one(item_id)

mealie/services/recipe/recipe_tool_service.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from functools import cached_property
+
+from mealie.schema.recipe.recipe_tool import RecipeTool, RecipeToolCreate
+from mealie.services._base_http_service.crud_http_mixins import CrudHttpMixins
+from mealie.services._base_http_service.http_services import UserHttpService
+from mealie.services.events import create_recipe_event
+
+
+class RecipeToolService(
+    CrudHttpMixins[RecipeTool, RecipeToolCreate, RecipeToolCreate],
+    UserHttpService[int, RecipeTool],
+):
+    event_func = create_recipe_event
+    _restrict_by_group = False
+    _schema = RecipeTool
+
+    @cached_property
+    def dal(self):
+        return self.db.tools
+
+    def populate_item(self, id: int) -> RecipeTool:
+        self.item = self.dal.get_one(id)
+        return self.item
+
+    def get_all(self) -> list[RecipeTool]:
+        return self.dal.get_all()
+
+    def create_one(self, data: RecipeToolCreate) -> RecipeTool:
+        return self._create_one(data)
+
+    def update_one(self, data: RecipeTool, item_id: int = None) -> RecipeTool:
+        return self._update_one(data, item_id)
+
+    def delete_one(self, id: int = None) -> RecipeTool:
+        return self._delete_one(id)