github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-22 22:43:34 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

potentially fixes #216

Browse source
This commit is contained in:
hay-kot 2021-03-21 10:59:16 -08:00
commit ac76413563
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mealie/db/models/group.py
View file

@ -1,9 +1,9 @@
import sqlalchemy as sa import sqlalchemy as sa
import sqlalchemy.orm as orm import sqlalchemy.orm as orm
from fastapi.logger import logger
from mealie.core.config import DEFAULT_GROUP from mealie.core.config import DEFAULT_GROUP
from mealie.db.models.model_base import BaseMixins, SqlAlchemyBase from mealie.db.models.model_base import BaseMixins, SqlAlchemyBase
from mealie.db.models.recipe.category import Category, group2categories from mealie.db.models.recipe.category import Category, group2categories
from fastapi.logger import logger
from sqlalchemy.orm.session import Session from sqlalchemy.orm.session import Session
@ -30,7 +30,7 @@ class Group(SqlAlchemyBase, BaseMixins):
# Webhook Settings # Webhook Settings
webhook_enable = sa.Column(sa.Boolean, default=False) webhook_enable = sa.Column(sa.Boolean, default=False)
webhook_time = sa.Column(sa.String, default="00:00") webhook_time = sa.Column(sa.String, default="00:00")
webhook_urls = orm.relationship("WebhookURLModel", uselist=True, cascade="all, delete") webhook_urls = orm.relationship("WebhookURLModel", uselist=True, cascade="all, delete-orphan")
def __init__( def __init__(
self, self,
@ -52,7 +52,6 @@ class Group(SqlAlchemyBase, BaseMixins):
self.webhook_urls = [WebhookURLModel(url=x) for x in webhook_urls] self.webhook_urls = [WebhookURLModel(url=x) for x in webhook_urls]
def update(self, session: Session, *args, **kwargs): def update(self, session: Session, *args, **kwargs):
self._sql_remove_list(session, [WebhookURLModel], self.id)
self.__init__(session=session, *args, **kwargs) self.__init__(session=session, *args, **kwargs)

14
mealie/db/models/recipe/recipe.py
View file

@ -32,19 +32,19 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
cookTime = sa.Column(sa.String) cookTime = sa.Column(sa.String)
recipeYield = sa.Column(sa.String) recipeYield = sa.Column(sa.String)
recipeCuisine = sa.Column(sa.String) recipeCuisine = sa.Column(sa.String)
tool: List[Tool] = orm.relationship("Tool", cascade="all, delete") tool: List[Tool] = orm.relationship("Tool", cascade="all, delete-orphan")
nutrition: Nutrition = orm.relationship("Nutrition", uselist=False, cascade="all, delete") nutrition: Nutrition = orm.relationship("Nutrition", uselist=False, cascade="all, delete-orphan")
recipeCategory: List = orm.relationship("Category", secondary=recipes2categories, back_populates="recipes") recipeCategory: List = orm.relationship("Category", secondary=recipes2categories, back_populates="recipes")
recipeIngredient: List[RecipeIngredient] = orm.relationship( recipeIngredient: List[RecipeIngredient] = orm.relationship(
"RecipeIngredient", "RecipeIngredient",
cascade="all, delete", cascade="all, delete-orphan",
order_by="RecipeIngredient.position", order_by="RecipeIngredient.position",
collection_class=ordering_list("position"), collection_class=ordering_list("position"),
) )
recipeInstructions: List[RecipeInstruction] = orm.relationship( recipeInstructions: List[RecipeInstruction] = orm.relationship(
"RecipeInstruction", "RecipeInstruction",
cascade="all, delete", cascade="all, delete-orphan",
order_by="RecipeInstruction.position", order_by="RecipeInstruction.position",
collection_class=ordering_list("position"), collection_class=ordering_list("position"),
) )
@ -53,10 +53,10 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
slug = sa.Column(sa.String, index=True, unique=True) slug = sa.Column(sa.String, index=True, unique=True)
tags: List[Tag] = orm.relationship("Tag", secondary=recipes2tags, back_populates="recipes") tags: List[Tag] = orm.relationship("Tag", secondary=recipes2tags, back_populates="recipes")
dateAdded = sa.Column(sa.Date, default=date.today) dateAdded = sa.Column(sa.Date, default=date.today)
notes: List[Note] = orm.relationship("Note", cascade="all, delete") notes: List[Note] = orm.relationship("Note", cascade="all, delete-orphan")
rating = sa.Column(sa.Integer) rating = sa.Column(sa.Integer)
orgURL = sa.Column(sa.String) orgURL = sa.Column(sa.String)
extras: List[ApiExtras] = orm.relationship("ApiExtras", cascade="all, delete") extras: List[ApiExtras] = orm.relationship("ApiExtras", cascade="all, delete-orphan")
@validates("name") @validates("name")
def validate_name(self, key, name): def validate_name(self, key, name):
@ -145,8 +145,6 @@ class RecipeModel(SqlAlchemyBase, BaseMixins):
extras: dict = None, extras: dict = None,
): ):
"""Updated a database entry by removing nested rows and rebuilds the row through the __init__ functions""" """Updated a database entry by removing nested rows and rebuilds the row through the __init__ functions"""
list_of_tables = [RecipeIngredient, RecipeInstruction, ApiExtras, Tool]
RecipeModel._sql_remove_list(session, list_of_tables, self.id)
self.__init__( self.__init__(
session=session, session=session,