Merge pull request #6305 from jimchamp/6304/bug/remove-old-loan-statu…

…s-calls Prevent loan/waiting list status calls with old-style username format
internetarchive · Mar 17, 2022 · d3abda1 · d3abda1
2 parents 2a96fc6 + 599d4a2
commit d3abda1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/openlibrary/core/lending.py b/openlibrary/core/lending.py
@@ -563,7 +563,6 @@ def get_loans_of_user(user_key):
     loandata = web.ctx.site.store.values(type='/type/loan', name='user', value=user_key)
     loans = [Loan(d) for d in loandata] + (
         _get_ia_loans_of_user(account.itemname)
-        + _get_ia_loans_of_user(userkey2userid(user_key))
     )
     return loans
 

diff --git a/openlibrary/core/waitinglist.py b/openlibrary/core/waitinglist.py
@@ -129,9 +129,7 @@ def find(cls, user_key, identifier, itemname=None):
         if not itemname:
             account = OpenLibraryAccount.get(key=user_key)
             itemname = account.itemname
-        result = cls.query(userid=itemname, identifier=identifier) or cls.query(
-            userid=lending.userkey2userid(user_key), identifier=identifier
-        )
+        result = cls.query(userid=itemname, identifier=identifier)
         if result:
             return result[0]