Merge pull request #1369 from girder/fix-time-compare

Fix time comparison in annotation history check

CHANGELOG.md

@@ -12,6 +12,7 @@
 ### Bug Fixes
 - Default to "None" for the DICOM assetstore limit ([#1359](../../pull/1359))
 - Fix series detection for some bioformats files ([#1365](../../pull/1365), [#1367](../../pull/1367))
+- Fix time comparison in annotation history check ([#1369](../../pull/1369))
 
 ## 1.26.0
 

girder_annotation/girder_large_image_annotation/models/annotation.py

@@ -1361,7 +1361,7 @@ def removeOldAnnotations(self, remove=False, minAgeInDays=30, keepInactiveVersio
                     keep -= 1
                     report['recentVersions'] += 1
                     continue
-                if max(record['created'], record['updated']) < age:
+                if max(record['created'], record['updated']).timestamp() < age.timestamp():
                     if remove:
                         self.collection.delete_one({'_id': record['_id']})
                         Annotationelement().removeWithQuery({'_version': record['_version']})

girder_annotation/test_annotation/test_annotations_rest.py

@@ -569,6 +569,13 @@ def testAnnotationHistoryEndpoints(self, server, user, admin):
         resp = server.request('/annotation/old', method='GET', user=admin)
         assert utilities.respStatus(resp) == 200
         assert resp.json['abandonedVersions'] == 0
+        resp = server.request(
+            '/annotation/old', method='DELETE', user=admin, params={'versions': -1})
+        assert utilities.respStatus(resp) == 400
+        assert 'keepInactiveVersions' in resp.json['message']
+        resp = server.request(
+            '/annotation/old', method='GET', user=admin, params={'age': 0, 'versions': 0})
+        assert utilities.respStatus(resp) == 200
         resp = server.request('/annotation/old', method='DELETE', user=admin)
         assert utilities.respStatus(resp) == 200
         assert resp.json['abandonedVersions'] == 0