chore(jira): type jira integration.py (#89803)

Author: Christinarlong

pyproject.toml

@@ -130,7 +130,6 @@ module = [
     "sentry.integrations.github.client",
     "sentry.integrations.github.integration",
     "sentry.integrations.gitlab.issues",
-    "sentry.integrations.jira.integration",
     "sentry.integrations.pagerduty.actions.form",
     "sentry.integrations.pipeline",
     "sentry.integrations.slack.message_builder.notifications.issues",

src/sentry/integrations/jira/client.py

@@ -7,6 +7,7 @@
 from requests import PreparedRequest
 
 from sentry.integrations.client import ApiClient
+from sentry.integrations.models.integration import Integration
 from sentry.integrations.services.integration.model import RpcIntegration
 from sentry.integrations.utils.atlassian_connect import get_query_hash
 from sentry.shared_integrations.exceptions import ApiError
@@ -51,7 +52,7 @@ class JiraCloudClient(ApiClient):
 
     def __init__(
         self,
-        integration: RpcIntegration,
+        integration: RpcIntegration | Integration,
         verify_ssl: bool,
         logging_context: Any | None = None,
     ):

src/sentry/integrations/jira/integration.py

@@ -8,6 +8,7 @@
 
 import sentry_sdk
 from django.conf import settings
+from django.db.models import QuerySet
 from django.urls import reverse
 from django.utils.functional import classproperty
 from django.utils.translation import gettext as _
@@ -42,6 +43,7 @@
     IntegrationInstallationConfigurationError,
 )
 from sentry.silo.base import all_silo_function
+from sentry.users.models.user import User
 from sentry.users.services.user import RpcUser
 from sentry.users.services.user.service import user_service
 from sentry.utils.strings import truncatechars
@@ -162,6 +164,7 @@ def get_organization_config(self) -> list[dict[str, Any]]:
         context = organization_service.get_organization_by_id(
             id=self.organization_id, include_projects=False, include_teams=False
         )
+        assert context, "organizationcontext must exist to get org"
         organization = context.organization
 
         has_issue_sync = features.has("organizations:integrations-issue-sync", organization)
@@ -366,7 +369,7 @@ def update_organization_config(self, data):
         if org_integration is not None:
             self.org_integration = org_integration
 
-    def _filter_active_projects(self, project_mappings: Sequence[IntegrationExternalProject]):
+    def _filter_active_projects(self, project_mappings: QuerySet[IntegrationExternalProject]):
         project_ids_set = {p["id"] for p in self.get_client().get_projects_list()}
 
         return [pm for pm in project_mappings if pm.external_id in project_ids_set]
@@ -403,16 +406,19 @@ def sync_metadata(self):
         except ApiError as e:
             raise IntegrationError(self.message_from_error(e))
 
-        self.model.name = server_info["serverTitle"]
+        metadata = self.model.metadata.copy()
+        name = server_info["serverTitle"]
 
         # There is no Jira instance icon (there is a favicon, but it doesn't seem
         # possible to query that with the API). So instead we just use the first
         # project Icon.
         if len(projects) > 0:
             avatar = projects[0]["avatarUrls"]["48x48"]
-            self.model.metadata.update({"icon": avatar})
+            metadata.update({"icon": avatar})
 
-        self.model.save()
+        integration_service.update_integration(
+            integration_id=self.model.id, name=name, metadata=metadata
+        )
 
     def get_link_issue_config(self, group, **kwargs):
         fields = super().get_link_issue_config(group, **kwargs)
@@ -528,7 +534,9 @@ def create_comment(self, issue_id, user_id, group_note):
 
     def create_comment_attribution(self, user_id, comment_text):
         user = user_service.get_user(user_id=user_id)
-        attribution = f"{user.name} wrote:\n\n"
+        username = "Unknown User" if user is None else user.name
+
+        attribution = f"{username} wrote:\n\n"
         return f"{attribution}{{quote}}{comment_text}{{quote}}"
 
     def update_comment(self, issue_id, user_id, group_note):
@@ -639,14 +647,7 @@ def build_dynamic_field(self, field_meta, group=None):
             or schema["type"] == "issuelink"
         ):
             fieldtype = "select"
-            organization = (
-                group.organization
-                if group
-                else organization_service.get_organization_by_id(
-                    id=self.organization_id, include_projects=False, include_teams=False
-                ).organization
-            )
-            fkwargs["url"] = self.search_url(organization.slug)
+            fkwargs["url"] = self.search_url(self.organization.slug)
             fkwargs["choices"] = []
         elif schema["type"] in ["timetracking"]:
             # TODO: Implement timetracking (currently unsupported altogether)
@@ -761,7 +762,7 @@ def fetch_issue_create_meta(self, client, project_id):
         return meta
 
     @all_silo_function
-    def get_create_issue_config(self, group: Group | None, user: RpcUser, **kwargs):
+    def get_create_issue_config(self, group: Group | None, user: RpcUser | User, **kwargs):
         """
         We use the `group` to get three things: organization_slug, project
         defaults, and default title and description. In the case where we're