SFR-2438: Fix Fulfill URL Manifest Process

api/utils.py

@@ -41,6 +41,7 @@ class APIUtils():
         'muse': 4,
         'met': 5,
         'isac': 6,
+        'UofMichigan': 7,
         'UofM': 7,
         'UofSC': 8,
         'hathitrust': 9,

mappings/publisher_backlist.py

@@ -94,8 +94,8 @@ def format_rights(self):
         rights_status = rights_elements[0]
 
         if rights_status == 'in copyright':
-            return '{}|{}||{}|'.format('self.record.source', 'in_copyright', 'In Copyright') 
+            return '{}|{}||{}|'.format(self.record.source, 'in_copyright', 'In Copyright') 
         elif rights_status == 'public domain':
-            return '{}|{}||{}|'.format('self.record.source', 'public_domain', 'Public Domain') 
+            return '{}|{}||{}|'.format(self.record.source, 'public_domain', 'Public Domain') 
 
         return None

processes/file/fulfill_url_manifest.py

@@ -42,19 +42,25 @@ def runProcess(self):
 
     def fetch_and_update_manifests(self, start_timestamp=None):
 
-        batches = self.s3_manager.load_batches(self.prefix, self.s3Bucket)
+        batches = self.s3_manager.load_batches(self.prefix, self.s3_bucket)
         if start_timestamp:
             #Using JMESPath to extract keys from the JSON batches
             filtered_batch_keys = batches.search(f"Contents[?to_string(LastModified) > '\"{start_timestamp}\"'].Key")
             for key in filtered_batch_keys:
-                metadata_object = self.s3Client.get_object(Bucket=self.s3Bucket, Key= f'{key}')
-                self.update_metadata_object(metadata_object, self.s3Bucket, key)
+                if not key:
+                    continue
+
+                metadata_object = self.s3_manager.s3Client.get_object(Bucket=self.s3_bucket, Key=f'{key}')
+                self.update_metadata_object(metadata_object, self.s3_bucket, key)
         else:
             for batch in batches:
+                if 'Contents' not in batch:
+                    continue
+
                 for content in batch['Contents']:
                     key = content['Key']
-                    metadata_object = self.s3Client.get_object(Bucket=self.s3Bucket, Key= f'{key}')
-                    self.update_metadata_object(metadata_object, self.s3Bucket, key)
+                    metadata_object = self.s3_manager.s3Client.get_object(Bucket=self.s3_bucket, Key=f'{key}')
+                    self.update_metadata_object(metadata_object, self.s3_bucket, key)
 
     def update_metadata_object(self, metadata_object, bucket_name, curr_key):
 

tests/unit/processes/file/test_fulfill_manifest_process.py

@@ -16,7 +16,7 @@ def teardown_class(cls):
     def test_process(self, mocker):
         class TestFulfill(FulfillURLManifestProcess):
             def __init__(self):
-                self.s3Bucket = 'test_aws_bucket'
+                self.s3_bucket = 'test_aws_bucket'
                 self.s3_manager = mocker.MagicMock(s3Client=mocker.MagicMock())
                 self.session = mocker.MagicMock(session='testSession')
                 self.records = mocker.MagicMock(record='testRecord')