Merge pull request #351 from superannotateai/friday

Added tests

Author: VaghinakDev

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

@@ -21,11 +21,11 @@
 from lib.app.interface.types import AnnotationStatuses
 from lib.app.interface.types import AnnotationType
 from lib.app.interface.types import AnnotatorRole
+from lib.app.interface.types import EmailStr
 from lib.app.interface.types import ImageQualityChoices
 from lib.app.interface.types import NotEmptyStr
 from lib.app.interface.types import ProjectTypes
 from lib.app.interface.types import validate_arguments
-from lib.app.interface.types import EmailStr
 from lib.app.mixp.decorators import Trackable
 from lib.app.serializers import BaseSerializers
 from lib.app.serializers import ImageSerializer

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

@@ -999,11 +999,11 @@ def execute(self):
                 ],
             )
             if response and not response.get("invalidUsers"):
-                self._response.data = to_add, to_skip
                 self.reporter.log_info(
                     f"Added {len(to_add)}/{len(self._emails)} "
                     "contributors to the project <project_name> with the <role> role."
                 )
+        self._response.data = to_add, to_skip
         return self._response
 
 
@@ -1053,8 +1053,8 @@ def execute(self):
                 emails=to_add
             )
             if response:
-                self._response.data = to_add, to_skip
                 self.reporter.log_info(
                     f"Sent team <admin/contributor> invitations to {len(to_add)}/{len(self._emails)}."
                 )
+        self._response.data = to_add, to_skip
         return self._response

src/superannotate/lib/infrastructure/controller.py

@@ -246,6 +246,10 @@ def s3_repo(self):
     def annotation_validators(self):
         return AnnotationValidator()
 
+    @property
+    def backend_client(self):
+        return self._backend_client
+
 
 class Controller(BaseController):
     def __init__(self, config_path=constances.CONFIG_FILE_LOCATION):
@@ -1569,17 +1573,17 @@ def add_contributors_to_project(self, project_name: str, emails: list, role: str
             project=project.data["project"],
             emails=emails,
             role=role,
-            service=self._backend_client,
+            service=self.backend_client,
         )
         return use_case.execute()
 
-    def invite_contributors_to_team(self, emails: list, set_admin: str):
+    def invite_contributors_to_team(self, emails: list, set_admin: bool):
         team = self.get_team()
         use_case = usecases.InviteContributorsToTeam(
             reporter=self.default_reporter,
             team=team.data,
             emails=emails,
             set_admin=set_admin,
-            service=self._backend_client,
+            service=self.backend_client,
         )
         return use_case.execute()

tests/integration/projects/test_add_contributors_to_project.py

@@ -1,42 +1,79 @@
-# import random
-# import string
-# from unittest.mock import patch
-#
-# import src.superannotate as sa
-# from src.superannotate import controller
-# from src.superannotate.lib.core.entities import TeamEntity
-# from src.superannotate.lib.core.entities import ProjectEntity
-# from src.superannotate.lib.core.entities import UserEntity
-#
-# from tests.integration.base import BaseTestCase
-#
-#
-# class TestProject(BaseTestCase):
-#     PROJECT_NAME = "add_contributors_to_project"
-#     PROJECT_TYPE = "Vector"
-#     PROJECT_DESCRIPTION = "DESCRIPTION"
-#     TEST_EMAILS = ()
-#
-#     @property
-#     def random_email(self):
-#         return f"{''.join(random.choice(string.ascii_letters) for _ in range(7))}@gmail.com"
-#
-#     @patch("src.superannotate.lib.infrastructure.controller.Controller.get_team")
-#     @patch("src.superannotate.lib.infrastructure.controller.Controller.get_project_metadata")
-#     def test_add_contributors(self, get_team_mock, get_project_metadata_mock):
-#
-#         random_emails = [self.random_email for i in range(30)]
-#
-#         team_users = [UserEntity(email=email) for email in random_emails[: 10]]
-#         to_add_emails = random_emails[8: 18]
-#         pending_users = random_emails[15: 20]
-#         unverified_users = random_emails[20: 30]
-#
-#         get_team_mock.return_value = TeamEntity(uuid=controller.team_id, users=team_users)
-#         get_project_metadata_mock.return_value = dict(
-#             data=ProjectEntity(
-#                 uuid=controller.team_id,
-#                 users=team_users
-#             )
-#         )
-#         # added, skipped = sa.add_contributors_to_project(self.PROJECT_NAME)
+import random
+import string
+from unittest.mock import patch
+from unittest.mock import MagicMock
+from unittest.mock import PropertyMock
+
+import src.superannotate as sa
+from src.superannotate import controller
+from src.superannotate.lib.core.entities import TeamEntity
+from src.superannotate.lib.core.entities import ProjectEntity
+from src.superannotate.lib.core.entities import UserEntity
+
+from tests.integration.base import BaseTestCase
+
+
+class TestProject(BaseTestCase):
+    PROJECT_NAME = "add_contributors_to_project"
+    PROJECT_TYPE = "Vector"
+    PROJECT_DESCRIPTION = "DESCRIPTION"
+    TEST_EMAILS = ()
+
+    @property
+    def random_email(self):
+        return f"{''.join(random.choice(string.ascii_letters) for _ in range(7))}@gmail.com"
+
+    @patch("lib.infrastructure.controller.Controller.get_team")
+    @patch("lib.infrastructure.controller.Controller.get_project_metadata")
+    @patch("lib.infrastructure.controller.Controller.backend_client", new_callable=PropertyMock)
+    def test_add_contributors(self, client, get_project_metadata_mock, get_team_mock):
+        client.return_value.share_project_bulk.return_value = dict(invalidUsers=[])
+
+        random_emails = [self.random_email for i in range(20)]
+
+        team_users = [UserEntity(email=email, user_role=3) for email in random_emails[: 10]]
+        project_users = [dict(user_id=email, user_role=4) for email in random_emails[: 10]]
+        to_add_emails = random_emails[8: 18]
+        pending_users = [dict(email=email, user_role=3) for email in random_emails[15: 20]]
+        unverified_users = [dict(email=email, user_role=4) for email in random_emails[18: 20]]
+
+        team_data = MagicMock()
+        project_data = MagicMock()
+        get_team_mock.return_value = team_data
+        team_data.data = TeamEntity(
+            uuid=controller.team_id,
+            users=team_users,
+            pending_invitations=pending_users
+        )
+        get_project_metadata_mock.return_value = project_data
+        project_data.data = dict(
+            project=ProjectEntity(
+                uuid=controller.team_id,
+                users=project_users,
+                unverified_users=unverified_users,
+            )
+        )
+        added, skipped = sa.add_contributors_to_project(self.PROJECT_NAME, to_add_emails, "QA")
+        self.assertEqual(len(added), 3)
+        self.assertEqual(len(skipped), 7)
+
+    @patch("lib.infrastructure.controller.Controller.get_team")
+    @patch("lib.infrastructure.controller.Controller.backend_client", MagicMock())
+    def test_invite_contributors(self, get_team_mock):
+        random_emails = [self.random_email for i in range(20)]
+
+        team_users = [UserEntity(email=email, user_role=3) for email in random_emails[: 10]]
+        to_add_emails = random_emails[8: 18]
+        pending_users = [dict(email=email, user_role=3) for email in random_emails[15: 20]]
+
+        team_data = MagicMock()
+        get_team_mock.return_value = team_data
+        team_data.data = TeamEntity(
+            uuid=controller.team_id,
+            users=team_users,
+            pending_invitations=pending_users
+        )
+
+        added, skipped = sa.invite_contributors_to_team(to_add_emails, False)
+        self.assertEqual(len(added), 5)
+        self.assertEqual(len(skipped), 5)