Drop project.users field

Author: VaghinakDev

src/superannotate/lib/app/interface/sdk_interface.py

@@ -1334,7 +1334,7 @@ def clone_project(
             self.controller.projects.add_contributors(
                 self.controller.team, new_project, project.contributors
             )
-            new_project.users = project.contributors
+            new_project.contributors = project.contributors
         if copy_annotation_classes:
             logger.info(
                 f"Cloning annotation classes from {from_project} to {project_name}."
@@ -1354,15 +1354,12 @@ def clone_project(
 
         if response.errors:
             raise AppException(response.errors)
-        data = ProjectSerializer(response.data).serialize()
-        if data.get("users"):
-            for contributor in data["users"]:
-                contributor[
-                    "user_role"
-                ] = self.controller.service_provider.get_role_name(
-                    new_project, contributor["user_role"]
-                )
-        return data
+        project = ProjectSerializer(response.data).serialize()
+        for contributor in project["contributors"]:
+            contributor["role"] = self.controller.service_provider.get_role_name(
+                project, contributor["role"]
+            )
+        return project
 
     def create_categories(
         self, project: Union[NotEmptyStr, int], categories: List[NotEmptyStr]
@@ -1753,7 +1750,6 @@ def get_project_metadata(
                     "raw_config": {"roles": ["Annotator", "QA"], ...}
                 },
                 "upload_state": "INITIAL",
-                "users": [],
                 "contributors": [],
                 "settings": [],
                 "classes": [],
@@ -1782,15 +1778,12 @@ def get_project_metadata(
         )
         if response.errors:
             raise AppException(response.errors)
-        data = ProjectSerializer(response.data).serialize()
-        if data.get("users"):
-            for contributor in data["users"]:
-                contributor[
-                    "user_role"
-                ] = self.controller.service_provider.get_role_name(
-                    response.data, contributor["user_role"]
-                )
-        return data
+        project = ProjectSerializer(response.data).serialize()
+        for contributor in project["contributors"]:
+            contributor["role"] = self.controller.service_provider.get_role_name(
+                project, contributor["role"]
+            )
+        return project
 
     def get_project_settings(self, project: Union[NotEmptyStr, dict]):
         """Gets project's settings.

src/superannotate/lib/core/entities/project.py

@@ -109,7 +109,6 @@ class ProjectEntity(TimedBaseModel):
     workflow: Optional[WorkflowEntity]
     sync_status: Optional[int]
     upload_state: Optional[int]
-    users: Optional[List[WMProjectUserEntity]] = []
     contributors: List[WMProjectUserEntity] = []
     settings: List[SettingEntity] = []
     classes: List[AnnotationClassEntity] = []
@@ -138,7 +137,7 @@ def __copy__(self):
             instructions_link=self.instructions_link,
             status=self.status,
             folder_id=self.folder_id,
-            users=self.users,
+            contributors=self.contributors,
             settings=[s.__copy__() for s in self.settings],
             upload_state=self.upload_state,
             workflow_id=self.workflow_id,

src/superannotate/lib/core/usecases/projects.py

@@ -175,8 +175,7 @@ def execute(self):
                 project_id=project.id,
                 parent_entity=CustomFieldEntityEnum.PROJECT,
             ).data
-        else:
-            project.users = []
+
         if self._include_custom_fields:
             context = {"team_id": self._project.team_id}
             custom_fields_names = self._service_provider.list_custom_field_names(

tests/integration/projects/test_clone_project.py

@@ -234,11 +234,3 @@ def test_clone_video_project_frame_mode_off(self):
         for s in new_settings:
             if s["attribute"] == "FrameMode":
                 assert not s["value"]
-
-
-#
-#
-# def test_():
-#     sa.delete_project("tod")
-#     sa.get_project_metadata('tttp', include_contributors=True)
-#     sa.clone_project('tod', 'tttp', copy_contributors=True)

tests/integration/work_management/test_list_users.py

@@ -29,7 +29,7 @@ def test_pending_users(self):
         sa.invite_contributors_to_team(emails=[test_email])
         sa.add_contributors_to_project(self.PROJECT_NAME, [test_email], "Annotator")
         project = sa.get_project_metadata(self.PROJECT_NAME, include_contributors=True)
-        assert project['contributors'][1]["state"] == "Pending"
+        assert project["contributors"][1]["state"] == "Pending"
 
     def test_list_users_by_project_name(self):
         project_users = sa.list_users(project=self.PROJECT_NAME)