last updates

Author: natlibfi-kaisa

api/circulation_exceptions.py

@@ -272,7 +272,9 @@ class NoAvailableCopiesWhenReserved(CannotLoan):
 
     @property
     def base(self) -> ProblemDetail:
-        return NO_COPIES_WHEN_RESERVED
+        return CHECKOUT_FAILED.detailed(
+            detail="No copies available to check out, you are still next in line."
+        )
 
 
 class NoAvailableCopies(CannotLoan):

api/odl.py

@@ -463,15 +463,14 @@ def _checkout(
 
         # No best available licenses were found in the first place or, for some reason, there's no status.
         if license_ is None or loan_status is None:
-            # It could be that we have a hold which means we thought the book was available, but it wasn't.
-            # We raise a NoAvailableCopies() and have the handler handle the patron's hold position.
-            self.log.info(f"No license  or status was none. Raising NoAvailableCopies.")
             licensepool.update_availability_from_licenses()
+            # If we have a hold, it means we thought the book was available, but it wasn't.
+            # So we need to update availability and the hold queue.
             if hold:
                 # The license should be available at most by the default loan period in E-Kirjasto.
                 hold.end = utc_now() + datetime.timedelta(days=default_loan_period)
-                # Instantly recalculate the holds queue so that this hold goes to position 1 and not 0.
                 self._recalculate_holds_in_license_pool(licensepool)
+                raise NoAvailableCopiesWhenReserved()
             raise NoAvailableCopies()
 
         if not loan_status.active:

api/problem_details.py

@@ -56,14 +56,6 @@
     _("All licenses for this book are loaned out."),
 )
 
-# E-kirjasto
-NO_COPIES_WHEN_RESERVED = pd(
-    "http://librarysimplified.org/terms/problem/cannot-issue-loan",
-    502,
-    _("No available license."),
-    _("All copies of this book are loaned out after all. You are next in line."),
-)
-
 NO_ACCEPTABLE_FORMAT = pd(
     "http://librarysimplified.org/terms/problem/no-acceptable-format",
     400,

tests/api/test_odl.py

@@ -21,6 +21,7 @@
     CannotReturn,
     CurrentlyAvailable,
     NoAvailableCopies,
+    NoAvailableCopiesWhenReserved,
     NoLicenses,
     NotCheckedOut,
     NotOnHold,
@@ -706,7 +707,7 @@ def test_checkout_ready_hold_no_available_copies(
             content=opds2_with_odl_api_fixture.files.sample_text("unavailable.json"),
         )
         with opds2_with_odl_api_fixture.mock_http.patch():
-            with pytest.raises(NoAvailableCopies):
+            with pytest.raises(NoAvailableCopiesWhenReserved):
                 opds2_with_odl_api_fixture.api_checkout()
         assert db.session.query(Hold).count() == 2