remove organization, move model to replays

Author: shellmayr

src/sentry/api/serializers/models/organization.py

@@ -76,12 +76,12 @@
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.organization import Organization, OrganizationStatus
 from sentry.models.organizationaccessrequest import OrganizationAccessRequest
-from sentry.models.organizationmemberreplayaccess import OrganizationMemberReplayAccess
 from sentry.models.organizationonboardingtask import OrganizationOnboardingTask
 from sentry.models.project import Project
 from sentry.models.team import Team, TeamStatus
 from sentry.organizations.absolute_url import generate_organization_url
 from sentry.organizations.services.organization import RpcOrganizationSummary
+from sentry.replays.models import OrganizationMemberReplayAccess
 from sentry.users.models.user import User
 from sentry.users.services.user.model import RpcUser
 from sentry.users.services.user.service import user_service
@@ -765,9 +765,9 @@ def serialize(  # type: ignore[override]
             )
             context["hasGranularReplayPermissions"] = bool(permissions_enabled)
             context["replayAccessMembers"] = list(
-                OrganizationMemberReplayAccess.objects.filter(organization=obj).values_list(
-                    "organizationmember_id", flat=True
-                )
+                OrganizationMemberReplayAccess.objects.filter(
+                    organizationmember__organization=obj
+                ).values_list("organizationmember_id", flat=True)
             )
 
         if has_custom_dynamic_sampling(obj, actor=user):

src/sentry/core/endpoints/organization_details.py

@@ -97,7 +97,6 @@
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.organization import Organization, OrganizationStatus
 from sentry.models.organizationmember import OrganizationMember
-from sentry.models.organizationmemberreplayaccess import OrganizationMemberReplayAccess
 from sentry.models.project import Project
 from sentry.organizations.services.organization import organization_service
 from sentry.organizations.services.organization.model import (
@@ -106,6 +105,7 @@
     RpcOrganizationDeleteState,
 )
 from sentry.relay.datascrubbing import validate_pii_config_update, validate_pii_selectors
+from sentry.replays.models import OrganizationMemberReplayAccess
 from sentry.seer.autofix.constants import AutofixAutomationTuningSettings
 from sentry.services.organization.provisioning import (
     OrganizationSlugCollisionException,
@@ -633,9 +633,9 @@ def save(self, **kwargs):
             if member_ids is None:
                 member_ids = []
             current_member_ids = set(
-                OrganizationMemberReplayAccess.objects.filter(organization=org).values_list(
-                    "organizationmember_id", flat=True
-                )
+                OrganizationMemberReplayAccess.objects.filter(
+                    organizationmember__organization=org
+                ).values_list("organizationmember_id", flat=True)
             )
             new_member_ids = set(member_ids)
 
@@ -657,17 +657,15 @@ def save(self, **kwargs):
 
                 OrganizationMemberReplayAccess.objects.bulk_create(
                     [
-                        OrganizationMemberReplayAccess(
-                            organization=org, organizationmember_id=member_id
-                        )
+                        OrganizationMemberReplayAccess(organizationmember_id=member_id)
                         for member_id in to_add
                     ],
                     ignore_conflicts=True,
                 )
 
             if to_remove:
                 OrganizationMemberReplayAccess.objects.filter(
-                    organization=org, organizationmember_id__in=to_remove
+                    organizationmember__organization=org, organizationmember_id__in=to_remove
                 ).delete()
 
             if to_add or to_remove:

src/sentry/models/__init__.py

@@ -74,7 +74,6 @@
 from .organizationmember import *  # NOQA
 from .organizationmemberinvite import *  # NOQA
 from .organizationmembermapping import *  # NOQA
-from .organizationmemberreplayaccess import *  # NOQA
 from .organizationmemberteam import *  # NOQA
 from .organizationmemberteamreplica import *  # NOQA
 from .organizationonboardingtask import *  # NOQA

src/sentry/models/organizationmemberreplayaccess.py

@@ -1,7 +1,6 @@
 # Generated by Django 5.2.8 on 2025-12-02 12:31
 
 import django.db.models.deletion
-import django.utils.timezone
 from django.db import migrations, models
 
 import sentry.db.models.fields.bounded
@@ -25,7 +24,7 @@ class Migration(CheckedMigration):
     is_post_deployment = False
 
     dependencies = [
-        ("sentry", "1011_update_oc_integration_cascade_to_null"),
+        ("replays", "0006_add_bulk_delete_job"),
     ]
 
     operations = [
@@ -38,27 +37,20 @@ class Migration(CheckedMigration):
                         primary_key=True, serialize=False
                     ),
                 ),
-                ("date_added", models.DateTimeField(default=django.utils.timezone.now)),
-                (
-                    "organization",
-                    sentry.db.models.fields.foreignkey.FlexibleForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="replay_access_set",
-                        to="sentry.organization",
-                    ),
-                ),
+                ("date_updated", models.DateTimeField(auto_now=True)),
+                ("date_added", models.DateTimeField(auto_now_add=True)),
                 (
                     "organizationmember",
                     sentry.db.models.fields.foreignkey.FlexibleForeignKey(
                         on_delete=django.db.models.deletion.CASCADE,
                         related_name="replay_access",
                         to="sentry.organizationmember",
+                        unique=True,
                     ),
                 ),
             ],
             options={
                 "db_table": "sentry_organizationmemberreplayaccess",
-                "unique_together": {("organization", "organizationmember")},
             },
         ),
     ]

…1012_organizationmember_replay_access.py …0007_organizationmember_replay_access.pysrc/sentry/migrations/1012_organizationmember_replay_access.py renamed to src/sentry/replays/migrations/0007_organizationmember_replay_access.py src/sentry/migrations/1012_organizationmember_replay_access.py renamed to src/sentry/replays/migrations/0007_organizationmember_replay_access.py

@@ -8,6 +8,7 @@
 from sentry.db.models import (
     BoundedBigIntegerField,
     DefaultFieldsModel,
+    FlexibleForeignKey,
     Model,
     region_silo_model,
     sane_repr,
@@ -78,3 +79,28 @@ def delete(self, *args, **kwargs):
 
         rv = super().delete(*args, **kwargs)
         return rv
+
+
+@region_silo_model
+class OrganizationMemberReplayAccess(DefaultFieldsModel):
+    """
+    Tracks which organization members have permission to access replay data.
+
+    When no records exist for an organization, all members have access (default).
+    When records exist, only members with a record can access replays.
+    """
+
+    __relocation_scope__ = RelocationScope.Organization
+
+    organizationmember = FlexibleForeignKey(
+        "sentry.OrganizationMember",
+        on_delete=models.CASCADE,
+        related_name="replay_access",
+        unique=True,
+    )
+
+    class Meta:
+        app_label = "replays"
+        db_table = "sentry_organizationmemberreplayaccess"
+
+    __repr__ = sane_repr("organizationmember_id")

src/sentry/replays/models.py

@@ -473,12 +473,10 @@ def create_exhaustive_organization(
         )
 
         # OrganizationMemberReplayAccess - add for the owner member
-        from sentry.models.organizationmemberreplayaccess import OrganizationMemberReplayAccess
+        from sentry.replays.models import OrganizationMemberReplayAccess
 
         owner_member = OrganizationMember.objects.get(organization=org, user_id=owner_id)
-        OrganizationMemberReplayAccess.objects.create(
-            organization=org, organizationmember=owner_member
-        )
+        OrganizationMemberReplayAccess.objects.create(organizationmember=owner_member)
 
         # Team
         team = self.create_team(name=f"test_team_in_{slug}", organization=org)

src/sentry/testutils/helpers/backups.py

@@ -17,13 +17,13 @@
 from sentry.models.deploy import Deploy
 from sentry.models.environment import Environment
 from sentry.models.options.organization_option import OrganizationOption
-from sentry.models.organizationmemberreplayaccess import OrganizationMemberReplayAccess
 from sentry.models.organizationonboardingtask import (
     OnboardingTask,
     OnboardingTaskStatus,
     OrganizationOnboardingTask,
 )
 from sentry.models.releaseprojectenvironment import ReleaseProjectEnvironment
+from sentry.replays.models import OrganizationMemberReplayAccess
 from sentry.testutils.cases import TestCase
 from sentry.testutils.skips import requires_snuba
 
@@ -204,12 +204,8 @@ def test_replay_access_members_serialized(self) -> None:
         member2 = self.create_member(
             organization=organization, user=self.create_user(), role="member"
         )
-        OrganizationMemberReplayAccess.objects.create(
-            organization=organization, organizationmember=member1
-        )
-        OrganizationMemberReplayAccess.objects.create(
-            organization=organization, organizationmember=member2
-        )
+        OrganizationMemberReplayAccess.objects.create(organizationmember=member1)
+        OrganizationMemberReplayAccess.objects.create(organizationmember=member2)
         acc = access.from_user(user, organization)
 
         with self.feature("organizations:granular-replay-permissions"):

tests/sentry/api/serializers/test_organization.py

@@ -31,8 +31,8 @@
 from sentry.models.options.project_option import ProjectOption
 from sentry.models.organization import Organization, OrganizationStatus
 from sentry.models.organizationmapping import OrganizationMapping
-from sentry.models.organizationmemberreplayaccess import OrganizationMemberReplayAccess
 from sentry.models.organizationslugreservation import OrganizationSlugReservation
+from sentry.replays.models import OrganizationMemberReplayAccess
 from sentry.signals import project_created
 from sentry.silo.safety import unguarded_write
 from sentry.snuba.metrics import TransactionMRI
@@ -1548,7 +1548,7 @@ def test_replay_access_members_add(self) -> None:
 
         access_members = list(
             OrganizationMemberReplayAccess.objects.filter(
-                organization=self.organization
+                organizationmember__organization=self.organization
             ).values_list("organizationmember_id", flat=True)
         )
         assert set(access_members) == {member1.id, member2.id}
@@ -1566,12 +1566,8 @@ def test_replay_access_members_remove(self) -> None:
         member2 = self.create_member(
             organization=self.organization, user=self.create_user(), role="member"
         )
-        OrganizationMemberReplayAccess.objects.create(
-            organization=self.organization, organizationmember=member1
-        )
-        OrganizationMemberReplayAccess.objects.create(
-            organization=self.organization, organizationmember=member2
-        )
+        OrganizationMemberReplayAccess.objects.create(organizationmember=member1)
+        OrganizationMemberReplayAccess.objects.create(organizationmember=member2)
         with assume_test_silo_mode_of(AuditLogEntry):
             AuditLogEntry.objects.filter(organization_id=self.organization.id).delete()
 
@@ -1581,7 +1577,7 @@ def test_replay_access_members_remove(self) -> None:
 
         access_members = list(
             OrganizationMemberReplayAccess.objects.filter(
-                organization=self.organization
+                organizationmember__organization=self.organization
             ).values_list("organizationmember_id", flat=True)
         )
         assert access_members == [member1.id]
@@ -1602,9 +1598,7 @@ def test_replay_access_members_add_and_remove(self) -> None:
         member3 = self.create_member(
             organization=self.organization, user=self.create_user(), role="member"
         )
-        OrganizationMemberReplayAccess.objects.create(
-            organization=self.organization, organizationmember=member1
-        )
+        OrganizationMemberReplayAccess.objects.create(organizationmember=member1)
         with assume_test_silo_mode_of(AuditLogEntry):
             AuditLogEntry.objects.filter(organization_id=self.organization.id).delete()
 
@@ -1614,7 +1608,7 @@ def test_replay_access_members_add_and_remove(self) -> None:
 
         access_members = set(
             OrganizationMemberReplayAccess.objects.filter(
-                organization=self.organization
+                organizationmember__organization=self.organization
             ).values_list("organizationmember_id", flat=True)
         )
         assert access_members == {member2.id, member3.id}
@@ -1630,9 +1624,7 @@ def test_replay_access_members_clear_all(self) -> None:
         member1 = self.create_member(
             organization=self.organization, user=self.create_user(), role="member"
         )
-        OrganizationMemberReplayAccess.objects.create(
-            organization=self.organization, organizationmember=member1
-        )
+        OrganizationMemberReplayAccess.objects.create(organizationmember=member1)
         with assume_test_silo_mode_of(AuditLogEntry):
             AuditLogEntry.objects.filter(organization_id=self.organization.id).delete()
 
@@ -1641,7 +1633,7 @@ def test_replay_access_members_clear_all(self) -> None:
             self.get_success_response(self.organization.slug, **data)
 
         access_count = OrganizationMemberReplayAccess.objects.filter(
-            organization=self.organization
+            organizationmember__organization=self.organization
         ).count()
         assert access_count == 0
 
@@ -1703,7 +1695,7 @@ def test_replay_access_members_mixed_valid_and_invalid(self) -> None:
         assert str(valid_member.id) not in response.data["replayAccessMembers"]
 
         access_count = OrganizationMemberReplayAccess.objects.filter(
-            organization=self.organization
+            organizationmember__organization=self.organization
         ).count()
         assert access_count == 0