Pr 101615 #101658
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,15 @@ | ||
| from typing import Any, NotRequired, TypedDict | ||
|
|
||
| from drf_spectacular.utils import extend_schema_serializer | ||
| from rest_framework import serializers | ||
|
|
||
| from sentry import features | ||
| from sentry.api.helpers.group_index.validators.in_commit import InCommitResult, InCommitValidator | ||
| from sentry.models.release import Release | ||
|
|
||
|
|
||
| class StatusDetailsResult(TypedDict): | ||
| inFutureRelease: NotRequired[bool] | ||
| inNextRelease: NotRequired[bool] | ||
| inRelease: NotRequired[str] | ||
| inCommit: NotRequired[InCommitResult] | ||
|
|
@@ -20,6 +22,12 @@ class StatusDetailsResult(TypedDict): | |
|
|
||
| @extend_schema_serializer() | ||
| class StatusDetailsValidator(serializers.Serializer[StatusDetailsResult]): | ||
| inFutureRelease = serializers.CharField( | ||
| help_text=( | ||
| "The version of the semver release that the issue should be resolved in." | ||
| "This release can be a future release that doesn't exist yet." | ||
| ) | ||
| ) | ||
| inNextRelease = serializers.BooleanField( | ||
| help_text="If true, marks the issue as resolved in the next release." | ||
| ) | ||
|
|
@@ -87,3 +95,56 @@ def validate_inNextRelease(self, value: bool) -> "Release": | |
| raise serializers.ValidationError( | ||
| "No release data present in the system to form a basis for 'Next Release'" | ||
| ) | ||
|
|
||
| def validate_inFutureRelease(self, value: str) -> "Release | None": | ||
| project = self.context["project"] | ||
|
|
||
| if not features.has("organizations:resolve-in-future-release", project.organization): | ||
| raise serializers.ValidationError( | ||
| "Your organization does not have access to this feature." | ||
| ) | ||
|
|
||
| if not Release.is_valid_version(value): | ||
| raise serializers.ValidationError( | ||
| "Invalid release version format. Please use semver format: [email protected][-prerelease][+build]." | ||
| ) | ||
|
|
||
| try: | ||
| # release doesn't have to be semver if it exists | ||
| # because we'll just use the resolveInRelease logic | ||
| release = Release.objects.get( | ||
| projects=project, organization_id=project.organization_id, version=value | ||
| ) | ||
| except Release.DoesNotExist: | ||
| # release must be semver if it doesn't exist | ||
| if not Release.is_semver_version(value): | ||
| raise serializers.ValidationError( | ||
| "Invalid semver format. Please use format: [email protected][-prerelease][+build]" | ||
| ) | ||
| release = None | ||
|
|
||
| return release | ||
|
|
||
| def validate(self, attrs: dict[str, Any]) -> dict[str, Any]: | ||
| """ | ||
| Cross-field validation hook called by DRF after individual field validation. | ||
| """ | ||
| return self._preserve_future_release_version(attrs) | ||
|
|
||
| def _preserve_future_release_version(self, attrs: dict[str, Any]) -> dict[str, Any]: | ||
| """ | ||
| Store the original future release version string for inFutureRelease since the validator | ||
| transforms it to a Release object or None, but we need the version string for | ||
| process_group_resolution. | ||
| """ | ||
| if "inFutureRelease" in attrs: | ||
| initial_data = getattr(self, "initial_data", {}) | ||
| # If this is a nested serializer, try to get the data from the parent's initial_data | ||
| if not initial_data and hasattr(self, "parent"): | ||
| parent_initial_data = getattr(self.parent, "initial_data", {}) | ||
| initial_data = parent_initial_data.get("statusDetails", {}) | ||
|
|
||
| future_release_version = initial_data.get("inFutureRelease") | ||
| if future_release_version: | ||
| attrs["_future_release_version"] = future_release_version | ||
| return attrs | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bug: Null Release Causes Database Constraint Violation
Resolving an issue as
resolvedInFutureReleasecan lead to a database constraint violation. If no releases exist for the project,get_release_to_resolve_by()returnsNone, which is then used for the non-nullablereleaseforeign key when creating aGroupResolutionobject.