fix(2989) Return users field data for web overriden shifts via public… #3303
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
|
|
ravishankar15
force-pushed
the
2989-override-shift-fill-users
branch
from
6307e1e
to
b60e38c
Compare
matiasb
reviewed
Nov 13, 2023
| **data, | ||
| ) | ||
| on_call_shift.add_rolling_users([[other_user]]) | ||
| on_call_shift.users.add(user) |
There was a problem hiding this comment.
When creating override shifts, the users field should be empty. We only expect rolling_users to be set up in this case.
matiasb
reviewed
Nov 13, 2023
| and result["rolling_users"] is not None | ||
| ): | ||
| result["users"] += [u for r in result["rolling_users"] for u in r] | ||
| result["users"] = list(set(result["users"])) # return unique users |
There was a problem hiding this comment.
Maybe this could be simplified a bit?
result["users"] = list({u for r in result["rolling_users"] for u in r})
ravishankar15
force-pushed
the
2989-override-shift-fill-users
branch
from
b60e38c
to
d53f3c2
Compare
matiasb
reviewed
Nov 15, 2023
| "start": on_call_shift.start.strftime("%Y-%m-%dT%H:%M:%S"), | ||
| "rotation_start": on_call_shift.start.strftime("%Y-%m-%dT%H:%M:%S"), | ||
| "duration": int(on_call_shift.duration.total_seconds()), | ||
| "users": list({user.public_primary_key, other_user.public_primary_key}), |
There was a problem hiding this comment.
Note this may return users in any order, and then the test may randomly fail. It will be nice to make the test stable.
There was a problem hiding this comment.
Have made it to use one user to avoid adding unnecessary sort function in the actual code.
matiasb
added
the
pr:no public docs
matiasb
reviewed
Nov 15, 2023
ravishankar15
force-pushed
the
2989-override-shift-fill-users
branch
from
08cacf0
to
42fa929
Compare
matiasb
force-pushed
the
2989-override-shift-fill-users
branch
from
42fa929
to
d21a02a
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.
What this PR does
The
rolling_usersfield for the shift of type override created from web UI is populated in theusersfield of the public GET Shift APIWhich issue(s) this PR fixes
#2989
Checklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)