orgs: remove member removes teams (#17957)

* add failing test to validate issue

* ensure that TeamRole objects associated to a user's organization membership are removed along with their membership.

Author: ewdurbin

tests/unit/organizations/test_services.py

@@ -438,6 +438,35 @@ def test_delete_organization_role(self, organization_service, user_service):
             is None
         )
 
+    def test_delete_organization_role_deletes_team_roles(
+        self, organization_service, user_service
+    ):
+        user = UserFactory.create()
+        organization = OrganizationFactory.create()
+        organization_role = OrganizationRoleFactory.create(
+            organization=organization, user=user
+        )
+        team = TeamFactory.create(organization=organization)
+        TeamRoleFactory.create(team=team, user=user)
+
+        organization_service.delete_organization_role(organization_role.id)
+
+        assert (
+            organization_service.get_organization_role_by_user(
+                organization_role.organization_id,
+                user.id,
+            )
+            is None
+        )
+
+        assert (
+            organization_service.get_organization_team_roles_by_user(
+                organization.id,
+                user.id,
+            )
+            == []
+        )
+
     def test_get_organization_invite(self, organization_service):
         organization_invite = OrganizationInvitationFactory.create()
 

warehouse/organizations/services.py

@@ -391,6 +391,11 @@ def delete_organization_role(self, organization_role_id):
         """
         role = self.get_organization_role(organization_role_id)
 
+        for team_role in self.get_organization_team_roles_by_user(
+            role.organization.id, role.user_id
+        ):
+            self.db.delete(team_role)
+
         self.db.delete(role)
 
     def get_organization_invite(self, organization_invite_id):
@@ -709,6 +714,16 @@ def get_teams_by_user(self, user_id):
             .all()
         )
 
+    def get_organization_team_roles_by_user(self, organization_id, user_id):
+        return (
+            self.db.query(TeamRole)
+            .join(Team, Team.id == TeamRole.team_id)
+            .filter(
+                TeamRole.user_id == user_id, Team.organization_id == organization_id
+            )
+            .all()
+        )
+
     def add_team(self, organization_id, name):
         """
         Attempts to create a team with the specified name in an organization