feature/recipe-comments (#448)

* fix favorite color issue

* db and models for comments

* rename files

* initial UI for comments

* fix format

* import / export

* fixes #428

* format

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

mealie/db/database.py

@@ -5,6 +5,7 @@ from mealie.db.db_base import BaseDocument
 from mealie.db.models.event import Event, EventNotification
 from mealie.db.models.group import Group
 from mealie.db.models.mealplan import MealPlan
+from mealie.db.models.recipe.comment import RecipeComment
 from mealie.db.models.recipe.recipe import Category, RecipeModel, Tag
 from mealie.db.models.settings import CustomPage, SiteSettings
 from mealie.db.models.shopping_list import ShoppingList
@@ -12,6 +13,7 @@ from mealie.db.models.sign_up import SignUp
 from mealie.db.models.theme import SiteThemeModel
 from mealie.db.models.users import LongLiveToken, User
 from mealie.schema.category import RecipeCategoryResponse, RecipeTagResponse
+from mealie.schema.comments import CommentOut
 from mealie.schema.event_notifications import EventNotificationIn
 from mealie.schema.events import Event as EventSchema
 from mealie.schema.meal import MealPlanOut
@@ -110,6 +112,13 @@ class _Users(BaseDocument):
         return self.schema.from_orm(entry)
 
 
+class _Comments(BaseDocument):
+    def __init__(self) -> None:
+        self.primary_key = "id"
+        self.sql_model = RecipeComment
+        self.schema = CommentOut
+
+
 class _LongLiveToken(BaseDocument):
     def __init__(self) -> None:
         self.primary_key = "id"
@@ -190,6 +199,7 @@ class Database:
         self.events = _Events()
         self.event_notifications = _EventNotification()
         self.shopping_lists = _ShoppingList()
+        self.comments = _Comments()
 
 
 db = Database()

mealie/db/models/model_base.py

@@ -8,6 +8,7 @@ class BaseMixins:
     def update(self, *args, **kwarg):
         self.__init__(*args, **kwarg)
 
+    @classmethod
     def get_ref(cls_type, session: Session, match_value: str, match_attr: str = "id"):
         eff_ref = getattr(cls_type, match_attr)
         return session.query(cls_type).filter(eff_ref == match_value).one_or_none()

mealie/db/models/recipe/assets.py

@@ -16,7 +16,6 @@ class RecipeAsset(SqlAlchemyBase):
         icon=None,
         file_name=None,
     ) -> None:
-        print("Asset Saved", name)
         self.name = name
         self.file_name = file_name
         self.icon = icon

mealie/db/models/recipe/comment.py

@@ -0,0 +1,36 @@
+from datetime import datetime
+from uuid import uuid4
+
+from mealie.db.models.model_base import BaseMixins, SqlAlchemyBase
+from mealie.db.models.recipe.recipe import RecipeModel
+from mealie.db.models.users import User
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, orm
+
+
+def generate_uuid():
+    return str(uuid4())
+
+
+class RecipeComment(SqlAlchemyBase, BaseMixins):
+    __tablename__ = "recipe_comments"
+    id = Column(Integer, primary_key=True)
+    uuid = Column(Integer, unique=True, nullable=False, default=generate_uuid)
+    parent_id = Column(Integer, ForeignKey("recipes.id"), nullable=False)
+    recipe = orm.relationship("RecipeModel", back_populates="comments")
+    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    user = orm.relationship("User", back_populates="comments", single_parent=True, foreign_keys=[user_id])
+    date_added = Column(DateTime, default=datetime.now)
+    text = Column(String)
+
+    def __init__(self, recipe_slug, user, text, session, date_added=None, **_) -> None:
+        self.text = text
+        self.recipe = RecipeModel.get_ref(session, recipe_slug, "slug")
+        self.date_added = date_added or datetime.now()
+
+        if isinstance(user, dict):
+            user = user.get("id")
+
+        self.user = User.get_ref(session, user)
+
+    def update(self, text, **_) -> None:
+        self.text = text

mealie/db/models/recipe/recipe.py

@@ -55,6 +55,8 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
         collection_class=ordering_list("position"),
     )
 
+    comments: list = orm.relationship("RecipeComment", back_populates="recipe", cascade="all, delete, delete-orphan")
+
     # Mealie Specific
     slug = sa.Column(sa.String, index=True, unique=True)
     settings = orm.relationship("RecipeSettings", uselist=False, cascade="all, delete-orphan")

mealie/db/models/users.py

@@ -33,6 +33,10 @@ class User(SqlAlchemyBase, BaseMixins):
         LongLiveToken, back_populates="user", cascade="all, delete, delete-orphan", single_parent=True
     )
 
+    comments: list = orm.relationship(
+        "RecipeComment", back_populates="user", cascade="all, delete, delete-orphan", single_parent=True
+    )
+
     favorite_recipes: list[RecipeModel] = orm.relationship(RecipeModel, back_populates="favorited_by")
 
     def __init__(
@@ -56,8 +60,7 @@ class User(SqlAlchemyBase, BaseMixins):
         self.password = password
 
         self.favorite_recipes = [
-            RecipeModel.get_ref(RecipeModel, session=session, match_value=x, match_attr="slug")
-            for x in favorite_recipes
+            RecipeModel.get_ref(session=session, match_value=x, match_attr="slug") for x in favorite_recipes
         ]
 
         if self.username is None:
@@ -78,8 +81,7 @@ class User(SqlAlchemyBase, BaseMixins):
             self.password = password
 
         self.favorite_recipes = [
-            RecipeModel.get_ref(RecipeModel, session=session, match_value=x, match_attr="slug")
-            for x in favorite_recipes
+            RecipeModel.get_ref(session=session, match_value=x, match_attr="slug") for x in favorite_recipes
         ]
 
     def update_password(self, password):