Remove contributor entity

Author: VaghinakDev

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

@@ -3525,9 +3525,9 @@ def add_contributors_to_project(
         """
         project = self.controller.projects.get_by_name(project).data
         contributors = [
-            entities.ContributorEntity(
-                user_id=email,
-                user_role=self.controller.service_provider.get_role_id(project, role),
+            entities.WMProjectUserEntity(
+                email=email,
+                role=self.controller.service_provider.get_role_id(project, role),
             )
             for email in emails
         ]

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

@@ -15,7 +15,6 @@
 from lib.core.entities.multimodal_form import FormModel
 from lib.core.entities.multimodal_form import generate_classes_from_form
 from lib.core.entities.project import AttachmentEntity
-from lib.core.entities.project import ContributorEntity
 from lib.core.entities.project import CustomFieldEntity
 from lib.core.entities.project import ProjectEntity
 from lib.core.entities.project import SettingEntity
@@ -25,6 +24,7 @@
 from lib.core.entities.project import WorkflowEntity
 from lib.core.entities.project_entities import BaseEntity
 from lib.core.entities.project_entities import S3FileEntity
+from lib.core.entities.work_managament import WMProjectUserEntity
 
 __all__ = [
     # base
@@ -47,7 +47,7 @@
     "ProjectEntity",
     "WorkflowEntity",
     "CategoryEntity",
-    "ContributorEntity",
+    "WMProjectUserEntity",
     "ConfigEntity",
     "StepEntity",
     "FolderEntity",

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

@@ -7,6 +7,7 @@
 
 from lib.core.entities.base import BaseModel
 from lib.core.entities.classes import AnnotationClassEntity
+from lib.core.entities.work_managament import WMProjectUserEntity
 from lib.core.enums import BaseTitledEnum
 from lib.core.enums import ProjectStatus
 from lib.core.enums import ProjectType
@@ -78,16 +79,6 @@ def __copy__(self):
         return SettingEntity(attribute=self.attribute, value=self.value)
 
 
-class ContributorEntity(BaseModel):
-    first_name: Optional[str]
-    last_name: Optional[str]
-    user_id: str
-    user_role: Union[int, str]
-
-    class Config:
-        extra = Extra.ignore
-
-
 class WorkflowEntity(TimedBaseModel):
     id: Optional[int]
     name: Optional[str]
@@ -118,9 +109,9 @@ class ProjectEntity(TimedBaseModel):
     workflow: Optional[WorkflowEntity]
     sync_status: Optional[int]
     upload_state: Optional[int]
-    users: Optional[List[ContributorEntity]] = []
+    users: Optional[List[WMProjectUserEntity]] = []
     unverified_users: Optional[List[Any]] = []
-    contributors: List[ContributorEntity] = []
+    contributors: List[WMProjectUserEntity] = []
     settings: List[SettingEntity] = []
     classes: List[AnnotationClassEntity] = []
     item_count: Optional[int] = Field(None, alias="imageCount")

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

@@ -8,12 +8,12 @@
 from lib.core.conditions import Condition
 from lib.core.conditions import CONDITION_EQ as EQ
 from lib.core.entities import AnnotationClassEntity
-from lib.core.entities import ContributorEntity
 from lib.core.entities import FormModel
 from lib.core.entities import generate_classes_from_form
 from lib.core.entities import ProjectEntity
 from lib.core.entities import SettingEntity
 from lib.core.entities import TeamEntity
+from lib.core.entities import WMProjectUserEntity
 from lib.core.enums import CustomFieldEntityEnum
 from lib.core.enums import CustomFieldType
 from lib.core.enums import WMUserStateEnum
@@ -830,7 +830,7 @@ def __init__(
         self,
         team: TeamEntity,
         project: ProjectEntity,
-        contributors: List[ContributorEntity],
+        contributors: List[WMProjectUserEntity],
         service_provider: BaseServiceProvider,
     ):
         super().__init__()
@@ -842,7 +842,7 @@ def __init__(
     def validate_emails(self):
         email_entity_map = {}
         for c in self._contributors:
-            email_entity_map[c.user_id] = c
+            email_entity_map[c.email] = c
         len_unique, len_provided = len(email_entity_map), len(self._contributors)
         if len_unique < len_provided:
             logger.info(
@@ -853,7 +853,13 @@ def validate_emails(self):
     def execute(self):
         if self.is_valid():
             team_users = set()
-            project_users = {user.user_id for user in self._project.users}
+            project_users = self._service_provider.work_management.list_users(
+                EmptyQuery(),
+                include_custom_fields=True,
+                parent_entity=CustomFieldEntityEnum.PROJECT,
+                project_id=self._project.id,
+            ).data
+            project_emails = {user.email for user in project_users}
             users = self._service_provider.work_management.list_users(EmptyQuery()).data
             pending_invitations = []
             for user in users:
@@ -864,16 +870,16 @@ def execute(self):
 
             # collecting pending project users which is not admin
             for user in self._project.unverified_users:
-                project_users.add(user["email"])
+                project_emails.add(user["email"])
 
             role_email_map = defaultdict(list)
             to_skip = []
             to_add = []
             for contributor in self._contributors:
-                role_email_map[contributor.user_role].append(contributor.user_id)
-            for role, emails in role_email_map.items():
-                role_id = self._service_provider.get_role_id(self._project, role)
-                _to_add = list(team_users.intersection(emails) - project_users)
+                role_email_map[contributor.role].append(contributor.email)
+            for role_id, emails in role_email_map.items():
+                role_name = self._service_provider.get_role_name(self._project, role_id)
+                _to_add = list(team_users.intersection(emails) - project_emails)
                 to_add.extend(_to_add)
                 to_skip.extend(list(set(emails).difference(_to_add)))
                 if _to_add:
@@ -893,7 +899,7 @@ def execute(self):
                     if response and not response.data.get("invalidUsers"):
                         logger.info(
                             f"Added {len(_to_add)}/{len(emails)} "
-                            f"contributors to the project {self._project.name} with the {role} role."
+                            f"contributors to the project {self._project.name} with the {role_name} role."
                         )
 
             if to_skip:
@@ -902,7 +908,7 @@ def execute(self):
                     "contributors that are out of the team scope or already have access to the project."
                 )
             self._response.data = to_add, to_skip
-            return self._response
+        return self._response
 
 
 class InviteContributorsToTeam(BaseUserBasedUseCase):

src/superannotate/lib/infrastructure/controller.py

@@ -21,7 +21,6 @@
 from lib.core.entities import AttachmentEntity
 from lib.core.entities import BaseItemEntity
 from lib.core.entities import ConfigEntity
-from lib.core.entities import ContributorEntity
 from lib.core.entities import CustomFieldEntity
 from lib.core.entities import FolderEntity
 from lib.core.entities import ImageEntity
@@ -30,6 +29,7 @@
 from lib.core.entities import SettingEntity
 from lib.core.entities import TeamEntity
 from lib.core.entities import UserEntity
+from lib.core.entities import WMProjectUserEntity
 from lib.core.entities.classes import AnnotationClassEntity
 from lib.core.entities.filters import ItemFilters
 from lib.core.entities.filters import ProjectFilters
@@ -592,13 +592,9 @@ def add_contributors(
         self,
         team: TeamEntity,
         project: ProjectEntity,
-        contributors: List[ContributorEntity],
+        contributors: List[WMProjectUserEntity],
     ):
         project = self.get_metadata(project, include_contributors=True).data
-        for contributor in contributors:
-            contributor.user_role = self.service_provider.get_role_name(
-                project, contributor.user_role
-            )
         use_case = usecases.AddContributorsToProject(
             team=team,
             project=project,