fix PUT /api/v1/escalation_policies/<id> issue related to updating from_time and to_time #3581
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
issue related to updating from_time and to_time
joeyorlando
added
the
pr:no public docs
joeyorlando
commented
Dec 19, 2023
Comment on lines
-105
to
-123
| class CustomTimeField(fields.TimeField): | ||
| def to_representation(self, value): | ||
| result = super().to_representation(value) | ||
| if result[-1] != "Z": | ||
| result += "Z" | ||
| return result | ||
|
|
||
| def to_internal_value(self, data): | ||
| TIME_FORMAT_LEN = len("00:00:00Z") | ||
| if len(data) == TIME_FORMAT_LEN: | ||
| try: | ||
| time.strptime(data, "%H:%M:%SZ") | ||
| except ValueError: | ||
| raise BadRequest(detail="Invalid time format, should be '00:00:00Z'") | ||
| else: | ||
| raise BadRequest(detail="Invalid time format, should be '00:00:00Z'") | ||
| return data | ||
|
|
||
|
|
There was a problem hiding this comment.
this is only used by EscalationPolicySerializer
| raise BadRequest(detail="Invalid time format, should be '00:00:00Z'") | ||
| else: | ||
| raise BadRequest(detail="Invalid time format, should be '00:00:00Z'") | ||
| return data |
There was a problem hiding this comment.
returning a str is the main issue here. If you look at fields.TimeField it returns a time.time object (which solves the issue seen in the stack trace).
Additionally, we don't need to subclass fields.TimeField just to validate the time format, we can use the format and input_format kwargs instead.
…:grafana/oncall into jorlando/fix-put-escalation-policies-bug
joeyorlando
commented
Dec 19, 2023
Comment on lines
-81
to
+87
| notify_if_time_from = CustomTimeField(required=False, source="from_time") | ||
| notify_if_time_to = CustomTimeField(required=False, source="to_time") | ||
|
|
||
| TIME_FORMAT = "%H:%M:%SZ" | ||
| notify_if_time_from = serializers.TimeField( | ||
| required=False, source="from_time", format=TIME_FORMAT, input_formats=[TIME_FORMAT] | ||
| ) | ||
| notify_if_time_to = serializers.TimeField( | ||
| required=False, source="to_time", format=TIME_FORMAT, input_formats=[TIME_FORMAT] | ||
| ) |
There was a problem hiding this comment.
main focus of PR
iskhakov
approved these changes
Dec 19, 2023
brojd
pushed a commit
that referenced
this pull request
Sep 18, 2024
…om_time and to_time (#3581) # Which issue(s) this PR fixes Closes grafana/oncall-private#2373 ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [ ] Documentation added (or `pr:no public docs` PR label added if not required) - [x] `CHANGELOG.md` updated (or `pr:no changelog` PR label added if not required)
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.
Which issue(s) this PR fixes
Closes https://github.com/grafana/oncall-private/issues/2373
Checklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)