Add tests

Author: dshabin

superannotate/db/project_images.py

@@ -571,9 +571,9 @@ def assign_images(project, image_names, user):
 
     project, folder = get_project_and_folder_metadata(project)
 
-    project_users = get_team_metadata()["users"]
-    project_users = [i['id'] for i in project_users]
-    if user not in project_users:
+    verified_users = get_team_metadata()["users"]
+    verified_users = [i['id'] for i in verified_users]
+    if user not in verified_users:
         logging.warn(
             f'Skipping {user}. {user} is not a verified contributor for the {project["name"]}'
         )
@@ -614,11 +614,11 @@ def assign_folder(project, folder_name, users):
     """
 
     project_meta = get_project_metadata(project, include_contributors=True)
-    project_users = get_team_metadata()["users"]
+    verified_users = get_team_metadata()["users"]
     project_name = project_meta['name']
-    project_users = [i['id'] for i in project_users]
-    unverified_contributor = set(project_users) - set(users)
-    verified_contributor = set(users) - set(unverified_contributor)
+    verified_users = [i['id'] for i in verified_users]
+    verified_users = set(users).intersection(set(verified_users))
+    unverified_contributor = set(users) - verified_users
 
     for user in unverified_contributor:
         logging.warn(
@@ -631,7 +631,7 @@ def assign_folder(project, folder_name, users):
         "team_id": project_meta["team_id"]
     }
     json_req = {
-        "assign_user_ids": list(verified_contributor),
+        "assign_user_ids": list(verified_users),
         "folder_name": folder_name
     }
     response = _api.send_request(
@@ -645,7 +645,7 @@ def assign_folder(project, folder_name, users):
         raise SABaseException(
             response.status_code, "Couldn't assign folder " + response.text
         )
-    logger.info(f'Assigned {folder_name} to users: {verified_contributor}')
+    logger.info(f'Assigned {folder_name} to users: {list(verified_users)}')
 
 
 def unassign_folder(project, folder_name):

tests/test_assign_images.py

@@ -197,4 +197,38 @@ def _search_folders(project, folder_name=None, includeUsers=False):
 
     response = _api.send_request(req_type='GET', path='/folders', params=params)
     response = response.json()
-    return response
+    return response
+
+
+def test_assign_folder_unverified_users(tmpdir, caplog):
+    tmpdir = Path(tmpdir)
+    projects = sa.search_projects(PROJECT_NAME_VECTOR1, return_metadata=True)
+    for project in projects:
+        sa.delete_project(project)
+    time.sleep(1)
+    project = sa.create_project(PROJECT_NAME_VECTOR1, "test", "Vector")
+    folder_name = "assign_folder"
+    sa.create_folder(project, folder_name)
+    email = "unverified_user@mail.com"
+    sa.assign_folder(project, folder_name, [email])
+    "Skipping unverified_user@mail.com from assignees." in caplog.text
+
+
+def test_assign_images_unverified_user(tmpdir, caplog):
+    tmpdir = Path(tmpdir)
+
+    projects = sa.search_projects(PROJECT_NAME_VECTOR2, return_metadata=True)
+    for project in projects:
+        sa.delete_project(project)
+    time.sleep(1)
+    project = sa.create_project(PROJECT_NAME_VECTOR2, "test", "Vector")
+    sa.create_folder(project, FOLDER2)
+    project_folder = project["name"] + "/" + FOLDER2
+    sa.upload_images_from_folder_to_project(
+        project_folder, "./tests/sample_project_vector"
+    )
+    email = "unverified_user@email.com"
+    sa.assign_images(
+        project_folder, ["example_image_1.jpg", "example_image_2.jpg"], email
+    )
+    "Skipping unverified_user@mail.com from assignees." in caplog.text