fix(seer): Don't override when bulk updating settings (#104918)

followup: #104912

Previously we were requiring both `enabledCodeReview` and
`codeReviewTriggers` when bulk updating. Here we allow either or both,
and don't override if a field isn't present.

Author: srest2021

src/sentry/integrations/api/endpoints/organization_repository_settings.py

@@ -21,21 +21,19 @@ class RepositorySettingsSerializer(serializers.Serializer):
         help_text="List of repository IDs to update settings for. Maximum 1000 repositories.",
     )
     enabledCodeReview = serializers.BooleanField(
-        required=True,
+        required=False,
         help_text="Whether code review is enabled for these repositories",
     )
     codeReviewTriggers = serializers.ListField(
         child=serializers.ChoiceField(choices=[trigger.value for trigger in CodeReviewTrigger]),
-        required=True,
+        required=False,
         help_text="List of triggers for code review",
     )
 
     def validate(self, data):
-        if data.get("enabledCodeReview") and not data.get("codeReviewTriggers"):
+        if "enabledCodeReview" not in data and "codeReviewTriggers" not in data:
             raise serializers.ValidationError(
-                {
-                    "codeReviewTriggers": "At least one trigger is required when code review is enabled."
-                }
+                "At least one of 'enabledCodeReview' or 'codeReviewTriggers' must be provided."
             )
         return data
 
@@ -64,39 +62,55 @@ def put(self, request: Request, organization: Organization) -> Response:
 
         data = serializer.validated_data
         repository_ids = data["repositoryIds"]
-        enabled_code_review = data["enabledCodeReview"]
-        code_review_triggers = data["codeReviewTriggers"]
 
-        repositories = Repository.objects.filter(
-            id__in=repository_ids,
-            organization_id=organization.id,
+        updated_enabled_code_review = data.get("enabledCodeReview")
+        updated_code_review_triggers = data.get("codeReviewTriggers")
+
+        update_fields = []
+        if updated_enabled_code_review is not None:
+            update_fields.append("enabled_code_review")
+        if updated_code_review_triggers is not None:
+            update_fields.append("code_review_triggers")
+
+        repositories = list(
+            Repository.objects.filter(
+                id__in=repository_ids,
+                organization_id=organization.id,
+            )
         )
 
-        if repositories.count() != len(repository_ids):
+        if len(repositories) != len(repository_ids):
             return Response(
                 {"detail": "One or more repositories were not found in this organization."},
                 status=400,
             )
 
-        settings_to_upsert = [
-            RepositorySettings(
-                repository=repo,
-                enabled_code_review=enabled_code_review,
-                code_review_triggers=code_review_triggers,
-            )
-            for repo in repositories
-        ]
+        existing_settings = {
+            setting.repository_id: setting
+            for setting in RepositorySettings.objects.filter(repository_id__in=repository_ids)
+        }
+
+        settings_to_upsert = []
+        for repo in repositories:
+            setting = existing_settings.get(repo.id) or RepositorySettings(repository=repo)
+
+            if updated_enabled_code_review is not None:
+                setting.enabled_code_review = updated_enabled_code_review
+            if updated_code_review_triggers is not None:
+                setting.code_review_triggers = updated_code_review_triggers
+
+            settings_to_upsert.append(setting)
 
         RepositorySettings.objects.bulk_create(
             settings_to_upsert,
             update_conflicts=True,
             unique_fields=["repository"],
-            update_fields=["enabled_code_review", "code_review_triggers"],
+            update_fields=update_fields,
         )
 
         return Response(
             serialize(
-                list(repositories),
+                repositories,
                 request.user,
                 RepositorySerializer(expand=["settings"]),
             ),

tests/sentry/integrations/api/endpoints/test_organization_repository_settings.py

@@ -135,52 +135,146 @@ def test_missing_required_fields(self) -> None:
         )
 
         assert response.status_code == 400, response.content
-        assert "enabledCodeReview" in response.data
-        assert "codeReviewTriggers" in response.data
+        assert (
+            "At least one of 'enabledCodeReview' or 'codeReviewTriggers' must be provided."
+            in response.data["non_field_errors"]
+        )
 
-    def test_enabled_code_review_requires_triggers(self) -> None:
+    def test_partial_repository_ids_not_found(self) -> None:
         repo = Repository.objects.create(name="repo", organization_id=self.org.id)
 
         response = self.client.put(
             self.url,
             data={
-                "repositoryIds": [repo.id],
-                "enabledCodeReview": True,
+                "repositoryIds": [repo.id, 99999],
+                "enabledCodeReview": False,
                 "codeReviewTriggers": [],
             },
             format="json",
         )
 
         assert response.status_code == 400, response.content
-        assert "codeReviewTriggers" in response.data
+        assert "not found" in response.data["detail"]
 
-    def test_disabled_code_review_allows_empty_triggers(self) -> None:
-        repo = Repository.objects.create(name="repo", organization_id=self.org.id)
+    def test_partial_bulk_update_enabled_code_review_preserves_triggers(self) -> None:
+        repo1 = Repository.objects.create(name="repo1", organization_id=self.org.id)
+        repo2 = Repository.objects.create(name="repo2", organization_id=self.org.id)
+
+        self.create_repository_settings(
+            repository=repo1,
+            enabled_code_review=False,
+            code_review_triggers=[
+                CodeReviewTrigger.ON_COMMAND_PHRASE,
+                CodeReviewTrigger.ON_NEW_COMMIT,
+            ],
+        )
+        self.create_repository_settings(
+            repository=repo2,
+            enabled_code_review=False,
+            code_review_triggers=[],
+        )
 
         response = self.client.put(
             self.url,
             data={
-                "repositoryIds": [repo.id],
-                "enabledCodeReview": False,
-                "codeReviewTriggers": [],
+                "repositoryIds": [repo1.id, repo2.id],
+                "enabledCodeReview": True,
             },
             format="json",
         )
 
         assert response.status_code == 200, response.content
 
-    def test_partial_repository_ids_not_found(self) -> None:
-        repo = Repository.objects.create(name="repo", organization_id=self.org.id)
+        settings1 = RepositorySettings.objects.get(repository=repo1)
+        assert settings1.enabled_code_review is True
+        assert settings1.code_review_triggers == ["on_command_phrase", "on_new_commit"]
+
+        settings2 = RepositorySettings.objects.get(repository=repo2)
+        assert settings2.enabled_code_review is True
+        assert settings2.code_review_triggers == []
+
+    def test_partial_bulk_update_code_review_triggers_preserves_enabled(self) -> None:
+        repo1 = Repository.objects.create(name="repo1", organization_id=self.org.id)
+        repo2 = Repository.objects.create(name="repo2", organization_id=self.org.id)
+
+        self.create_repository_settings(
+            repository=repo1,
+            enabled_code_review=True,
+            code_review_triggers=[CodeReviewTrigger.ON_COMMAND_PHRASE],
+        )
+        self.create_repository_settings(
+            repository=repo2,
+            enabled_code_review=False,
+            code_review_triggers=[],
+        )
 
         response = self.client.put(
             self.url,
             data={
-                "repositoryIds": [repo.id, 99999],
-                "enabledCodeReview": False,
-                "codeReviewTriggers": [],
+                "repositoryIds": [repo1.id, repo2.id],
+                "codeReviewTriggers": [
+                    CodeReviewTrigger.ON_NEW_COMMIT,
+                    CodeReviewTrigger.ON_READY_FOR_REVIEW,
+                ],
             },
             format="json",
         )
 
-        assert response.status_code == 400, response.content
-        assert "not found" in response.data["detail"]
+        assert response.status_code == 200, response.content
+
+        settings1 = RepositorySettings.objects.get(repository=repo1)
+        assert settings1.enabled_code_review is True
+        assert settings1.code_review_triggers == ["on_new_commit", "on_ready_for_review"]
+
+        settings2 = RepositorySettings.objects.get(repository=repo2)
+        assert settings2.enabled_code_review is False
+        assert settings2.code_review_triggers == ["on_new_commit", "on_ready_for_review"]
+
+    def test_partial_bulk_create_enabled_code_review_uses_default(self) -> None:
+        repo1 = Repository.objects.create(name="repo1", organization_id=self.org.id)
+        repo2 = Repository.objects.create(name="repo2", organization_id=self.org.id)
+
+        response = self.client.put(
+            self.url,
+            data={
+                "repositoryIds": [repo1.id, repo2.id],
+                "enabledCodeReview": True,
+            },
+            format="json",
+        )
+
+        assert response.status_code == 200, response.content
+
+        settings1 = RepositorySettings.objects.get(repository=repo1)
+        assert settings1.enabled_code_review is True
+        assert settings1.code_review_triggers == []
+
+        settings2 = RepositorySettings.objects.get(repository=repo2)
+        assert settings2.enabled_code_review is True
+        assert settings2.code_review_triggers == []
+
+    def test_partial_bulk_create_code_review_triggers_uses_default(self) -> None:
+        repo1 = Repository.objects.create(name="repo1", organization_id=self.org.id)
+        repo2 = Repository.objects.create(name="repo2", organization_id=self.org.id)
+
+        response = self.client.put(
+            self.url,
+            data={
+                "repositoryIds": [repo1.id, repo2.id],
+                "codeReviewTriggers": [
+                    CodeReviewTrigger.ON_NEW_COMMIT,
+                    CodeReviewTrigger.ON_READY_FOR_REVIEW,
+                ],
+            },
+            format="json",
+        )
+
+        assert response.status_code == 200, response.content
+
+        settings1 = RepositorySettings.objects.get(repository=repo1)
+        assert settings1.enabled_code_review is False
+        assert settings1.code_review_triggers == ["on_new_commit", "on_ready_for_review"]
+
+        settings2 = RepositorySettings.objects.get(repository=repo2)
+        assert settings2.enabled_code_review is False
+        assert settings2.code_review_triggers == ["on_new_commit", "on_ready_for_review"]