also call bulk endpoint

Author: srest2021

src/sentry/integrations/services/repository/impl.py

@@ -132,13 +132,14 @@ def disable_repositories_for_integration(
         self, *, organization_id: int, integration_id: int, provider: str
     ) -> None:
         with transaction.atomic(router.db_for_write(Repository)):
-            repo_ids = list(
+            repos = list(
                 Repository.objects.filter(
                     organization_id=organization_id,
                     integration_id=integration_id,
                     provider=provider,
-                ).values_list("id", flat=True)
+                ).values_list("id", "external_id", "provider")
             )
+            repo_ids = [repo_id for repo_id, _, _ in repos]
 
             if repo_ids:
                 Repository.objects.filter(id__in=repo_ids).update(status=ObjectStatus.DISABLED)
@@ -150,6 +151,19 @@ def disable_repositories_for_integration(
                 except Organization.DoesNotExist:
                     pass
 
+        repos_to_clean = [
+            {"repo_external_id": external_id, "repo_provider": repo_provider}
+            for _, external_id, repo_provider in repos
+            if external_id and repo_provider
+        ]
+        if repos_to_clean:
+            bulk_cleanup_seer_repository_preferences.apply_async(
+                kwargs={
+                    "organization_id": organization_id,
+                    "repos": repos_to_clean,
+                }
+            )
+
     def disable_repositories_by_external_ids(
         self,
         *,
@@ -159,15 +173,16 @@ def disable_repositories_by_external_ids(
         external_ids: list[str],
     ) -> None:
         with transaction.atomic(router.db_for_write(Repository)):
-            repo_ids = list(
+            repos = list(
                 Repository.objects.filter(
                     organization_id=organization_id,
                     integration_id=integration_id,
                     provider=provider,
                     external_id__in=external_ids,
                     status=ObjectStatus.ACTIVE,
-                ).values_list("id", flat=True)
+                ).values_list("id", "external_id", "provider")
             )
+            repo_ids = [repo_id for repo_id, _, _ in repos]
 
             if repo_ids:
                 Repository.objects.filter(id__in=repo_ids).update(status=ObjectStatus.DISABLED)
@@ -179,6 +194,19 @@ def disable_repositories_by_external_ids(
                 except Organization.DoesNotExist:
                     pass
 
+        repos_to_clean = [
+            {"repo_external_id": external_id, "repo_provider": repo_provider}
+            for _, external_id, repo_provider in repos
+            if external_id and repo_provider
+        ]
+        if repos_to_clean:
+            bulk_cleanup_seer_repository_preferences.apply_async(
+                kwargs={
+                    "organization_id": organization_id,
+                    "repos": repos_to_clean,
+                }
+            )
+
     def disassociate_organization_integration(
         self,
         *,

tests/sentry/integrations/services/repository/test_impl.py

@@ -1,3 +1,5 @@
+from unittest.mock import patch
+
 from sentry.constants import ObjectStatus
 from sentry.integrations.services.repository.service import repository_service
 from sentry.models.repository import Repository
@@ -164,7 +166,8 @@ def test_empty_external_ids_is_noop(self) -> None:
         assert repo.status == ObjectStatus.ACTIVE
 
     @with_feature("organizations:seer-project-settings-dual-write")
-    def test_deletes_seer_project_repository_rows(self) -> None:
+    @patch("sentry.integrations.services.repository.impl.bulk_cleanup_seer_repository_preferences")
+    def test_cleans_up_seer_preferences(self, mock_cleanup) -> None:
         project = self.create_project(organization=self.organization)
         repo = Repository.objects.create(
             organization_id=self.organization.id,
@@ -183,9 +186,13 @@ def test_deletes_seer_project_repository_rows(self) -> None:
             external_ids=["100"],
         )
 
-        repo.refresh_from_db()
-        assert repo.status == ObjectStatus.DISABLED
         assert not SeerProjectRepository.objects.filter(repository_id=repo.id).exists()
+        mock_cleanup.apply_async.assert_called_once_with(
+            kwargs={
+                "organization_id": self.organization.id,
+                "repos": [{"repo_external_id": "100", "repo_provider": self.provider}],
+            }
+        )
 
 
 @cell_silo_test
@@ -198,7 +205,7 @@ def setUp(self) -> None:
         )
         self.provider = "integrations:github"
 
-    def test_disables_all_repos_for_integration(self) -> None:
+    def test_disables_matching_active_repos(self) -> None:
         repo = Repository.objects.create(
             organization_id=self.organization.id,
             name="getsentry/sentry",
@@ -218,7 +225,8 @@ def test_disables_all_repos_for_integration(self) -> None:
         assert repo.status == ObjectStatus.DISABLED
 
     @with_feature("organizations:seer-project-settings-dual-write")
-    def test_deletes_seer_project_repository_rows(self) -> None:
+    @patch("sentry.integrations.services.repository.impl.bulk_cleanup_seer_repository_preferences")
+    def test_cleans_up_seer_preferences(self, mock_cleanup) -> None:
         project = self.create_project(organization=self.organization)
         repo = Repository.objects.create(
             organization_id=self.organization.id,
@@ -236,6 +244,10 @@ def test_deletes_seer_project_repository_rows(self) -> None:
             provider=self.provider,
         )
 
-        repo.refresh_from_db()
-        assert repo.status == ObjectStatus.DISABLED
         assert not SeerProjectRepository.objects.filter(repository_id=repo.id).exists()
+        mock_cleanup.apply_async.assert_called_once_with(
+            kwargs={
+                "organization_id": self.organization.id,
+                "repos": [{"repo_external_id": "100", "repo_provider": self.provider}],
+            }
+        )