mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-22 17:41:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3378 from hughrun/get-books-for-user

Browse source 
possible fix for #3372 - user export timeouts
This commit is contained in:
Mouse Reeve 2024-06-22 20:24:36 -07:00 committed by GitHub
commit 3236003107
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
bookwyrm/models/bookwyrm_export_job.py
View file

@ -7,7 +7,6 @@ from boto3.session import Session as BotoSession
from s3_tar import S3Tar from s3_tar import S3Tar
from django.db.models import BooleanField, FileField, JSONField from django.db.models import BooleanField, FileField, JSONField
from django.db.models import Q
from django.core.serializers.json import DjangoJSONEncoder from django.core.serializers.json import DjangoJSONEncoder
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.core.files.storage import storages from django.core.files.storage import storages
@ -315,19 +314,28 @@ def export_book(user: User, edition: Edition):
def get_books_for_user(user): def get_books_for_user(user):
"""Get all the books and editions related to a user""" """
Get all the books and editions related to a user.
editions = ( We use union() instead of Q objects because it creates
Edition.objects.select_related("parent_work") multiple simple queries in stead of a much more complex DB query
.filter( that can time out.
Q(shelves__user=user)
| Q(readthrough__user=user) """
| Q(review__user=user)
| Q(list__user=user) shelf_eds = Edition.objects.select_related("parent_work").filter(shelves__user=user)
| Q(comment__user=user) rt_eds = Edition.objects.select_related("parent_work").filter(
| Q(quotation__user=user) readthrough__user=user
) )
.distinct() review_eds = Edition.objects.select_related("parent_work").filter(review__user=user)
list_eds = Edition.objects.select_related("parent_work").filter(list__user=user)
comment_eds = Edition.objects.select_related("parent_work").filter(
comment__user=user
) )
quote_eds = Edition.objects.select_related("parent_work").filter(
quotation__user=user
)
editions = shelf_eds.union(rt_eds, review_eds, list_eds, comment_eds, quote_eds)
return editions return editions