Odl palace update #1636
Odl palace update #1636
Conversation
| @@ -596,7 +586,7 @@ def update_hold_queue(self, licensepool): | |||
| Loan.end>utc_now() | |||
| ) | |||
| ).count() | |||
| remaining_licenses = licensepool.licenses_owned - loans_count | |||
| remaining_licenses = max(licensepool.licenses_owned - loans_count, 0) | |||
There was a problem hiding this comment.
This stops the number of licenses from going below zero.
| now = util.datetime_helpers.utc_now() | ||
|
|
||
| if expires <= now: | ||
| continue |
There was a problem hiding this comment.
First, this makes sure expires is a timezone-aware datetime. Second, this ensures we don't create any License objects for books whose licenses were already expired the first time we saw them. (The book itself will be created, but its LicensePool will have no Licenses.)
| class MockODLAPI(ODLAPI): | ||
| """Mock API for tests that overrides _get and _url_for and tracks requests.""" | ||
|
|
||
| @classmethod | ||
| def mock_collection(self, _db): | ||
| def mock_collection(cls, _db, protocol=ODLAPI.NAME): |
There was a problem hiding this comment.
We don't need this right now -- it's for the ODL-via-OPDS-2 code that I didn't bring in -- but it doesn't hurt to have it.
| feed = feedparser.parse(response_content) | ||
|
|
||
| return feed | ||
|
|
There was a problem hiding this comment.
This just adds a little bit of error checking to the feed parsing process.
|
I ran this in the context of NYPL's QA server (where we happen to have a test ODL collection with some expired licenses), and watching it run made me concerned that the reaper algorithm only works in simple cases. I'm waiting to hear back before proceeding with this PR. |
Description
This branch brings in recent improvements to ODL collection management originated by @vbessonov in ThePalaceProject/circulation#25. It still needs some adaptation but the basic code should be in place now.
Motivation and Context
This is per https://jira.nypl.org/browse/SIMPLY-3868
How Has This Been Tested?
Checklist: