ref: fix some types for sentry.notifications (#72814)

<!-- Describe your PR here. -->

src/sentry/notifications/notificationcontroller.py

@@ -72,11 +72,10 @@ def __init__(
         self.type = type
         self.provider = provider
 
+        org_mapping = OrganizationMapping.objects.filter(organization_id=organization_id).first()
         org = (
-            serialize_organization_mapping(
-                OrganizationMapping.objects.filter(organization_id=organization_id).first()
-            )
-            if organization_id
+            serialize_organization_mapping(org_mapping)
+            if organization_id and org_mapping is not None
             else None
         )
         if org and features.has("organizations:team-workflow-notifications", org):
@@ -290,11 +289,12 @@ def _get_layered_setting_providers(
             )
         )
 
+        org_mapping = OrganizationMapping.objects.filter(
+            organization_id=self.organization_id
+        ).first()
         org = (
-            serialize_organization_mapping(
-                OrganizationMapping.objects.filter(organization_id=self.organization_id).first()
-            )
-            if self.organization_id
+            serialize_organization_mapping(org_mapping)
+            if self.organization_id and org_mapping is not None
             else None
         )
         has_team_workflow = org and features.has("organizations:team-workflow-notifications", org)

src/sentry/notifications/utils/__init__.py

@@ -6,7 +6,7 @@
 from collections.abc import Iterable, Mapping, MutableMapping, Sequence
 from dataclasses import dataclass
 from datetime import timedelta
-from typing import TYPE_CHECKING, Any, Optional, Union, cast
+from typing import TYPE_CHECKING, Any, Optional, TypedDict, Union, cast
 from urllib.parse import parse_qs, urlparse
 
 from django.db.models import Count
@@ -87,12 +87,17 @@ def get_group_counts_by_project(
     )
 
 
+class _RepoCommitsDict(TypedDict):
+    name: str
+    commits: list[tuple[Commit, RpcUser | None]]
+
+
 def get_repos(
     commits: Iterable[Commit],
     users_by_email: Mapping[str, RpcUser],
     organization: Organization,
-) -> Iterable[Mapping[str, str | Iterable[tuple[Commit, RpcUser | None]]]]:
-    repositories_by_id = {
+) -> list[_RepoCommitsDict]:
+    repositories_by_id: dict[int, _RepoCommitsDict] = {
         repository_id: {"name": repository_name, "commits": []}
         for repository_id, repository_name in Repository.objects.filter(
             organization_id=organization.id,

src/sentry/notifications/utils/participants.py

@@ -162,23 +162,20 @@ def get_participants_for_release(
     projects: Iterable[Project], organization: Organization, commited_user_ids: set[int]
 ) -> ParticipantMap:
     # Collect all users with verified emails on a team in the related projects.
-    user_ids = list(
-        OrganizationMember.objects.filter(
+    user_ids = [
+        user_id
+        for user_id in OrganizationMember.objects.filter(
             teams__projectteam__project__in=projects,
             user_is_active=True,
             user_id__isnull=False,
         )
         .distinct()
         .values_list("user_id", flat=True)
-    )
+        if user_id is not None
+    ]
 
     # filter those user ids by verified emails
-    user_ids = user_service.get_many_ids(
-        filter=dict(
-            user_ids=user_ids,
-            email_verified=True,
-        )
-    )
+    user_ids = user_service.get_many_ids(filter=dict(user_ids=user_ids, email_verified=True))
 
     actors = Actor.many_from_object(RpcUser(id=user_id) for user_id in user_ids)
     # don't pass in projects since the settings are scoped to the organization only for now