Use readthroughs only to determine books read this year

bookwyrm/templates/annual_summary/layout.html

@@ -1,6 +1,7 @@
 {% extends 'layout.html' %}
 {% load i18n %}
 {% load static %}
+{% load humanize %}
 
 
 {% block title %}{% blocktrans %}{{ year }} in the books{% endblocktrans %}{% endblock %}
@@ -111,7 +112,7 @@
             <p class="subtitle is-5">{% trans "That’s great!" %}</p>
 
             <p class="title is-4 is-serif">
-                {% blocktrans %}That makes an average of {{ pages_average }} pages per book.{% endblocktrans %}
+                {% blocktrans with pages=pages_average|intcomma %}That makes an average of {{ pages }} pages per book.{% endblocktrans %}
             </p>
 
             {% if no_page_number %}

bookwyrm/views/annual_summary.py

@@ -41,7 +41,14 @@ class AnnualSummary(View):
         )
 
         # get data
-        read_book_ids_in_year = get_read_book_ids_in_year(user, year)
+        read_book_ids_in_year = (
+            user.readthrough_set.filter(
+                finish_date__year__gte=year,
+                finish_date__year__lt=int(year) + 1,
+            )
+            .order_by("-finish_date")
+            .values_list("book__id", flat=True)
+        )
 
         if len(read_book_ids_in_year) == 0:
             data = {
@@ -222,45 +229,6 @@ def get_earliest_year(user, year):
     return year
 
 
-def get_read_book_ids_in_year(user, year):
-    """return an ordered QuerySet of the read book ids"""
-
-    read_shelf = get_object_or_404(user.shelf_set, identifier="read")
-    shelved_book_ids = (
-        models.ShelfBook.objects.filter(shelf=read_shelf)
-        .filter(user=user)
-        .values_list("book", "shelved_date")
-    )
-
-    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)
-                .filter(book_id=book[0])
-                .exists()
-            )
-            if not has_other_year_readthrough and book[1].year == int(year):
-                # No readthrough but shelved this year
-                book_dates.append(book)
-
-    book_dates = sorted(book_dates, key=lambda tup: tup[1])
-
-    return [book[0] for book in book_dates]
-
-
 def get_books_from_shelfbooks(books_ids):
     """return an ordered QuerySet of books from a list"""