Merge pull request #13505 from CipherZ3r0/perf/dedupe-get-loan-ia-call

Don't make archive.org loan request for deprecated "ol:*" user id

Author: cdrini

openlibrary/core/lending.py

@@ -601,36 +601,14 @@ def is_loaned_out_on_ia(identifier: str) -> bool | None:
         return None
 
 
-def get_loan(identifier: str, user_key: str | None = None):
-    """Returns the loan object for given identifier, if a loan exists.
-
-    If user_key is specified, it returns the loan only if that user is
-    borrowed that book.
-    """
-    _loan = None
-    account = None
-    if user_key:
-        if user_key.startswith("@"):
-            account = OpenLibraryAccount.get_by_link(user_key)
-        else:
-            account = OpenLibraryAccount.get_by_key(user_key)
-
+def get_loan(identifier: str) -> Loan | None:
+    """Returns the loan object for given identifier, if a loan exists."""
     try:
-        _loan = _get_ia_loan(identifier, account and userkey2userid(account.username))
+        ia_loan = ia_lending_api.get_loan(identifier)
+        return ia_loan and Loan.from_ia_loan(ia_loan)
     except Exception:  # TODO: Narrow exception scope
-        logger.exception(f"get_loan({identifier}) 1 of 2")
-
-    try:
-        _loan = _get_ia_loan(identifier, account and account.itemname)
-    except Exception:  # TODO: Narrow exception scope
-        logger.exception(f"get_loan({identifier}) 2 of 2")
-
-    return _loan
-
-
-def _get_ia_loan(identifier: str, userid: str | None = None):
-    ia_loan = ia_lending_api.get_loan(identifier, userid)
-    return ia_loan and Loan.from_ia_loan(ia_loan)
+        logger.exception(f"get_loan({identifier})")
+        return None
 
 
 def get_loans_of_user(user_key: str) -> list[Loan]:

openlibrary/tests/core/test_lending.py

@@ -208,6 +208,16 @@ def test_get_lending_state_waiting_loan(self, mock_site):
             assert lending.get_lending_state(doc, user=mock_user, check_loan_status=True) == "open"
 
 
+def test_get_loan_queries_ia_once(monkeypatch):
+    mock_api = Mock()
+    mock_api.get_loan.return_value = {"identifier": "foo00bar"}
+    monkeypatch.setattr(lending, "ia_lending_api", mock_api)
+    monkeypatch.setattr(lending.Loan, "from_ia_loan", staticmethod(lambda d: ("loan", d)))
+
+    assert lending.get_loan("foo00bar") == ("loan", {"identifier": "foo00bar"})
+    mock_api.get_loan.assert_called_once_with("foo00bar")
+
+
 @pytest.mark.usefixtures("request_context_fixture")
 class TestGetLoanHistoryData:
     """parse_s3_cookie() is annotated `dict | None` and legitimately returns