From 41f27a4a66a5452031f2840544a5c93524946f67 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Fri, 15 Oct 2021 17:56:23 +1100 Subject: [PATCH] clean up List db queries - don't unnecessarily query DB in List views - use more efficient query in remove_from_group List class method --- bookwyrm/models/list.py | 7 +------ bookwyrm/views/list.py | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 9b05c81b5..3d8c5ae14 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -101,15 +101,10 @@ class List(OrderedCollectionMixin, BookWyrmModel): def remove_from_group(cls, owner, user): """remove a list from a group""" - memberships = GroupMember.objects.filter(group__user=owner, user=user).all() - - for membership in memberships: - # remove this user's group-curated lists from the group - cls.objects.filter(group=membership.group, user=membership.user).update( + cls.objects.filter(group__user=owner, user=user).all().update( group=None, curation="closed" ) - class ListItem(CollectionItemMixin, BookWyrmModel): """ok""" diff --git a/bookwyrm/views/list.py b/bookwyrm/views/list.py index 5dae128e6..cc49f009c 100644 --- a/bookwyrm/views/list.py +++ b/bookwyrm/views/list.py @@ -58,7 +58,7 @@ class Lists(View): book_list = form.save() # list should not have a group if it is not group curated if not book_list.curation == "group": - models.List.objects.filter(id=book_list.id).update(group=None) + book_list.update(group=None) return redirect(book_list.local_path) @@ -193,7 +193,7 @@ class List(View): return redirect("list", book_list.id) book_list = form.save() if not book_list.curation == "group": - models.List.objects.filter(id=book_list.id).update(group=None) + book_list.update(group=None) return redirect(book_list.local_path)