Merge pull request #2629 from 0x29a/performance-fixes

Minor performance improvements

bookwyrm/models/annual_goal.py

@@ -52,7 +52,7 @@ class AnnualGoal(BookWyrmModel):
             user=self.user,
             book__in=book_ids,
         )
-        return {r.book.id: r.rating for r in reviews}
+        return {r.book_id: r.rating for r in reviews}
 
     @property
     def progress(self):

bookwyrm/models/readthrough.py

@@ -32,7 +32,7 @@ class ReadThrough(BookWyrmModel):
 
     def save(self, *args, **kwargs):
         """update user active time"""
-        cache.delete(f"latest_read_through-{self.user.id}-{self.book.id}")
+        cache.delete(f"latest_read_through-{self.user_id}-{self.book_id}")
         self.user.update_active_date()
         # an active readthrough must have an unset finish date
         if self.finish_date or self.stopped_date:

bookwyrm/models/shelf.py

@@ -107,7 +107,7 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel):
             # remove all caches related to all editions of this book
             cache.delete_many(
                 [
-                    f"book-on-shelf-{book.id}-{self.shelf.id}"
+                    f"book-on-shelf-{book.id}-{self.shelf_id}"
                     for book in self.book.parent_work.editions.all()
                 ]
             )
@@ -117,7 +117,7 @@ class ShelfBook(CollectionItemMixin, BookWyrmModel):
         if self.id and self.user.local:
             cache.delete_many(
                 [
-                    f"book-on-shelf-{book}-{self.shelf.id}"
+                    f"book-on-shelf-{book}-{self.shelf_id}"
                     for book in self.book.parent_work.editions.values_list(
                         "id", flat=True
                     )

bookwyrm/models/status.py

@@ -80,7 +80,7 @@ class Status(OrderedCollectionPageMixin, BookWyrmModel):
     def save(self, *args, **kwargs):
         """save and notify"""
         if self.reply_parent:
-            self.thread_id = self.reply_parent.thread_id or self.reply_parent.id
+            self.thread_id = self.reply_parent.thread_id or self.reply_parent_id
 
         super().save(*args, **kwargs)
 

bookwyrm/views/annual_summary.py

@@ -68,7 +68,7 @@ class AnnualSummary(View):
         book_list_by_pages = read_books_in_year.filter(pages__gte=0).order_by("pages")
 
         # books with no pages
-        no_page_list = len(read_books_in_year.filter(pages__exact=None))
+        no_page_list = read_books_in_year.filter(pages__exact=None).count()
 
         # rating stats queries
         ratings = (
@@ -95,13 +95,13 @@ class AnnualSummary(View):
             "book_pages_lowest": book_list_by_pages.first(),
             "book_pages_highest": book_list_by_pages.last(),
             "no_page_number": no_page_list,
-            "ratings_total": len(ratings),
+            "ratings_total": ratings.count(),
             "rating_average": round(
                 ratings_stats["rating__avg"] if ratings_stats["rating__avg"] else 0, 2
             ),
             "book_rating_highest": ratings.order_by("-rating").first(),
             "best_ratings_books_ids": [
-                review.book.id for review in ratings.filter(rating=5)
+                review.book_id for review in ratings.filter(rating=5)
             ],
             "paginated_years": paginated_years,
             "goal_status": goal_status,