1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-05 21:45:25 +02:00

fix: Good data being deleted upon restore (#4376)

Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
This commit is contained in:
Michael Genson 2024-10-16 09:56:07 -05:00 committed by GitHub
parent 80caa5ffaf
commit e47d171463
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -20,8 +20,9 @@ def fix_dangling_refs(session: Session):
REASSIGN_REF_TABLES = ["group_meal_plans", "recipes", "shopping_lists"]
DELETE_REF_TABLES = ["long_live_tokens", "password_reset_tokens", "recipe_comments", "recipe_timeline_events"]
groups = session.query(Group).all()
for group in groups:
all_groups = session.query(Group).all()
all_users = session.query(User).all()
for group in all_groups:
# Find an arbitrary admin user in the group
default_user = session.query(User).filter(User.group_id == group.id, User.admin == True).first() # noqa: E712 - required for SQLAlchemy comparison
if not default_user:
@ -32,7 +33,7 @@ def fix_dangling_refs(session: Session):
if not default_user:
continue
valid_user_ids = {user.id for user in group.users}
valid_group_user_ids = {user.id for user in all_users if user.group_id == group.id}
for table_name in REASSIGN_REF_TABLES:
table = SqlAlchemyBase.metadata.tables[table_name]
@ -40,7 +41,7 @@ def fix_dangling_refs(session: Session):
update(table)
.where(
and_(
table.c.user_id.notin_(valid_user_ids),
table.c.user_id.notin_(valid_group_user_ids),
table.c.group_id == group.id,
)
)
@ -54,9 +55,10 @@ def fix_dangling_refs(session: Session):
f'in "{table_name}" table to default user ({default_user.id})'
)
valid_user_ids_all_groups = {user.id for user in all_users}
for table_name in DELETE_REF_TABLES:
table = SqlAlchemyBase.metadata.tables[table_name]
delete_stmt = table.delete().where(table.c.user_id.notin_(valid_user_ids))
delete_stmt = table.delete().where(table.c.user_id.notin_(valid_user_ids_all_groups))
result = session.execute(delete_stmt)
if result.rowcount: