increase coverage of api/dao/hierarchy.py with uid-upload edge cases

api/dao/hierarchy.py

@@ -44,8 +44,8 @@ def upsert_file(self, fileinfo):
             self.update_file(fileinfo)
         else:
             self.add_file(fileinfo)
-    def update_file(self, fileinfo):
 
+    def update_file(self, fileinfo):
         update_set = {self.file_prefix + '.$.modified': datetime.datetime.utcnow()}
         # in this method, we are overriding an existing file.
         # update_set allows to update all the fileinfo like size, hash, etc.
@@ -313,7 +313,7 @@ def _find_or_create_destination_project(group_id, project_label, timestamp, user
     group_id, project_label = _group_id_fuzzy_match(group_id, project_label)
     group = config.db.groups.find_one({'_id': group_id})
 
-    project = config.db.projects.find_one({'group': group['_id'],'label': {'$regex': re.escape(project_label), '$options': 'i'}})
+    project = config.db.projects.find_one({'group': group['_id'], 'label': {'$regex': re.escape(project_label), '$options': 'i'}})
 
     if project:
         # If the project already exists, check the user's access
@@ -572,7 +572,8 @@ def _update_container_nulls(base_query, update, container_type):
     return config.db[coll_name].find_one(base_query)
 
 
-def merge_fileinfos(parsed_files, infos):
+# NOTE skip coverage since this function is currently not used
+def merge_fileinfos(parsed_files, infos): # pragma: no cover
     """it takes a dictionary of "hard_infos" (file size, hash)
     merging them with infos derived from a list of infos on the same or on other files
     """

test/integration_tests/python/test_uploads.py

@@ -1,3 +1,4 @@
+import copy
 import json
 
 import dateutil.parser
@@ -8,7 +9,7 @@ def test_upload_without_login(as_public):
     assert r.status_code == 403
 
 
-def test_uid_upload(data_builder, file_form, as_admin, as_user):
+def test_uid_upload(data_builder, file_form, as_admin, as_user, api_db):
     group = data_builder.create_group()
 
     # try to uid-upload w/o metadata
@@ -37,10 +38,24 @@ def test_uid_upload(data_builder, file_form, as_admin, as_user):
         }
     }
 
+    # try to uid-upload to new project w/o group rw perms
+    r = as_user.post('/upload/uid', files=file_form(*uid_files, meta=uid_meta))
+    assert r.status_code == 403
+
     # uid-upload files
     r = as_admin.post('/upload/uid', files=file_form(*uid_files, meta=uid_meta))
     assert r.ok
 
+    # try to uid-upload to existing project w/o project rw perms
+    uid_meta_2 = copy.deepcopy(uid_meta)
+    uid_meta_2['session']['uid'] = uid_meta_2['acquisition']['uid'] = 'uid_upload_2'
+    r = as_user.post('/upload/uid', files=file_form(*uid_files, meta=uid_meta_2))
+    assert r.status_code == 403
+
+    # uid-upload to existing project but new session uid
+    r = as_admin.post('/upload/uid', files=file_form(*uid_files, meta=uid_meta_2))
+    assert r.ok
+
     # uid-upload files to existing session uid
     r = as_admin.post('/upload/uid', files=file_form(*uid_files, meta=uid_meta))
     assert r.ok
@@ -49,8 +64,22 @@ def test_uid_upload(data_builder, file_form, as_admin, as_user):
     r = as_user.post('/upload/uid', files=file_form(*uid_files, meta=uid_meta))
     assert r.status_code == 403
 
+    # TODO figure out why api.dao.hierarchy._group_id_fuzzy_match is NOT called below
+
+    # # uid-upload to fat-fingered group id (should end up in group)
+    # uid_meta_fuzzy = copy.deepcopy(uid_meta)
+    # uid_meta_fuzzy['group']['_id'] = 'c' + group
+    # r = as_admin.post('/upload/uid', files=file_form(*uid_files, meta=uid_meta_fuzzy))
+    # assert r.ok
+
+    # # uid-upload to utterly non-existent group id (should end up in unknown group)
+    # uid_meta_unknown = copy.deepcopy(uid_meta)
+    # uid_meta_unknown['group']['_id'] = '0000000000000000000000000'
+    # r = as_admin.post('/upload/uid', files=file_form(*uid_files, meta=uid_meta_unknown))
+    # assert r.ok
+
     # uid-match-upload files (to the same session and acquisition uid's as above)
-    uid_match_meta = uid_meta.copy()
+    uid_match_meta = copy.deepcopy(uid_meta)
     del uid_match_meta['group']
     r = as_admin.post('/upload/uid-match', files=file_form(*uid_files, meta=uid_match_meta))
     assert r.ok