chore(hybrid-cloud): Stabilize issue integration defaults for split silo

src/sentry/integrations/mixins/issues.py

@@ -7,8 +7,9 @@
 from typing import Any, ClassVar, Mapping, Sequence
 
 from sentry.integrations.utils import where_should_sync
-from sentry.models import ExternalIssue, GroupLink, UserOption
+from sentry.models import ExternalIssue, GroupLink
 from sentry.models.project import Project
+from sentry.models.user import User
 from sentry.notifications.utils import get_notification_group_title
 from sentry.services.hybrid_cloud.integration import integration_service
 from sentry.services.hybrid_cloud.user import RpcUser
@@ -181,14 +182,19 @@ def store_issue_last_defaults(self, project: Project, user: RpcUser, data):
                     user_id=user.id, value=new_user_defaults, **user_option_key
                 )
 
-    def get_defaults(self, project, user):
+    def get_defaults(self, project: Project, user: User):
         project_defaults = self.get_project_defaults(project.id)
 
-        user_option_key = dict(user=user, key="issue:defaults", project=project)
-        user_defaults = UserOption.objects.get_value(default={}, **user_option_key).get(
-            self.model.provider, {}
+        user_option_value = get_option_from_list(
+            user_option_service.get_many(
+                filter={"user_ids": [user.id], "keys": ["issue:defaults"], "project_id": project.id}
+            ),
+            key="issue:defaults",
+            default={},
         )
 
+        user_defaults = user_option_value.get(self.model.provider, {})
+
         defaults = {}
         defaults.update(project_defaults)
         defaults.update(user_defaults)

tests/sentry/integrations/test_issues.py

@@ -105,7 +105,7 @@ def test_status_sync_inbound_unresolve(self):
             assert Group.objects.get(id=group.id).status == GroupStatus.UNRESOLVED
 
 
-@region_silo_test
+@region_silo_test(stable=True)
 class IssueDefaultTest(TestCase):
     def setUp(self):
         self.group.status = GroupStatus.RESOLVED