Cutlery/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-07-09 03:04:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: delete shopping list if no users are found (#3290)

Browse Source
This commit is contained in:
Michael Genson 2024-03-13 19:29:47 -05:00 committed by GitHub
parent 63a362a48a
commit f1fbf0d120
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
alembic/versions/2024-02-23-16.15.07_2298bb460ffd_added_user_to_shopping_list.py
View File

@ -13,6 +13,9 @@ from sqlalchemy import orm
import mealie.db.migration_types import mealie.db.migration_types
from alembic import op from alembic import op
from mealie.core.root_logger import get_logger
logger = get_logger()
# revision identifiers, used by Alembic. # revision identifiers, used by Alembic.
revision = "2298bb460ffd" revision = "2298bb460ffd"
@ -37,13 +40,20 @@ def find_user_id_for_group(group_id: UUID):
with session: with session:
try: try:
# try to find an admin user # try to find an admin user
user_id = session.execute(sa.text(stmt).bindparams(group_id=group_id)).scalar_one() return session.execute(sa.text(stmt).bindparams(group_id=group_id)).scalar_one()
except orm.exc.NoResultFound: except orm.exc.NoResultFound:
pass
try:
# fallback to any user # fallback to any user
user_id = session.execute( return session.execute(
sa.text("SELECT id FROM users WHERE group_id=:group_id LIMIT 1").bindparams(group_id=group_id) sa.text("SELECT id FROM users WHERE group_id=:group_id LIMIT 1").bindparams(group_id=group_id)
).scalar_one() ).scalar_one()
return user_id except orm.exc.NoResultFound:
pass
# no user could be found
return None
def populate_shopping_list_users(): def populate_shopping_list_users():
@ -54,11 +64,17 @@ def populate_shopping_list_users():
list_ids_and_group_ids = session.execute(sa.text("SELECT id, group_id FROM shopping_lists")).all() list_ids_and_group_ids = session.execute(sa.text("SELECT id, group_id FROM shopping_lists")).all()
for list_id, group_id in list_ids_and_group_ids: for list_id, group_id in list_ids_and_group_ids:
user_id = find_user_id_for_group(group_id) user_id = find_user_id_for_group(group_id)
session.execute( if user_id:
sa.text(f"UPDATE shopping_lists SET user_id=:user_id WHERE id=:id").bindparams( session.execute(
user_id=user_id, id=list_id sa.text(f"UPDATE shopping_lists SET user_id=:user_id WHERE id=:id").bindparams(
user_id=user_id, id=list_id
)
) )
) else:
logger.warning(
f"No user found for shopping list {list_id} with group {group_id}; deleting shopping list"
)
session.execute(sa.text(f"DELETE FROM shopping_lists WHERE id=:id").bindparams(id=list_id))
def upgrade(): def upgrade():