fix: Add CustomDynamicSamplingRule back to user merge test coverage

The CustomDynamicSamplingRule model has RelocationScope.Organization and a
HybridCloudForeignKey to User via created_by_id. It was removed from the
@expect_models decorators and model_list, but the model still exists and needs
to be included in user merge coverage to pass the
test_all_eligible_organization_scoped_models_tested_for_user_merge test.

This fix:
1. Adds CustomDynamicSamplingRule import and includes it in both @expect_models
   decorators in test_user.py
2. Sets created_by_id=owner_id when creating CustomDynamicSamplingRule in
   create_exhaustive_organization fixture
3. Adds CustomDynamicSamplingRule to model_list in organization impl.py for
   user merging

Co-authored-by: Armen Zambrano G. <armenzg@users.noreply.github.com>

Author: cursoragent

src/sentry/organizations/services/organization/impl.py

@@ -20,6 +20,7 @@
 from sentry.incidents.models.incident import IncidentActivity
 from sentry.models.activity import Activity
 from sentry.models.dashboard import Dashboard, DashboardFavoriteUser
+from sentry.models.dynamicsampling import CustomDynamicSamplingRule
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.groupbookmark import GroupBookmark
 from sentry.models.groupsearchview import GroupSearchView
@@ -580,6 +581,7 @@ def merge_users(self, *, organization_id: int, from_user_id: int, to_user_id: in
                 Activity,
                 AlertRule,
                 AlertRuleActivity,
+                CustomDynamicSamplingRule,
                 Dashboard,
                 DashboardFavoriteUser,
                 GroupAssignee,

src/sentry/testutils/helpers/backups.py

@@ -826,6 +826,7 @@ def create_exhaustive_organization(
             num_samples=100,
             condition_hash="abc123def456abc123def456abc123def4560000",
             sample_rate=0.5,
+            created_by_id=owner_id,
         )
         CustomDynamicSamplingRuleProject.objects.create(
             custom_dynamic_sampling_rule=custom_rule,

tests/sentry/users/models/test_user.py

@@ -13,6 +13,7 @@
 from sentry.models.activity import Activity
 from sentry.models.authidentity import AuthIdentity
 from sentry.models.dashboard import Dashboard, DashboardFavoriteUser
+from sentry.models.dynamicsampling import CustomDynamicSamplingRule
 from sentry.models.groupassignee import GroupAssignee
 from sentry.models.groupbookmark import GroupBookmark
 from sentry.models.groupsearchview import GroupSearchView
@@ -382,6 +383,7 @@ def test_duplicate_memberships(self, expected_models: list[type[Model]]) -> None
         Activity,
         AlertRule,
         AlertRuleActivity,
+        CustomDynamicSamplingRule,
         Dashboard,
         DashboardFavoriteUser,
         GroupAssignee,
@@ -425,6 +427,7 @@ def test_only_source_user_is_member_of_organization(
         Activity,
         AlertRule,
         AlertRuleActivity,
+        CustomDynamicSamplingRule,
         Dashboard,
         DashboardFavoriteUser,
         GroupAssignee,