Improve APIs for creating/updating direct paging integrations #2603
Conversation
This file contains 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
vstpme
commented
Jul 20, 2023
Comment on lines
+158
to
+163
| @staticmethod | ||
| def validate_integration(integration): | ||
| if integration is None or integration not in AlertReceiveChannel.WEB_INTEGRATION_CHOICES: | ||
| raise BadRequest(detail="invalid integration") | ||
| return integration | ||
|
|
Comment on lines
-110
to
-120
| team_lookup = {} | ||
| if "team" in request.data: | ||
| team_public_pk = request.data.get("team", None) | ||
| if team_public_pk is not None: | ||
| try: | ||
| team = user.available_teams.get(public_primary_key=team_public_pk) | ||
| team_lookup = {"team": team} | ||
| except Team.DoesNotExist: | ||
| return Response(data="invalid team", status=status.HTTP_400_BAD_REQUEST) | ||
| else: | ||
| team_lookup = {"team__isnull": True} |
There was a problem hiding this comment.
Removed this team check completely, as it seems to be excessive – only admins can create integrations, and every team is available for admins.
Comment on lines
-125
to
-138
| if request.data["integration"] == AlertReceiveChannel.INTEGRATION_DIRECT_PAGING: | ||
| try: | ||
| AlertReceiveChannel.objects.get( | ||
| organization=organization, | ||
| integration=AlertReceiveChannel.INTEGRATION_DIRECT_PAGING, | ||
| deleted_at=None, | ||
| **team_lookup, | ||
| ) | ||
| return Response( | ||
| data="Direct paging integration already exists for this team", | ||
| status=status.HTTP_400_BAD_REQUEST, | ||
| ) | ||
| except AlertReceiveChannel.DoesNotExist: | ||
| pass |
There was a problem hiding this comment.
This check is now performed in the appropriate serializer.
vstpme
commented
Jul 20, 2023
Comment on lines
128
to
135
| try: | ||
| instance = AlertReceiveChannel.create( | ||
| **validated_data, | ||
| author=self.context["request"].user, | ||
| organization=organization, | ||
| ) | ||
| except AlertReceiveChannel.DuplicateDirectPaging: | ||
| raise DuplicateDirectPagingBadRequest |
There was a problem hiding this comment.
Making sure that direct paging integrations are unique per team in public API.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What this PR does
Checklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)