Fix /schedule/current when the schedule spans midnight #618
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
Now that ScheduleBlocks can span midnight, we need to be concerned about both date and time.
…lifying the logic
drnlm
approved these changes
Aug 25, 2021
hodgestar
reviewed
Aug 25, 2021
| timestamp = parse_datetime(timestamp) | ||
| except ValueError as e: | ||
| messages.error(self.request, | ||
| 'Failed to parse timestamp: %s' % e) |
There was a problem hiding this comment.
I think there is a mistake in the error handling logic here. If the timestamp fails to parse, it will remain with its non-None original value (probably a string, I guess) and fail on if not timezone.is_aware(timestamp) I presume.
The simplest fix appears to be to return None at the end of the exception block.
It also seems like a good idea to not overwrite the timestamp though so that the timestamp can be reported in the error message in the if timestamp is None block.
It looks like the tests don't cover invalid timestamps, which explains how these made it through CI.
drnlm
pushed a commit
to drnlm/wafer
that referenced
this pull request
Oct 17, 2023
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.
When a schedule spans midnight,
/schedule/currentdisplays the last talk from the previous day, every day.It's still based on the old separate date and time from ScheduleDay and ScheduleBlock, in its logic, the migration was incomplete here.
Fix the bug, and refactor the code to use a single
timestampquery parameter for testing.