Adjust endpoint return value for Gen3 SDK

uc-cdis · Mar 7, 2019 · 902396a · 902396a
1 parent 4211031
commit 902396a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/manifest_service/manifests/__init__.py b/manifest_service/manifests/__init__.py
@@ -78,7 +78,8 @@ def generate_unique_manifest_filename(folder_name, manifest_bucket_name):
     """
     timestamp = datetime.now().isoformat()
     users_existing_manifest_files = list_files_in_bucket(manifest_bucket_name, folder_name)
-    filename = generate_unique_filename_with_timestamp_and_increment(timestamp, users_existing_manifest_files)
+    existing_filenames = map(lambda x: x['filename'], users_existing_manifest_files)
+    filename = generate_unique_filename_with_timestamp_and_increment(timestamp, existing_filenames)
     return filename
 
 def generate_unique_filename_with_timestamp_and_increment(timestamp, users_existing_manifest_files):
@@ -108,8 +109,11 @@ def list_files_in_bucket(bucket_name, folder):
     bucket = s3.Bucket(bucket_name)
 
     for object_summary in bucket.objects.filter(Prefix=folder + "/"):
-        rv.append(ntpath.basename(object_summary.key))
-
+        manifest_summary = {
+            "filename" : ntpath.basename(object_summary.key),
+            "last_modified" : object_summary.last_modified.strftime("%Y-%m-%d %H:%M:%S")
+        }
+        rv.append(manifest_summary)
     return rv
 
 def get_file_contents(bucket_name, folder, filename):

diff --git a/tests/app_test.py b/tests/app_test.py
@@ -28,7 +28,7 @@ def app(mocker):
 
 	mocks['validate_request'] = mocker.patch("manifest_service.manifests.validate_request", return_value=test_user)
 
-	mocks['list_files_in_bucket'] = mocker.patch("manifest_service.manifests.list_files_in_bucket", return_value=['manifest-a-b-c.json'])
+	mocks['list_files_in_bucket'] = mocker.patch("manifest_service.manifests.list_files_in_bucket", return_value=[{ 'filename':'manifest-a-b-c.json' } ])
 
 	# mocks['add_manifest_to_bucket'] = mocker.patch("manifest_service.manifests.add_manifest_to_bucket", return_value='manifest-a-b-c.json')