From cb089ed81768582ad909815dedf114155a701f98 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 27 Sep 2021 11:23:55 -0700
Subject: [PATCH] One query to get book for book view

---
 bookwyrm/views/books.py | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 7e7e90ed..6ab938db 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -38,18 +38,16 @@ class Book(View):
 
         user_statuses = user_statuses if request.user.is_authenticated else False
 
-        try:
-            book = models.Edition.viewer_aware_objects(request.user).filter(id=book_id)
-        except models.Edition.DoesNotExist:
-            book = (
-                models.Edition.viewer_aware_objects(request.user)
-                .filter(
-                    parent_work__id=book_id,
-                )
-                .order_by("-edition_rank")
-            )
-        book = book.select_related("parent_work").prefetch_related("authors")
-        book = book.first()
+        # it's safe to use this OR because edition and work and subclasses of the same
+        # table, so they never have clashing IDs
+        book = (
+            models.Edition.viewer_aware_objects(request.user)
+            .filter(Q(id=book_id) | Q(parent_work__id=book_id))
+            .order_by("-edition_rank")
+            .select_related("parent_work")
+            .prefetch_related("authors")
+            .first()
+        )
 
         if not book or not book.parent_work:
             raise Http404