raise project dne for wrong org id or no project

Author: srest2021

src/sentry/seer/endpoints/seer_rpc.py

@@ -864,10 +864,14 @@ def check_repository_integrations_status(*, repository_integrations: list[dict[s
 
 
 def get_project_preferences(*, organization_id: int, project_id: int) -> dict | None:
-    try:
-        project = Project.objects.get(id=project_id, organization_id=organization_id)
-    except Project.DoesNotExist:
-        return None
+    """Get Seer project preferences for a single project from Sentry DB.
+
+    Raises Project.DoesNotExist if the project is not found or doesn't belong to the org.
+    Returns None if the project has no configured preferences.
+    """
+    project = Project.objects.get_from_cache(id=project_id)
+    if project.organization_id != organization_id:
+        raise Project.DoesNotExist
 
     preference = read_preference_from_sentry_db(project)
     if preference is None:
@@ -876,6 +880,11 @@ def get_project_preferences(*, organization_id: int, project_id: int) -> dict |
 
 
 def bulk_get_project_preferences(*, organization_id: int, project_ids: list[int]) -> dict:
+    """Bulk get Seer project preferences from Sentry DB.
+
+    Returns a dict keyed by stringified project ID. Values are preference dicts or None
+    for projects with no configured preferences.
+    """
     preferences = bulk_read_preferences_from_sentry_db(organization_id, project_ids)
     return {
         str(project_id): preference.dict() if preference else None

tests/sentry/seer/endpoints/test_seer_rpc.py

@@ -14,6 +14,7 @@
 from sentry.constants import ObjectStatus
 from sentry.integrations.models.integration import Integration
 from sentry.integrations.models.repository_project_path_config import RepositoryProjectPathConfig
+from sentry.models.project import Project
 from sentry.models.repository import Repository
 from sentry.seer.endpoints.seer_rpc import (
     bulk_get_project_preferences,
@@ -1509,12 +1510,21 @@ def test_get_project_preferences_returns_none_when_no_preference(self, mock_read
         )
         assert result is None
 
-    def test_get_project_preferences_returns_none_for_nonexistent_project(self) -> None:
-        result = get_project_preferences(
-            organization_id=self.organization.id,
-            project_id=999999,
-        )
-        assert result is None
+    def test_get_project_preferences_raises_for_nonexistent_project(self) -> None:
+        with pytest.raises(Project.DoesNotExist):
+            get_project_preferences(
+                organization_id=self.organization.id,
+                project_id=999999,
+            )
+
+    def test_get_project_preferences_raises_for_wrong_org(self) -> None:
+        project = self.create_project(organization=self.organization)
+        other_org = self.create_organization(owner=self.user)
+        with pytest.raises(Project.DoesNotExist):
+            get_project_preferences(
+                organization_id=other_org.id,
+                project_id=project.id,
+            )
 
     @patch("sentry.seer.endpoints.seer_rpc.bulk_read_preferences_from_sentry_db")
     def test_bulk_get_project_preferences_returns_preferences(self, mock_bulk_read: Any) -> None: