tests

Author: shruthilayaj

src/sentry/tasks/seer/context_engine_index.py

@@ -259,7 +259,7 @@ def index_repos(organization_id: int, *args, **kwargs) -> None:
     preferences_by_id = bulk_get_project_preferences(organization_id, list(project_map.keys()))
 
     for project_id, project in project_map.items():
-        existing_pref = preferences_by_id.get(str(project_id))
+        existing_pref = preferences_by_id.get(str(project_id), {})
         project_pref_repos = existing_pref.get("repositories") or []
         autofix_repos = get_autofix_repos_from_project_code_mappings(project_map[project_id])
 

tests/sentry/tasks/seer/test_context_engine_index.py

@@ -253,35 +253,48 @@ def setUp(self) -> None:
             organization_integration=self.org_integration,
         )
 
+    @mock.patch("sentry.tasks.seer.context_engine_index.bulk_get_project_preferences")
     @mock.patch("sentry.tasks.seer.context_engine_index.make_org_repo_knowledge_index_request")
-    def test_returns_early_when_option_disabled(self, mock_request) -> None:
+    def test_returns_early_when_option_disabled(
+        self, mock_make_org_repo_knowledge_index_request, mock_bulk_get_project_preferences
+    ) -> None:
         with override_options({"explorer.context_engine_indexing.enable": False}):
             index_repos(self.org.id)
-        mock_request.assert_not_called()
+        mock_make_org_repo_knowledge_index_request.assert_not_called()
 
+    @mock.patch("sentry.tasks.seer.context_engine_index.bulk_get_project_preferences")
     @mock.patch("sentry.tasks.seer.context_engine_index.make_org_repo_knowledge_index_request")
-    def test_returns_early_when_feature_flag_disabled(self, mock_request) -> None:
+    def test_returns_early_when_feature_flag_disabled(
+        self, mock_mock_make_org_repo_knowledge_index_request, mock_bulk_get_project_preferences
+    ) -> None:
         with override_options({"explorer.context_engine_indexing.enable": True}):
             index_repos(self.org.id)
-        mock_request.assert_not_called()
+        mock_mock_make_org_repo_knowledge_index_request.assert_not_called()
 
+    @mock.patch("sentry.tasks.seer.context_engine_index.bulk_get_project_preferences")
     @mock.patch("sentry.tasks.seer.context_engine_index.make_org_repo_knowledge_index_request")
-    def test_returns_early_when_no_projects(self, mock_request) -> None:
+    def test_returns_early_when_no_projects(
+        self, mock_mock_make_org_repo_knowledge_index_request, mock_bulk_get_project_preferences
+    ) -> None:
         org_without_projects = self.create_organization()
         with override_options({"explorer.context_engine_indexing.enable": True}):
             with self.feature({"organizations:context-engine-experiments": True}):
                 index_repos(org_without_projects.id)
-        mock_request.assert_not_called()
+        mock_mock_make_org_repo_knowledge_index_request.assert_not_called()
 
+    @mock.patch("sentry.tasks.seer.context_engine_index.bulk_get_project_preferences")
     @mock.patch("sentry.tasks.seer.context_engine_index.make_org_repo_knowledge_index_request")
-    def test_calls_seer_with_correct_org_and_repos(self, mock_request) -> None:
-        mock_request.return_value.status = 200
+    def test_calls_seer_with_correct_org_and_repos(
+        self, mock_mock_make_org_repo_knowledge_index_request, mock_bulk_get_project_preferences
+    ) -> None:
+        mock_bulk_get_project_preferences.return_value = {}
+        mock_mock_make_org_repo_knowledge_index_request.return_value.status = 200
         with override_options({"explorer.context_engine_indexing.enable": True}):
             with self.feature({"organizations:context-engine-experiments": True}):
                 index_repos(self.org.id)
 
-        mock_request.assert_called_once()
-        body = mock_request.call_args[0][0]
+        mock_mock_make_org_repo_knowledge_index_request.assert_called_once()
+        body = mock_mock_make_org_repo_knowledge_index_request.call_args[0][0]
         assert body["org_id"] == self.org.id
         repos = body["repos"]
         assert len(repos) == 2
@@ -303,9 +316,13 @@ def test_calls_seer_with_correct_org_and_repos(self, mock_request) -> None:
         assert relay_repo["project_ids"] == [self.project2.id]
         assert relay_repo["integration_id"] == str(self.integration.id)
 
+    @mock.patch("sentry.tasks.seer.context_engine_index.bulk_get_project_preferences")
     @mock.patch("sentry.tasks.seer.context_engine_index.make_org_repo_knowledge_index_request")
-    def test_deduplicates_repos_across_projects(self, mock_request) -> None:
-        mock_request.return_value.status = 200
+    def test_deduplicates_repos_across_projects(
+        self, mock_mock_make_org_repo_knowledge_index_request, mock_bulk_get_project_preferences
+    ) -> None:
+        mock_bulk_get_project_preferences.return_value = {}
+        mock_mock_make_org_repo_knowledge_index_request.return_value.status = 200
         # Map project2 to the same repo as project1
         self.create_code_mapping(
             project=self.project2,
@@ -319,14 +336,58 @@ def test_deduplicates_repos_across_projects(self, mock_request) -> None:
             with self.feature({"organizations:context-engine-experiments": True}):
                 index_repos(self.org.id)
 
-        mock_request.assert_called_once()
-        body = mock_request.call_args[0][0]
+        mock_mock_make_org_repo_knowledge_index_request.assert_called_once()
+        body = mock_mock_make_org_repo_knowledge_index_request.call_args[0][0]
         repos = body["repos"]
         repos_by_name = {r["name"]: r for r in repos}
 
         sentry_repo = repos_by_name["sentry"]
         assert sorted(sentry_repo["project_ids"]) == sorted([self.project1.id, self.project2.id])
 
+    @mock.patch("sentry.tasks.seer.context_engine_index.bulk_get_project_preferences")
+    @mock.patch("sentry.tasks.seer.context_engine_index.make_org_repo_knowledge_index_request")
+    def test_uses_seer_project_preferences_if_available(
+        self, mock_mock_make_org_repo_knowledge_index_request, mock_bulk_get_project_preferences
+    ) -> None:
+        mock_mock_make_org_repo_knowledge_index_request.return_value.status = 200
+        # Map project2 to the same repo as project1
+        self.create_code_mapping(
+            project=self.project2,
+            repo=self.repo1,
+            organization_integration=self.org_integration,
+            stack_root="src/",
+            source_root="src/",
+        )
+
+        mock_bulk_get_project_preferences.return_value = {
+            str(self.project1.id): {
+                "repositories": [
+                    {
+                        "name": "sentry-seer",
+                        "owner": "getsentry",
+                        "provider": "integrations:github",
+                        "external_id": "999",
+                        "integration_id": "000",
+                    }
+                ],
+            },
+            str(self.project2.id): {
+                "repositories": None,
+            },
+        }
+
+        with override_options({"explorer.context_engine_indexing.enable": True}):
+            with self.feature({"organizations:context-engine-experiments": True}):
+                index_repos(self.org.id)
+
+        mock_mock_make_org_repo_knowledge_index_request.assert_called_once()
+        body = mock_mock_make_org_repo_knowledge_index_request.call_args[0][0]
+        repos = body["repos"]
+        repos_by_name = {r["name"]: r for r in repos}
+
+        sentry_repo = repos_by_name["sentry-seer"]
+        assert sorted(sentry_repo["project_ids"]) == sorted([self.project1.id])
+
 
 @django_db_all
 class TestScheduleContextEngineIndexingTasks(TestCase):