[no ticket][risk=no] Supplemented creator information #8969
+86
−33
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,6 +37,7 @@ | |
| import org.pmiops.workbench.db.model.DbWorkspace; | ||
| import org.pmiops.workbench.model.BillingStatus; | ||
| import org.pmiops.workbench.model.ResearchPurpose; | ||
| import org.pmiops.workbench.model.User; | ||
| import org.pmiops.workbench.model.Workspace; | ||
| import org.pmiops.workbench.model.WorkspaceAccessLevel; | ||
| import org.pmiops.workbench.utils.mappers.CommonMappers; | ||
|
|
@@ -113,14 +114,17 @@ public void setUp() { | |
| .researchOutcomeList(Collections.emptyList()); | ||
| final long now = System.currentTimeMillis(); | ||
|
|
||
| User creator = new User(); | ||
| creator.setEmail("[email protected]"); | ||
|
|
||
|
|
||
| workspace1 = | ||
| new Workspace() | ||
| .etag("etag_1") | ||
| .name("DbWorkspace 1") | ||
| .terraName("dbworkspace1") | ||
| .namespace("aou-rw-local1-c4be869a") | ||
| .cdrVersionId("1") | ||
| .creator(creator) | ||
| .billingAccountName("big-bux") | ||
| .googleBucketName("bucket o' science") | ||
| .accessTierShortName(AccessTierService.REGISTERED_TIER_SHORT_NAME) | ||
|
|
@@ -279,6 +283,8 @@ public void testFireEditAction_sendsChangedProperties() { | |
| .timeReviewed(workspace1.getResearchPurpose().getTimeReviewed() + 1000L) | ||
| .controlSet(!workspace1.getResearchPurpose().isControlSet()); | ||
| final int rpChanges = 5; | ||
| User creator = new User(); | ||
| creator.setUserName("[email protected]"); | ||
|
|
||
| Workspace editedWorkspace = | ||
| clone(workspace1) | ||
|
|
@@ -287,7 +293,7 @@ public void testFireEditAction_sendsChangedProperties() { | |
| // changes | ||
| .name("a new name") | ||
| .namespace("a new namespace") | ||
| .creator(creator); | ||
| final int wsChanges = 3; | ||
|
|
||
| workspaceAuditor.fireEditAction(workspace1, editedWorkspace, dbWorkspace1.getWorkspaceId()); | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ | |
| import org.pmiops.workbench.access.AccessTierService; | ||
| import org.pmiops.workbench.model.ResearchPurpose; | ||
| import org.pmiops.workbench.model.SpecificPopulationEnum; | ||
| import org.pmiops.workbench.model.User; | ||
| import org.pmiops.workbench.model.Workspace; | ||
|
|
||
| class TargetPropertyExtractorTest { | ||
|
|
@@ -16,6 +17,8 @@ class TargetPropertyExtractorTest { | |
| @BeforeEach | ||
| void setUp() { | ||
| long now = System.currentTimeMillis(); | ||
| User creator = new User(); | ||
| creator.setEmail("[email protected]"); | ||
|
|
||
|
|
||
| var researchPurpose1 = | ||
| new ResearchPurpose() | ||
|
|
@@ -52,7 +55,7 @@ void setUp() { | |
| .terraName("dbworkspace1") | ||
| .namespace("aou-rw-local1-c4be869a") | ||
| .cdrVersionId("1") | ||
| .creator(creator) | ||
| .accessTierShortName(AccessTierService.REGISTERED_TIER_SHORT_NAME) | ||
| .researchPurpose(researchPurpose1); | ||
| } | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,7 @@ | |
| import org.pmiops.workbench.access.AccessTierService; | ||
| import org.pmiops.workbench.model.ResearchPurpose; | ||
| import org.pmiops.workbench.model.SpecificPopulationEnum; | ||
| import org.pmiops.workbench.model.User; | ||
| import org.pmiops.workbench.model.Workspace; | ||
|
|
||
| public class WorkspaceTargetPropertyTest { | ||
|
|
@@ -42,13 +43,15 @@ public void setUp() { | |
| .anticipatedFindings("a 4-leaf clover"); | ||
|
|
||
| long now = System.currentTimeMillis(); | ||
| User creator = new User(); | ||
| creator.setEmail("[email protected]"); | ||
|
|
||
| workspace1 = | ||
| new Workspace() | ||
| .name("Workspace 1") | ||
| .terraName("workspace1") | ||
| .namespace("aou-rw-local1-c4be869a") | ||
| .creator(creator) | ||
| .cdrVersionId("1") | ||
| .researchPurpose(researchPurposeAllFieldsPopulated) | ||
| .creationTime(now) | ||
|
|
@@ -61,7 +64,7 @@ public void setUp() { | |
| .name("Workspace 2") | ||
| .terraName("workspace2") | ||
| .namespace("aou-rw-local1-c4be869a") | ||
| .creator(creator) | ||
| .cdrVersionId("33") | ||
| .researchPurpose(researchPurpose2) | ||
| .creationTime(now) | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,6 +61,7 @@ | |
| import org.pmiops.workbench.model.ResearchPurpose; | ||
| import org.pmiops.workbench.model.SexAtBirthV2; | ||
| import org.pmiops.workbench.model.SexualOrientationV2; | ||
| import org.pmiops.workbench.model.User; | ||
| import org.pmiops.workbench.model.Workspace; | ||
| import org.pmiops.workbench.model.YesNoPreferNot; | ||
| import org.pmiops.workbench.rawls.model.RawlsWorkspaceAccessLevel; | ||
|
|
@@ -119,6 +120,12 @@ public static Workspace createWorkspace( | |
| List<ResearchOutcomeEnum> ResearchOutcomeEnumsList = new ArrayList<>(); | ||
| ResearchOutcomeEnumsList.add(ResearchOutcomeEnum.IMPROVED_RISK_ASSESMENT); | ||
|
|
||
| User creator = new User(); | ||
| creator.setEmail("[email protected]"); | ||
|
There was a problem hiding this comment. rm, to ensure that this field is not actually what we're reading |
||
| creator.setUserName("[email protected]"); | ||
| creator.setGivenName("Jay"); | ||
| creator.setFamilyName("Tester"); | ||
|
|
||
| return new Workspace() | ||
| .etag("\"1\"") | ||
| .name(workspaceDisplayName) | ||
|
|
@@ -131,7 +138,7 @@ public static Workspace createWorkspace( | |
| .billingAccountName(WORKSPACE_BILLING_ACCOUNT_NAME) | ||
| .googleProject(DEFAULT_GOOGLE_PROJECT) | ||
| .creationTime(1588097211621L) | ||
| .creator(creator) | ||
| .creationTime(Instant.parse("2000-01-01T00:00:00.00Z").toEpochMilli()) | ||
| .lastModifiedTime(1588097211621L) | ||
| .googleProject(DEFAULT_GOOGLE_PROJECT) | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,6 +67,8 @@ | |
| public class WorkspaceMapperTest { | ||
| private static final String FIRECLOUD_NAMESPACE = "aou-xxxxxxx"; | ||
| private static final String CREATOR_EMAIL = "[email protected]"; | ||
| private static final String CREATOR_GIVEN_NAME = "Oscar"; | ||
| private static final String CREATOR_FAMILY_NAME = "Calhoun"; | ||
| private static final long CREATOR_USER_ID = 101L; | ||
| private static final long WORKSPACE_DB_ID = 222L; | ||
| private static final int WORKSPACE_VERSION = 2; | ||
|
|
@@ -145,6 +147,8 @@ public void setUp() { | |
| final DbUser creatorUser = | ||
| new DbUser() | ||
| .setUsername(CREATOR_EMAIL) | ||
| .setGivenName(CREATOR_GIVEN_NAME) | ||
| .setFamilyName(CREATOR_FAMILY_NAME) | ||
| .setUserId(CREATOR_USER_ID) | ||
| .setUserInitialCreditsExpiration( | ||
| new DbUserInitialCreditsExpiration() | ||
|
|
@@ -213,7 +217,9 @@ public void testConvertsDbToApiWorkspace() { | |
| assertThat(ws.getName()).isEqualTo(WORKSPACE_AOU_NAME); | ||
| assertThat(ws.getNamespace()).isEqualTo(FIRECLOUD_NAMESPACE); | ||
| assertThat(ws.getCdrVersionId()).isEqualTo(Long.toString(CDR_VERSION_ID)); | ||
| assertThat(ws.getCreator().getUserName()).isEqualTo(CREATOR_EMAIL); | ||
| assertThat(ws.getCreator().getGivenName()).isEqualTo(CREATOR_GIVEN_NAME); | ||
| assertThat(ws.getCreator().getFamilyName()).isEqualTo(CREATOR_FAMILY_NAME); | ||
| assertThat(ws.getInitialCredits().getExpirationEpochMillis()) | ||
| .isEqualTo(INITIAL_CREDITS_EXPIRATION_TIMESTAMP.getTime()); | ||
| assertThat(ws.getGoogleBucketName()).isEqualTo(FIRECLOUD_BUCKET_NAME); | ||
|
|
||
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,7 +18,7 @@ export class FeaturedWorkspacesApiStub extends FeaturedWorkspaceApi { | |
| return { | ||
| workspace: { | ||
| ...workspace, | ||
| creator: { userName: '[email protected]' }, | ||
| featuredCategory: category as FeaturedWorkspaceCategory, | ||
| }, | ||
| accessLevel: WorkspaceAccessLevel.OWNER, | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please switch to
getUserName()because email is deprecated. We want to stop using "email" in most cases because it's ambiguous (contact email or username?) and we sometimes get it wrong.I have a new PR to remove it (and also update UserRole): #8989
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for pointing this out