rafaelcaricio/moviewyrm
1
0
Fork 0
forked from mirrors/bookwyrm
Code Issues 4 Pull requests Projects Releases Wiki Activity

Use readthrough finish date instead of shelving date

Browse source
This commit is contained in:
Joachim 2021-12-22 16:53:10 +01:00
parent 357eddf16e
commit 13ee7e7a65
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bookwyrm/views/annual_summary.py
View file

@ -219,14 +219,28 @@ def get_read_book_ids_in_year(user, year):
"""return an ordered QuerySet of the read book ids""" """return an ordered QuerySet of the read book ids"""
read_shelf = get_object_or_404(user.shelf_set, identifier="read") read_shelf = get_object_or_404(user.shelf_set, identifier="read")
read_book_ids_in_year = ( shelved_book_ids = (
models.ShelfBook.objects.filter(shelf=read_shelf) models.ShelfBook.objects.filter(shelf=read_shelf)
.filter(user=user) .filter(user=user)
.filter(shelved_date__year=year) .values_list("book", "shelved_date")
.order_by("shelved_date", "created_date", "updated_date")
.values_list("book", flat=True)
) )
return read_book_ids_in_year
book_dates = []
for book in shelved_book_ids:
finished_in_year = (
models.ReadThrough.objects.filter(user__id=user.id)
.filter(book_id=book[0])
.filter(finish_date__year=year)
.values("finish_date")
.first()
)
if finished_in_year:
# Finished a readthrough in the year
book_dates.append((book[0], finished_in_year["finish_date"]))
else:
has_other_year_readthrough = (
models.ReadThrough.objects.filter(user__id=user.id) models.ReadThrough.objects.filter(user__id=user.id)
.filter(book_id=book[0]) .filter(book_id=book[0])
.exists() .exists()