Make FileRef.get_file() raise APINotFound if container has no files

scitran · Mar 20, 2018 · fd1bf5c · fd1bf5c
1 parent 2d3aa43
commit fd1bf5c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/api/dao/containerstorage.py b/api/dao/containerstorage.py
@@ -360,10 +360,12 @@ def create_el(self, analysis, parent_type, parent_id, origin, uid=None):
         for i, fileref_dict in enumerate(analysis.get('inputs', [])):
             try:
                 fileref = containerutil.create_filereference_from_dictionary(fileref_dict)
-                analysis['inputs'][i] = fileref.get_file()
             except KeyError:
                 # Legacy analyses already have fileinfos as inputs instead of filerefs
                 pass
+            else:
+                analysis['inputs'][i] = fileref.get_file()
+
 
         result = super(AnalysisStorage, self).create_el(analysis)
         if not result.acknowledged:

diff --git a/api/dao/containerutil.py b/api/dao/containerutil.py
@@ -283,7 +283,7 @@ def from_dictionary(cls, d):
     def get_file(self):
         container = super(FileReference, self).get()
 
-        for file in container['files']:
+        for file in container.get('files', []):
             if file['name'] == self.name:
                 return file