feature/finish-recipe-assets (#384)

* add features to readme

* Copy markdown reference

* prop as whole recipe

* parameter as url instead of query

* add card styling to editor

* move images to /recipes/{slug}/images

* add image to breaking changes

* fix delete and import errors

* fix debug/about response

* logger updates

* dashboard ui

* add server side events

* unorganized routes

* default slot

* add backup viewer to dashboard

* format

* add dialog to backup imports

* initial event support

* delete assets when removed

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

mealie/db/database.py

@@ -1,6 +1,7 @@
 from logging import getLogger
 
 from mealie.db.db_base import BaseDocument
+from mealie.db.models.event import Event
 from mealie.db.models.group import Group
 from mealie.db.models.mealplan import MealPlanModel
 from mealie.db.models.recipe.recipe import Category, RecipeModel, Tag
@@ -9,6 +10,7 @@ from mealie.db.models.sign_up import SignUp
 from mealie.db.models.theme import SiteThemeModel
 from mealie.db.models.users import User
 from mealie.schema.category import RecipeCategoryResponse, RecipeTagResponse
+from mealie.schema.events import Event as EventSchema
 from mealie.schema.meal import MealPlanInDB
 from mealie.schema.recipe import Recipe
 from mealie.schema.settings import CustomPageOut
@@ -18,7 +20,6 @@ from mealie.schema.theme import SiteTheme
 from mealie.schema.user import GroupInDB, UserInDB
 from sqlalchemy.orm.session import Session
 
-
 logger = getLogger()
 
 
@@ -35,6 +36,26 @@ class _Recipes(BaseDocument):
 
         return f"{slug}.{extension}"
 
+    def count_uncategorized(self, session: Session, count=True, override_schema=None) -> int:
+        eff_schema = override_schema or self.schema
+        if count:
+            return session.query(self.sql_model).filter(RecipeModel.recipe_category == None).count()  # noqa: 711
+        else:
+            return [
+                eff_schema.from_orm(x)
+                for x in session.query(self.sql_model).filter(RecipeModel.tags == None).all()  # noqa: 711
+            ]
+
+    def count_untagged(self, session: Session, count=True, override_schema=None) -> int:
+        eff_schema = override_schema or self.schema
+        if count:
+            return session.query(self.sql_model).filter(RecipeModel.tags == None).count()  # noqa: 711
+        else:
+            return [
+                eff_schema.from_orm(x)
+                for x in session.query(self.sql_model).filter(RecipeModel.tags == None).all()  # noqa: 711
+            ]
+
 
 class _Categories(BaseDocument):
     def __init__(self) -> None:
@@ -110,8 +131,6 @@ class _Groups(BaseDocument):
         """
         group: GroupInDB = session.query(self.sql_model).filter_by(**{match_key: match_value}).one_or_none()
 
-        # Potentially not needed? column is sorted by SqlAlchemy based on startDate
-        # return sorted(group.mealplans, key=lambda mealplan: mealplan.startDate)
         return group.mealplans
 
 
@@ -129,6 +148,13 @@ class _CustomPages(BaseDocument):
         self.schema = CustomPageOut
 
 
+class _Events(BaseDocument):
+    def __init__(self) -> None:
+        self.primary_key = "id"
+        self.sql_model = Event
+        self.schema = EventSchema
+
+
 class Database:
     def __init__(self) -> None:
         self.recipes = _Recipes()
@@ -141,6 +167,7 @@ class Database:
         self.sign_ups = _SignUps()
         self.groups = _Groups()
         self.custom_pages = _CustomPages()
+        self.events = _Events()
 
 
 db = Database()

mealie/db/db_base.py

@@ -23,6 +23,14 @@ class BaseDocument:
     ) -> List[dict]:
         eff_schema = override_schema or self.schema
 
+        if order_by:
+            order_attr = getattr(self.sql_model, str(order_by))
+
+            return [
+                eff_schema.from_orm(x)
+                for x in session.query(self.sql_model).order_by(order_attr.desc()).offset(start).limit(limit).all()
+            ]
+
         return [eff_schema.from_orm(x) for x in session.query(self.sql_model).offset(start).limit(limit).all()]
 
     def get_all_limit_columns(self, session: Session, fields: List[str], limit: int = None) -> List[SqlAlchemyBase]:
@@ -154,3 +162,14 @@ class BaseDocument:
         session.commit()
 
         return results_as_model
+
+    def delete_all(self, session: Session) -> None:
+        session.query(self.sql_model).delete()
+        session.commit()
+
+    def count_all(self, session: Session, match_key=None, match_value=None) -> int:
+
+        if None in [match_key, match_value]:
+            return session.query(self.sql_model).count()
+        else:
+            return session.query(self.sql_model).filter_by(**{match_key: match_value}).count()

mealie/db/init_db.py

@@ -5,6 +5,7 @@ from mealie.db.database import db
 from mealie.db.db_setup import create_session
 from mealie.schema.settings import SiteSettings
 from mealie.schema.theme import SiteTheme
+from mealie.services.events import create_general_event
 from sqlalchemy.orm import Session
 
 logger = root_logger.get_logger("init_db")
@@ -58,6 +59,7 @@ def main():
     else:
         print("Database Doesn't Exists, Initializing...")
         init_db()
+        create_general_event("Initialize Database", "Initialize database with default values", session)
 
 
 if __name__ == "__main__":

mealie/db/models/_all_models.py

@@ -1,7 +1,8 @@
+from mealie.db.models.event import *
+from mealie.db.models.group import *
 from mealie.db.models.mealplan import *
 from mealie.db.models.recipe.recipe import *
 from mealie.db.models.settings import *
+from mealie.db.models.sign_up import *
 from mealie.db.models.theme import *
 from mealie.db.models.users import *
-from mealie.db.models.sign_up import *
-from mealie.db.models.group import *

mealie/db/models/event.py

@@ -0,0 +1,17 @@
+import sqlalchemy as sa
+from mealie.db.models.model_base import BaseMixins, SqlAlchemyBase
+
+
+class Event(SqlAlchemyBase, BaseMixins):
+    __tablename__ = "events"
+    id = sa.Column(sa.Integer, primary_key=True)
+    title = sa.Column(sa.String)
+    text = sa.Column(sa.String)
+    time_stamp = sa.Column(sa.DateTime)
+    category = sa.Column(sa.String)
+
+    def __init__(self, title, text, time_stamp, category, *args, **kwargs) -> None:
+        self.title = title
+        self.text = text
+        self.time_stamp = time_stamp
+        self.category = category

mealie/db/models/model_base.py

@@ -4,5 +4,5 @@ SqlAlchemyBase = dec.declarative_base()
 
 
 class BaseMixins:
-    def _pass_on_me():
-        pass
+    def update(self, *args, **kwarg):
+        self.__init__(*args, **kwarg)