Merge pull request #382 from RockefellerArchiveCenter/development

Adds logic accounting for rights statements with no end date

Author: helrond

process_request/helpers.py

@@ -22,9 +22,10 @@ def get_active_rights_acts(acts):
     """Evaluates rights statement act end dates to determine if it is still active."""
     current_date = datetime.now()
     for idx, act in reversed(list(enumerate(acts))):
-        statement_end = datetime.strptime(act['end_date'], "%Y-%m-%d")
-        if (current_date > statement_end):
-            acts.pop(idx)
+        if act.get('end_date'):
+            statement_end = datetime.strptime(act['end_date'], "%Y-%m-%d")
+            if (current_date > statement_end):
+                acts.pop(idx)
     return acts
 
 

process_request/tests.py

@@ -142,6 +142,54 @@ def test_get_active_rights_acts(self):
         output = get_active_rights_acts(acts)
         self.assertEqual(output, expected)
 
+        acts = [
+            {
+                'start_date': '1886-01-01',
+                'end_date': '1967-12-31',
+                'created_by': 'aquarius',
+                'last_modified_by': 'aquarius',
+                'create_time': '2022-06-08T20:55:05Z',
+                'system_mtime': '2022-06-08T20:55:05Z',
+                'user_mtime': '2022-06-08T20:55:05Z',
+                'act_type': 'publish',
+                'restriction':
+                'disallow',
+                'jsonmodel_type':
+                'rights_statement_act',
+                'notes': []
+            },
+            {
+                'start_date': '1886-01-01',
+                'created_by': 'aquarius',
+                'last_modified_by': 'aquarius',
+                'create_time': '2022-06-08T20:55:05Z',
+                'system_mtime': '2022-06-08T20:55:05Z',
+                'user_mtime': '2022-06-08T20:55:05Z',
+                'act_type': 'publish',
+                'restriction':
+                'disallow',
+                'jsonmodel_type':
+                'rights_statement_act',
+                'notes': []
+            }]
+        expected = [
+            {
+                'start_date': '1886-01-01',
+                'created_by': 'aquarius',
+                'last_modified_by': 'aquarius',
+                'create_time': '2022-06-08T20:55:05Z',
+                'system_mtime': '2022-06-08T20:55:05Z',
+                'user_mtime': '2022-06-08T20:55:05Z',
+                'act_type': 'publish',
+                'restriction':
+                'disallow',
+                'jsonmodel_type':
+                'rights_statement_act',
+                'notes': []
+            }]
+        output = get_active_rights_acts(acts)
+        self.assertEqual(output, expected)
+
     @patch("asnake.client.web_client.ASnakeClient")
     def test_get_resource_creators(self, mock_client):
         mock_client.get.return_value.json.return_value = {"results": [{"title": "Philanthropy Foundation"}]}