feat(url_metadata): add urls_metadata field (#118)

* feat(url_metadata): add urls_metadata field * fix(iter): py3 compat
uc-cdis · Apr 26, 2018 · 60dd22b · 60dd22b
1 parent dbf63b8
commit 60dd22b
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 121 deletions.
diff --git a/indexd/index/blueprint.py b/indexd/index/blueprint.py
@@ -184,7 +184,8 @@ def post_index_record():
     '''
     Create a new record.
     '''
-    try: jsonschema.validate(flask.request.json, POST_RECORD_SCHEMA)
+    try:
+        jsonschema.validate(flask.request.json, POST_RECORD_SCHEMA)
     except jsonschema.ValidationError as err:
         raise UserError(err)
 
@@ -197,6 +198,7 @@ def post_index_record():
     hashes = flask.request.json['hashes']
     file_name = flask.request.json.get('file_name')
     metadata = flask.request.json.get('metadata')
+    urls_metadata = flask.request.json.get('urls_metadata')
     version = flask.request.json.get('version')
     baseid = flask.request.json.get('baseid')
 
@@ -206,6 +208,7 @@ def post_index_record():
         size=size,
         file_name=file_name,
         metadata=metadata,
+        urls_metadata=urls_metadata,
         version=version,
         urls=urls,
         acl=acl,
@@ -239,6 +242,7 @@ def put_index_record(record):
     urls = flask.request.json.get('urls')
     acl = flask.request.json.get('acl')
     metadata = flask.request.json.get('metadata')
+    urls_metadata = flask.request.json.get('urls_metadata')
 
     did, baseid, rev = blueprint.index_driver.update(
         record,
@@ -248,6 +252,7 @@ def put_index_record(record):
         urls=urls,
         acl=acl,
         metadata=metadata,
+        urls_metadata=urls_metadata,
     )
 
     ret = {
@@ -291,9 +296,10 @@ def add_index_record_version(record):
     urls = flask.request.json['urls']
     acl = flask.request.json.get('acl', [])
     hashes = flask.request.json['hashes']
-    file_name = flask.request.json.get('file_name', None)
-    metadata = flask.request.json.get('metadata', None)
-    version = flask.request.json.get('version', None)
+    file_name = flask.request.json.get('file_name')
+    metadata = flask.request.json.get('metadata')
+    urls_metadata = flask.request.json.get('urls_metadata')
+    version = flask.request.json.get('version')
 
     did, baseid, rev = blueprint.index_driver.add_version(
         record,
@@ -304,6 +310,7 @@ def add_index_record_version(record):
         acl=acl,
         file_name=file_name,
         metadata=metadata,
+        urls_metadata=urls_metadata,
         version=version,
         hashes=hashes,
     )

diff --git a/indexd/index/driver.py b/indexd/index/driver.py
@@ -37,7 +37,10 @@ def hashes_to_urls(self, size, hashes, start=0, limit=100):
         raise NotImplementedError('TODO')
 
     @abc.abstractmethod
-    def add(self, form, did=None, size=None, urls=None, hashes=None, file_name=None, metadata=None, version=None):
+    def add(
+            self, form, did=None, size=None, urls=None,
+            hashes=None, file_name=None, metadata=None,
+            urls_metadata=None, version=None):
         '''
         Creates record for given data.
         '''
@@ -53,7 +56,7 @@ def get(self, did):
     @abc.abstractmethod
     def update(self,
                did, rev, urls=None, file_name=None,
-               version=None, metadata=None):
+               urls_metadata=None, version=None, metadata=None):
         '''
         Updates record with new values.
         '''
@@ -69,7 +72,8 @@ def delete(self, did, rev):
     @abc.abstractmethod
     def add_version(
             self, did, form, size=None,
-            file_name=None,  metadata=None, urls=None, hashes=None, version=None):
+            file_name=None,  metadata=None, urls=None,
+            urls_metadata=None, hashes=None, version=None):
         '''
         Add a record version given did
         '''