yul/bookwyrm-mastodon
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make requested changes.

Browse Source 
Signed-off-by: Faiazov Dmitrii <jjsolutions0110@gmail.com>
This commit is contained in:
Faiazov Dmitrii
2021-10-14 13:39:15 +03:00
parent ce16f36fe8
commit 1abbc67483
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
bookwyrm/views/shelf.py
View File

@ -69,20 +69,22 @@ class Shelf(View):
).order_by("-published_date")
reading = models.ReadThrough.objects
if not is_self:
reading = models.ReadThrough.privacy_filter(request.user)
reading = reading.filter(user=user, book__id=OuterRef("id")).order_by(
"-start_date"
"start_date"
)
books = books.annotate(
rating=Subquery(reviews.values("rating")[:1]),
shelved_date=F("shelfbook__shelved_date"),
start_date=Subquery(reading.values("start_date")),
finish_date=Subquery(reading.values("finish_date")),
author=F("authors__name"),
)
start_date=Subquery(reading.values("start_date")[:1]),
finish_date=Subquery(reading.values("finish_date")[:1]),
author=Subquery(
models.Book.objects.filter(id=OuterRef("id")).values("authors__name")[
:1
]
),
).prefetch_related("authors")
books = sort_books(books, request.GET.get("sort"))