Manage organization "Teams"

tests/common/db/organizations.py

@@ -22,6 +22,11 @@
     OrganizationProject,
     OrganizationRole,
     OrganizationRoleType,
+    Team,
+    TeamProjectRole,
+    TeamProjectRoleType,
+    TeamRole,
+    TeamRoleType,
 )
 
 from .accounts import UserFactory
@@ -101,3 +106,35 @@ class Meta:
     id = factory.Faker("uuid4", cast_to=None)
     organization = factory.SubFactory(OrganizationFactory)
     project = factory.SubFactory(ProjectFactory)
+
+
+class TeamFactory(WarehouseFactory):
+    class Meta:
+        model = Team
+
+    id = factory.Faker("uuid4", cast_to=None)
+    name = factory.Faker("pystr", max_chars=12)
+    created = factory.Faker(
+        "date_time_between_dates",
+        datetime_start=datetime.datetime(2020, 1, 1),
+        datetime_end=datetime.datetime(2022, 1, 1),
+    )
+    organization = factory.SubFactory(OrganizationFactory)
+
+
+class TeamRoleFactory(WarehouseFactory):
+    class Meta:
+        model = TeamRole
+
+    role_name = TeamRoleType.Member
+    user = factory.SubFactory(UserFactory)
+    team = factory.SubFactory(TeamFactory)
+
+
+class TeamProjectRoleFactory(WarehouseFactory):
+    class Meta:
+        model = TeamProjectRole
+
+    role_name = TeamProjectRoleType.Administer
+    project = factory.SubFactory(ProjectFactory)
+    team = factory.SubFactory(TeamFactory)

tests/unit/email/test_init.py

@@ -24,6 +24,7 @@
 from warehouse.email.services import EmailMessage
 
 from ...common.db.accounts import EmailFactory, UserFactory
+from ...common.db.organizations import TeamFactory
 
 
 @pytest.mark.parametrize(
@@ -2794,6 +2795,163 @@ def test_send_organization_deleted_email(
         ]
 
 
+class TestTeamMemberEmails:
+    @pytest.fixture
+    def team(self, pyramid_user):
+        self.user = UserFactory.create()
+        EmailFactory.create(user=self.user, verified=True)
+        self.submitter = pyramid_user
+        self.organization_name = "exampleorganization"
+        self.team_name = "Example Team"
+
+    @pytest.mark.parametrize(
+        ("email_template_name", "send_team_member_email"),
+        [
+            ("added-as-team-member", email.send_added_as_team_member_email),
+            ("removed-as-team-member", email.send_removed_as_team_member_email),
+            ("team-member-added", email.send_team_member_added_email),
+            ("team-member-removed", email.send_team_member_removed_email),
+        ],
+    )
+    def test_send_team_member_email(
+        self,
+        db_request,
+        team,
+        make_email_renderers,
+        send_email,
+        email_template_name,
+        send_team_member_email,
+    ):
+        subject_renderer, body_renderer, html_renderer = make_email_renderers(
+            email_template_name
+        )
+
+        if email_template_name.endswith("-as-team-member"):
+            recipient = self.user
+            result = send_team_member_email(
+                db_request,
+                self.user,
+                submitter=self.submitter,
+                organization_name=self.organization_name,
+                team_name=self.team_name,
+            )
+        else:
+            recipient = self.submitter
+            result = send_team_member_email(
+                db_request,
+                self.submitter,
+                user=self.user,
+                submitter=self.submitter,
+                organization_name=self.organization_name,
+                team_name=self.team_name,
+            )
+
+        assert result == {
+            "username": self.user.username,
+            "submitter": self.submitter.username,
+            "organization_name": self.organization_name,
+            "team_name": self.team_name,
+        }
+        subject_renderer.assert_(**result)
+        body_renderer.assert_(**result)
+        html_renderer.assert_(**result)
+        assert db_request.task.calls == [pretend.call(send_email)]
+        assert send_email.delay.calls == [
+            pretend.call(
+                f"{recipient.name} <{recipient.email}>",
+                {
+                    "subject": subject_renderer.string_response,
+                    "body_text": body_renderer.string_response,
+                    "body_html": (
+                        f"<html>\n"
+                        f"<head></head>\n"
+                        f"<body><p>{html_renderer.string_response}</p></body>\n"
+                        f"</html>\n"
+                    ),
+                },
+                {
+                    "tag": "account:email:sent",
+                    "user_id": recipient.id,
+                    "additional": {
+                        "from_": db_request.registry.settings["mail.sender"],
+                        "to": recipient.email,
+                        "subject": subject_renderer.string_response,
+                        "redact_ip": recipient != self.submitter,
+                    },
+                },
+            )
+        ]
+
+
+class TestTeamEmails:
+    @pytest.fixture
+    def team(self, pyramid_user):
+        self.user = pyramid_user
+        self.organization_name = "exampleorganization"
+        self.team_name = "Example Team"
+
+    @pytest.mark.parametrize(
+        ("email_template_name", "send_team_email"),
+        [
+            ("team-created", email.send_team_created_email),
+            ("team-deleted", email.send_team_deleted_email),
+        ],
+    )
+    def test_send_team_email(
+        self,
+        db_request,
+        team,
+        make_email_renderers,
+        send_email,
+        email_template_name,
+        send_team_email,
+    ):
+        subject_renderer, body_renderer, html_renderer = make_email_renderers(
+            email_template_name
+        )
+
+        result = send_team_email(
+            db_request,
+            self.user,
+            organization_name=self.organization_name,
+            team_name=self.team_name,
+        )
+
+        assert result == {
+            "organization_name": self.organization_name,
+            "team_name": self.team_name,
+        }
+        subject_renderer.assert_(**result)
+        body_renderer.assert_(**result)
+        html_renderer.assert_(**result)
+        assert db_request.task.calls == [pretend.call(send_email)]
+        assert send_email.delay.calls == [
+            pretend.call(
+                f"{self.user.name} <{self.user.email}>",
+                {
+                    "subject": subject_renderer.string_response,
+                    "body_text": body_renderer.string_response,
+                    "body_html": (
+                        f"<html>\n"
+                        f"<head></head>\n"
+                        f"<body><p>{html_renderer.string_response}</p></body>\n"
+                        f"</html>\n"
+                    ),
+                },
+                {
+                    "tag": "account:email:sent",
+                    "user_id": self.user.id,
+                    "additional": {
+                        "from_": db_request.registry.settings["mail.sender"],
+                        "to": self.user.email,
+                        "subject": subject_renderer.string_response,
+                        "redact_ip": False,
+                    },
+                },
+            )
+        ]
+
+
 class TestCollaboratorAddedEmail:
     def test_collaborator_added_email(
         self, pyramid_request, pyramid_config, monkeypatch
@@ -3615,6 +3773,111 @@ def test_role_changed_as_collaborator_email(
         ]
 
 
+class TestTeamCollaboratorEmails:
+    @pytest.fixture
+    def team(self, pyramid_user):
+        self.user = UserFactory.create()
+        EmailFactory.create(user=self.user, verified=True)
+        self.submitter = pyramid_user
+        self.team = TeamFactory.create(name="Example Team")
+        self.project_name = "exampleproject"
+        self.role = "Admin"
+
+    @pytest.mark.parametrize(
+        ("email_template_name", "send_team_collaborator_email"),
+        [
+            ("added-as-team-collaborator", email.send_added_as_team_collaborator_email),
+            (
+                "removed-as-team-collaborator",
+                email.send_removed_as_team_collaborator_email,
+            ),
+            (
+                "role-changed-as-team-collaborator",
+                email.send_role_changed_as_team_collaborator_email,
+            ),
+            ("team-collaborator-added", email.send_team_collaborator_added_email),
+            ("team-collaborator-removed", email.send_team_collaborator_removed_email),
+            (
+                "team-collaborator-role-changed",
+                email.send_team_collaborator_role_changed_email,
+            ),
+        ],
+    )
+    def test_send_team_collaborator_email(
+        self,
+        db_request,
+        team,
+        make_email_renderers,
+        send_email,
+        email_template_name,
+        send_team_collaborator_email,
+    ):
+        subject_renderer, body_renderer, html_renderer = make_email_renderers(
+            email_template_name
+        )
+
+        if "removed" in email_template_name:
+            result = send_team_collaborator_email(
+                db_request,
+                self.user,
+                team=self.team,
+                submitter=self.submitter,
+                project_name=self.project_name,
+            )
+        else:
+            result = send_team_collaborator_email(
+                db_request,
+                self.user,
+                team=self.team,
+                submitter=self.submitter,
+                project_name=self.project_name,
+                role=self.role,
+            )
+
+        if "removed" in email_template_name:
+            assert result == {
+                "team_name": self.team.name,
+                "project": self.project_name,
+                "submitter": self.submitter.username,
+            }
+        else:
+            assert result == {
+                "team_name": self.team.name,
+                "project": self.project_name,
+                "submitter": self.submitter.username,
+                "role": self.role,
+            }
+        subject_renderer.assert_(**result)
+        body_renderer.assert_(**result)
+        html_renderer.assert_(**result)
+        assert db_request.task.calls == [pretend.call(send_email)]
+        assert send_email.delay.calls == [
+            pretend.call(
+                f"{self.user.name} <{self.user.email}>",
+                {
+                    "subject": subject_renderer.string_response,
+                    "body_text": body_renderer.string_response,
+                    "body_html": (
+                        f"<html>\n"
+                        f"<head></head>\n"
+                        f"<body><p>{html_renderer.string_response}</p></body>\n"
+                        f"</html>\n"
+                    ),
+                },
+                {
+                    "tag": "account:email:sent",
+                    "user_id": self.user.id,
+                    "additional": {
+                        "from_": db_request.registry.settings["mail.sender"],
+                        "to": self.user.email,
+                        "subject": subject_renderer.string_response,
+                        "redact_ip": True,
+                    },
+                },
+            )
+        ]
+
+
 class TestRemovedProjectEmail:
     def test_removed_project_email_to_maintainer(
         self, pyramid_request, pyramid_config, monkeypatch