From 5420f6a53ab35c34aac5963998d33fcbc3171e62 Mon Sep 17 00:00:00 2001
From: Scott Barnes <scottreidbarnes@gmail.com>
Date: Thu, 21 Dec 2023 22:56:04 -0800
Subject: [PATCH] Fix sort order and update cover URL for IA-only items

---
 openlibrary/macros/IABook.html          |  7 +++---
 openlibrary/plugins/upstream/mybooks.py | 29 +++++++++++++++----------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/openlibrary/macros/IABook.html b/openlibrary/macros/IABook.html
index 0b7c490fc191..3030c736525b 100644
--- a/openlibrary/macros/IABook.html
+++ b/openlibrary/macros/IABook.html
@@ -1,8 +1,9 @@
 $def with (doc, ia_base_url="https://archive.org")
+  $ ocaid = doc.get('identifier')
   <li class="searchResultItem">
   <span class="bookcover">
-    $ cover = "/images/icons/avatar_book-sm.png"
-      <a href="$ia_base_url/details/$doc.get('identifier')"><img
+    $ cover = "%s/services/img/%s" % (ia_base_url, ocaid)
+      <a href="$ia_base_url/details/$ocaid"><img
               itemprop="image"
               src="$cover"
       /></a>
@@ -11,7 +12,7 @@
     <div class="details">
         <div class="resultTitle">
            <h3 itemprop="name" class="booktitle">
-             <a itemprop="url" href="$ia_base_url/details/$doc.get('identifier')" class="results">Borrowed from Internet Archive: $doc.get('identifier')</a>
+             <a itemprop="url" href="$ia_base_url/details/$ocaid" class="results">Borrowed from Internet Archive: $doc.get('identifier')</a>
            </h3>
         </div>
     </div>
diff --git a/openlibrary/plugins/upstream/mybooks.py b/openlibrary/plugins/upstream/mybooks.py
index 7a77808b1fc6..126000db51ab 100644
--- a/openlibrary/plugins/upstream/mybooks.py
+++ b/openlibrary/plugins/upstream/mybooks.py
@@ -662,21 +662,28 @@ def get_loan_history_data(page: int, mb: "MyBooksTemplate") -> dict[str, str | i
         ]
     )
 
-    # Attach availability and loan to editions.
-    for i, ed in enumerate(editions):
-        if ed.ocaid in ocaids:
-            editions[i].availability = availability.get(ed.ocaid)
-            editions[i].loan = loan_history_map[ed.ocaid]
-
-    # Include 'placeholder' editions for items in the Internet Archive loan
-    # history, but absent from Open Library. Also, preserve the order.
+    # Create 'placeholder' editions for items in the Internet Archive loan
+    # history, but absent from Open Library.
     ia_only_loans = [
         loan for loan in availability.values() if not loan.get('openlibrary_edition')
     ]
-    for ia_loan in ia_only_loans:
-        ia_loan['ia_only'] = True
+
+    # Attach availability and loan to both editions and ia-only items.
+    for ed in editions:
+        if ed.ocaid in ocaids:
+            ed.availability = availability.get(ed.ocaid)
+            ed.loan = loan_history_map[ed.ocaid]
+            ed.last_loan_date = ed.loan.get('updatedate')
+
+    for ia_only in ia_only_loans:
+        loan = loan_history_map[ia_only['identifier']]
+        ia_only['last_loan_date'] = loan.get('updatedate', '')
+        ia_only['ia_only'] = True  # Determines which macro to load.
+
     editions_and_ia_loans = editions + ia_only_loans
-    editions_and_ia_loans.sort(key=lambda ed: ed.get('updatedate', ''))
+    editions_and_ia_loans.sort(
+        key=lambda item: item.get('last_loan_date', ''), reverse=True
+    )
 
     result = {
         'docs': editions_and_ia_loans,