remove more usage

Author: JoshFerge

src/sentry/auth/access.py

@@ -225,7 +225,7 @@ def _team_memberships(self) -> Mapping[Team, OrganizationMemberTeam]:
         return {
             omt.team: omt
             for omt in OrganizationMemberTeam.objects.filter(
-                organizationmember=self._member, is_active=True, team__status=TeamStatus.ACTIVE
+                organizationmember=self._member, team__status=TeamStatus.ACTIVE
             ).select_related("team")
         }
 

src/sentry/hybridcloud/services/region_organization_provisioning/impl.py

@@ -74,7 +74,7 @@ def _create_organization_and_team(
 
         if create_default_team:
             team = org.team_set.create(name=org.name)
-            OrganizationMemberTeam.objects.create(team=team, organizationmember=om, is_active=True)
+            OrganizationMemberTeam.objects.create(team=team, organizationmember=om)
 
         return org
 

src/sentry/mail/forms/member_team.py

@@ -70,7 +70,6 @@ def clean(self) -> None:
 
         if targetType == self.memberValue:
             is_active_team_member = OrganizationMemberTeam.objects.filter(
-                is_active=True,
                 organizationmember__user_id=int(targetIdentifier),
                 organizationmember__teams__projectteam__project_id=self.project.id,
             ).exists()

src/sentry/models/organizationmember.py

@@ -472,9 +472,9 @@ def get_audit_log_data(self):
 
         teams = list(
             Team.objects.filter(
-                id__in=OrganizationMemberTeam.objects.filter(
-                    organizationmember=self, is_active=True
-                ).values_list("team", flat=True)
+                id__in=OrganizationMemberTeam.objects.filter(organizationmember=self).values_list(
+                    "team", flat=True
+                )
             ).values("id", "slug")
         )
 
@@ -496,17 +496,13 @@ def get_teams(self):
 
         return Team.objects.filter(
             status=TeamStatus.ACTIVE,
-            id__in=OrganizationMemberTeam.objects.filter(
-                organizationmember=self, is_active=True
-            ).values("team"),
+            id__in=OrganizationMemberTeam.objects.filter(organizationmember=self).values("team"),
         )
 
     def get_team_roles(self):
         from sentry.models.organizationmemberteam import OrganizationMemberTeam
 
-        return OrganizationMemberTeam.objects.filter(
-            organizationmember=self, is_active=True
-        ).values("team", "role")
+        return OrganizationMemberTeam.objects.filter(organizationmember=self).values("team", "role")
 
     def get_scopes(self) -> frozenset[str]:
         # include org roles from team membership

src/sentry/testutils/factories.py

@@ -459,7 +459,7 @@ def create_team_membership(team, member=None, user=None, role=None):
             )
 
         return OrganizationMemberTeam.objects.create(
-            team=team, organizationmember=member, is_active=True, role=role
+            team=team, organizationmember=member, role=role
         )
 
     @staticmethod

src/sentry/testutils/fixtures.py

@@ -95,7 +95,7 @@ def team(self):
         # XXX: handle legacy team fixture
         queryset = OrganizationMember.objects.filter(organization=self.organization)
         for om in queryset:
-            OrganizationMemberTeam.objects.create(team=team, organizationmember=om, is_active=True)
+            OrganizationMemberTeam.objects.create(team=team, organizationmember=om)
         return team
 
     @cached_property

src/sentry/testutils/pytest/fixtures.py

@@ -97,7 +97,7 @@ def default_team(factories, default_organization):
     # XXX: handle legacy team fixture
     queryset = OrganizationMember.objects.filter(organization=default_organization)
     for om in queryset:
-        OrganizationMemberTeam.objects.create(team=team, organizationmember=om, is_active=True)
+        OrganizationMemberTeam.objects.create(team=team, organizationmember=om)
     return team
 
 

tests/sentry/api/endpoints/test_organization_access_request_details.py

@@ -68,9 +68,7 @@ def test_approve_request(self):
 
         assert resp.status_code == 204
 
-        assert OrganizationMemberTeam.objects.filter(
-            organizationmember=member, team=team, is_active=True
-        ).exists()
+        assert OrganizationMemberTeam.objects.filter(organizationmember=member, team=team).exists()
 
         assert not OrganizationAccessRequest.objects.filter(id=access_request.id).exists()
 
@@ -96,7 +94,7 @@ def test_deny_request(self):
         assert resp.status_code == 204
 
         assert not OrganizationMemberTeam.objects.filter(
-            organizationmember=member, team=team, is_active=True
+            organizationmember=member, team=team
         ).exists()
 
         assert not OrganizationAccessRequest.objects.filter(id=access_request.id).exists()

tests/sentry/api/endpoints/test_organization_projects_experiment.py

@@ -89,7 +89,7 @@ def test_valid_params(self):
             user_id=self.user.id, organization=self.organization
         )
         assert OrganizationMemberTeam.objects.filter(
-            organizationmember=member, team=team, is_active=True, role="admin"
+            organizationmember=member, team=team, role="admin"
         ).exists()
 
         project = Project.objects.get(id=response.data["id"])
@@ -114,7 +114,7 @@ def test_project_slug_is_slugified(self):
             user_id=self.user.id, organization=self.organization
         )
         assert OrganizationMemberTeam.objects.filter(
-            organizationmember=member, team=team, is_active=True, role="admin"
+            organizationmember=member, team=team, role="admin"
         ).exists()
 
         project = Project.objects.get(id=response.data["id"])
@@ -141,7 +141,7 @@ def test_team_slug_is_slugified(self):
 
         member = OrganizationMember.objects.get(user_id=user.id, organization=self.organization)
         assert OrganizationMemberTeam.objects.filter(
-            organizationmember=member, team=team, is_active=True, role="admin"
+            organizationmember=member, team=team, role="admin"
         ).exists()
 
         project = Project.objects.get(id=response.data["id"])

tests/sentry/api/endpoints/test_organization_teams.py

@@ -195,9 +195,7 @@ def test_valid_params(self):
             user_id=self.user.id, organization=self.organization
         )
 
-        assert OrganizationMemberTeam.objects.filter(
-            organizationmember=member, team=team, is_active=True
-        ).exists()
+        assert OrganizationMemberTeam.objects.filter(organizationmember=member, team=team).exists()
 
     def test_without_slug(self):
         resp = self.get_success_response(

tests/sentry/hybridcloud/test_organization.py

@@ -109,7 +109,6 @@ def assert_team_member_equals(
     assert team_member.id == orm_team_member.id
     assert team_member.team_id == orm_team_member.team_id
     assert team_member.role == orm_team_member.get_team_role()
-    assert team_member.is_active == orm_team_member.is_active
     assert frozenset(team_member.scopes) == orm_team_member.get_scopes()
     assert set(team_member.project_ids) == {
         p.id for p in Project.objects.get_for_team_ids([orm_team_member.team_id])
@@ -129,7 +128,6 @@ def assert_organization_member_equals(
         list(
             OrganizationMemberTeam.objects.filter(
                 organizationmember_id=orm_organization_member.id,
-                is_active=True,
                 team__status=TeamStatus.ACTIVE,
             )
         ),