Apply shift swap requests to schedule events #2677
Merged
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
matiasb
commented
Jul 28, 2023
| Q(**User.build_permissions_query(RBACPermission.Permissions.SCHEDULES_WRITE, organization)) | ||
| & (Q(username__in=usernames) | Q(email__lower__in=emails)) | ||
| ) | ||
|
|
There was a problem hiding this comment.
Iterating over schedule events and getting users with an OR query doesn't seem better than going the original path (did some testing). Also, when applying swaps, if a user wasn't part of the original schedule, we don't get that user information.
joeyorlando
reviewed
Jul 28, 2023
Comment on lines
-125
to
+178
| # TODO: implement the actual override logic in https://github.com/grafana/oncall/issues/2590 | ||
| # make sure final schedule ical representation is updated | ||
| refresh_ical_final_schedule.apply_async((self.schedule.pk,)) |
joeyorlando
approved these changes
Jul 28, 2023
0328aa3 to
7cd0b77
Compare
7cd0b77 to
11f5b80
Compare
joeyorlando
reviewed
Jul 28, 2023
engine/apps/schedules/ical_utils.py
Outdated
| @@ -61,7 +60,6 @@ | |||
| def users_in_ical( | |||
| usernames_from_ical: typing.List[str], | |||
| organization: "Organization", | |||
| users_to_filter: typing.Optional["UserQuerySet"] = None, | |||
| ) -> typing.Sequence["User"]: | |||
There was a problem hiding this comment.
we can probably change the return type here. I believe it was like this to accommodate the union between a list and a queryset
058fb09 to
fd95dc8
Compare
fd95dc8 to
c788b93
Compare
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.
Reflect swap requests details in schedule events.