Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[risk=low][no ticket] Update User and UserRole entities to favor userName over email #8989

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

[risk=low][no ticket] Update User and UserRole entities to favor userName over email #8989

wants to merge 8 commits into from

Conversation

jmthibault79
Copy link
Collaborator

@jmthibault79 jmthibault79 commented Dec 9, 2024 •
edited
Loading

Remove deprecated email from User
Add userName to UserRole and deprecate email

PR checklist

  • I have included an issue ID or "no ticket" in the PR title as outlined in CONTRIBUTING.md.
  • I have included a risk tag of the form [risk=no|low|moderate|severe] in the PR title as outlined in CONTRIBUTING.md.
  • I have manually tested this change and my testing process is described above.
  • This change includes appropriate automated tests, and I have documented any behavior that cannot be tested with code.
  • I have added explanatory comments where the logic is not obvious.
  • One or more of the following is true:
    • This change is intended to complete a JIRA story, so I have checked that all AC are met for that story.
    • This change fixes a bug, so I have ensured the steps to reproduce are in the Jira ticket or provided above.
    • This change impacts deployment safety (e.g. removing/altering APIs which are in use), so I have documented the impacts in the description.
    • This change includes a new feature flag, so I have created and linked new JIRA tickets to (a) turn on the feature flag and (b) remove it later.
    • This change modifies the UI, so I have taken screenshots or recordings of the new behavior and notified the PO and UX designer in Slack.
    • This change modifies API behavior, so I have run the relevant E2E tests locally because API changes are not covered by our PR checks.
    • None of the above apply to this change.

@jmthibault79 jmthibault79 mentioned this pull request Dec 9, 2024
Merged
12 tasks
jmthibault79
jmthibault79 commented Dec 9, 2024
View reviewed changes
api/src/main/java/org/pmiops/workbench/firecloud/FirecloudTransforms.java
String email, WorkspaceAccessLevel updatedAccess) {
RawlsWorkspaceACLUpdate update = new RawlsWorkspaceACLUpdate().email(email);
String username, WorkspaceAccessLevel updatedAccess) {
RawlsWorkspaceACLUpdate update = new RawlsWorkspaceACLUpdate().email(username);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't update the name of RawlsWorkspaceACLUpdate.email because that's defined by the Rawls API

jmthibault79
jmthibault79 commented Dec 9, 2024
View reviewed changes
api/src/main/java/org/pmiops/workbench/workspaceadmin/WorkspaceAdminServiceImpl.java
.map(u -> userMapper.toWorkspaceUserAdminView(u, userRole))
.orElse(
new WorkspaceUserAdminView() // the MapStruct-generated method won't handle a partial
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cleanup/simplify by adding a MapStruct method to handle the partial creation

@jmthibault79 jmthibault79 marked this pull request as ready for review December 9, 2024 20:41
@jmthibault79 jmthibault79 changed the title Joel/rm email from user [risk=low][no ticket] Update User and UserRole entities to favor userName over email Dec 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jmthibault79