src_fm_fc_ms_ff
stringlengths 43
86.8k
| target
stringlengths 20
276k
|
|---|---|
InodeInfoCommand extends AbstractReportCommand { @Override public void run() { final FsImageData fsImageData = loadFsImage(); if (null != fsImageData) { for (String inodeId : inodeIds) { showInodeDetails(fsImageData, inodeId); } } } @Override void run(); } | @Test public void testRun() { InodeInfoCommand infoCommand = new InodeInfoCommand(); infoCommand.mainCommand = new HdfsFSImageTool.MainCommand(); final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); try (PrintStream printStream = new PrintStream(byteArrayOutputStream)) { infoCommand.mainCommand.out = printStream; infoCommand.mainCommand.err = infoCommand.mainCommand.out; infoCommand.mainCommand.fsImageFile = new File("src/test/resources/fsi_small.img"); infoCommand.inodeIds = new String[]{"/", "/test3", "/test3/test_160MiB.img", "16387"}; infoCommand.run(); assertThat(byteArrayOutputStream.toString()) .isEqualTo( "type: DIRECTORY\n" + "id: 16385\n" + "name: \"\"\n" + "directory {\n" + " modificationTime: 1499493618390\n" + " nsQuota: 9223372036854775807\n" + " dsQuota: 18446744073709551615\n" + " permission: 1099511759341\n" + "}\n" + "\n" + "type: DIRECTORY\n" + "id: 16388\n" + "name: \"test3\"\n" + "directory {\n" + " modificationTime: 1497734744891\n" + " nsQuota: 18446744073709551615\n" + " dsQuota: 18446744073709551615\n" + " permission: 1099511759341\n" + "}\n" + "\n" + "type: FILE\n" + "id: 16402\n" + "name: \"test_160MiB.img\"\n" + "file {\n" + " replication: 1\n" + " modificationTime: 1497734744886\n" + " accessTime: 1497734743534\n" + " preferredBlockSize: 134217728\n" + " permission: 5497558401444\n" + " blocks {\n" + " blockId: 1073741834\n" + " genStamp: 1010\n" + " numBytes: 134217728\n" + " }\n" + " blocks {\n" + " blockId: 1073741835\n" + " genStamp: 1011\n" + " numBytes: 33554432\n" + " }\n" + " storagePolicyID: 0\n" + "}\n" + "\n" + "type: DIRECTORY\n" + "id: 16387\n" + "name: \"test2\"\n" + "directory {\n" + " modificationTime: 1497733426149\n" + " nsQuota: 18446744073709551615\n" + " dsQuota: 18446744073709551615\n" + " permission: 1099511759341\n" + "}\n" + "\n" ); } } |
FireCloudServiceImpl implements FireCloudService { @Override public boolean getFirecloudStatus() { try { statusApiProvider.get().status(); } catch (ApiException e) { log.log(Level.WARNING, "Firecloud status check request failed", e); String response = e.getResponseBody(); try { JSONObject errorBody = new JSONObject(response); JSONObject subSystemStatus = errorBody.getJSONObject(STATUS_SUBSYSTEMS_KEY); if (subSystemStatus != null) { return systemOkay(subSystemStatus, THURLOE_STATUS_NAME) && systemOkay(subSystemStatus, SAM_STATUS_NAME) && systemOkay(subSystemStatus, RAWLS_STATUS_NAME) && systemOkay(subSystemStatus, GOOGLE_BUCKETS_STATUS_NAME); } } catch (JSONException ignored) { } return false; } return true; } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); static final List<String> FIRECLOUD_API_OAUTH_SCOPES; static final List<String> FIRECLOUD_WORKSPACE_REQUIRED_FIELDS; } | @Test public void testStatus_success() throws ApiException { when(statusApi.status()).thenReturn(new FirecloudSystemStatus()); assertThat(service.getFirecloudStatus()).isTrue(); }
@Test public void testStatus_handleApiException() throws ApiException { when(statusApi.status()).thenThrow(new ApiException(500, null, "{\"ok\": false}")); assertThat(service.getFirecloudStatus()).isFalse(); }
@Test public void testStatus_handleJsonException() throws ApiException { when(statusApi.status()).thenThrow(new ApiException(500, null, "unparseable response")); assertThat(service.getFirecloudStatus()).isFalse(); } |
RuntimeController implements RuntimeApiDelegate { @Override public ResponseEntity<RuntimeLocalizeResponse> localize( String workspaceNamespace, RuntimeLocalizeRequest body) { DbWorkspace dbWorkspace = lookupWorkspace(workspaceNamespace); workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( dbWorkspace.getWorkspaceNamespace(), dbWorkspace.getFirecloudName(), WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling( dbWorkspace.getWorkspaceNamespace(), dbWorkspace.getFirecloudName()); final FirecloudWorkspace firecloudWorkspace; try { firecloudWorkspace = fireCloudService .getWorkspace(dbWorkspace.getWorkspaceNamespace(), dbWorkspace.getFirecloudName()) .getWorkspace(); } catch (NotFoundException e) { throw new NotFoundException( String.format( "workspace %s/%s not found or not accessible", dbWorkspace.getWorkspaceNamespace(), dbWorkspace.getFirecloudName())); } DbCdrVersion cdrVersion = dbWorkspace.getCdrVersion(); String gcsNotebooksDir = "gs: long workspaceId = dbWorkspace.getWorkspaceId(); body.getNotebookNames() .forEach( notebookName -> userRecentResourceService.updateNotebookEntry( workspaceId, userProvider.get().getUserId(), gcsNotebooksDir + "/" + notebookName)); String workspacePath = dbWorkspace.getFirecloudName(); String editDir = "workspaces/" + workspacePath; String playgroundDir = "workspaces_playground/" + workspacePath; String targetDir = body.getPlaygroundMode() ? playgroundDir : editDir; leonardoNotebooksClient.createStorageLink( workspaceNamespace, userProvider.get().getRuntimeName(), new StorageLink() .cloudStorageDirectory(gcsNotebooksDir) .localBaseDirectory(editDir) .localSafeModeBaseDirectory(playgroundDir) .pattern(DELOC_PATTERN)); Map<String, String> localizeMap = new HashMap<>(); String aouConfigUri = aouConfigDataUri(firecloudWorkspace, cdrVersion, workspaceNamespace); localizeMap.put(editDir + "/" + AOU_CONFIG_FILENAME, aouConfigUri); localizeMap.put(playgroundDir + "/" + AOU_CONFIG_FILENAME, aouConfigUri); if (body.getNotebookNames() != null) { localizeMap.putAll( body.getNotebookNames().stream() .collect( Collectors.toMap( name -> targetDir + "/" + name, name -> gcsNotebooksDir + "/" + name))); } log.info(localizeMap.toString()); leonardoNotebooksClient.localize( workspaceNamespace, userProvider.get().getRuntimeName(), localizeMap); return ResponseEntity.ok(new RuntimeLocalizeResponse().runtimeLocalDirectory(targetDir)); } @Autowired RuntimeController(
LeonardoRuntimeAuditor leonardoRuntimeAuditor,
LeonardoNotebooksClient leonardoNotebooksClient,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserService userService,
UserRecentResourceService userRecentResourceService,
UserDao userDao,
LeonardoMapper leonardoMapper,
Clock clock); @Override @AuthorityRequired(Authority.SECURITY_ADMIN) ResponseEntity<List<ListRuntimeResponse>> deleteRuntimesInProject(
String billingProjectId, ListRuntimeDeleteRequest req); @Override ResponseEntity<Runtime> getRuntime(String workspaceNamespace); @Override ResponseEntity<EmptyResponse> createRuntime(String workspaceNamespace, Runtime runtime); @Override ResponseEntity<EmptyResponse> deleteRuntime(String workspaceNamespace); @Override ResponseEntity<RuntimeLocalizeResponse> localize(
String workspaceNamespace, RuntimeLocalizeRequest body); @Override @AuthorityRequired({Authority.DEVELOPER}) ResponseEntity<EmptyResponse> updateClusterConfig(UpdateClusterConfigRequest body); } | @Test public void testLocalize_playgroundMode() throws org.pmiops.workbench.notebooks.ApiException { RuntimeLocalizeRequest req = new RuntimeLocalizeRequest() .notebookNames(ImmutableList.of("foo.ipynb")) .playgroundMode(true); stubGetWorkspace(WORKSPACE_NS, WORKSPACE_ID, LOGGED_IN_USER_EMAIL); RuntimeLocalizeResponse resp = runtimeController.localize(BILLING_PROJECT_ID, req).getBody(); assertThat(resp.getRuntimeLocalDirectory()).isEqualTo("workspaces_playground/myfirstworkspace"); verify(proxyApi) .welderLocalize(eq(BILLING_PROJECT_ID), eq(getRuntimeName()), welderReqCaptor.capture()); Localize welderReq = welderReqCaptor.getValue(); assertThat( welderReq.getEntries().stream() .map(e -> e.getLocalDestinationPath()) .collect(Collectors.toList())) .containsExactly( "workspaces_playground/myfirstworkspace/foo.ipynb", "workspaces_playground/myfirstworkspace/.all_of_us_config.json", "workspaces/myfirstworkspace/.all_of_us_config.json"); assertThat( welderReq.getEntries().stream() .filter( e -> e.getLocalDestinationPath() .equals("workspaces_playground/myfirstworkspace/foo.ipynb") && e.getSourceUri().equals("gs: .count()) .isAtLeast(1L); }
@Test public void testLocalize_differentNamespace() throws org.pmiops.workbench.notebooks.ApiException { RuntimeLocalizeRequest req = new RuntimeLocalizeRequest() .notebookNames(ImmutableList.of("foo.ipynb")) .playgroundMode(false); stubGetWorkspace(WORKSPACE_NS, WORKSPACE_ID, LOGGED_IN_USER_EMAIL); stubGetWorkspace("other-proj", "myotherworkspace", LOGGED_IN_USER_EMAIL); RuntimeLocalizeResponse resp = runtimeController.localize("other-proj", req).getBody(); verify(proxyApi) .welderLocalize(eq("other-proj"), eq(getRuntimeName()), welderReqCaptor.capture()); Localize welderReq = welderReqCaptor.getValue(); assertThat( welderReq.getEntries().stream() .map(e -> e.getLocalDestinationPath()) .collect(Collectors.toList())) .containsExactly( "workspaces/myotherworkspace/foo.ipynb", "workspaces/myotherworkspace/.all_of_us_config.json", "workspaces_playground/myotherworkspace/.all_of_us_config.json"); assertThat( welderReq.getEntries().stream() .filter( e -> e.getLocalDestinationPath().equals("workspaces/myotherworkspace/foo.ipynb") && e.getSourceUri().equals("gs: .count()) .isAtLeast(1L); assertThat(resp.getRuntimeLocalDirectory()).isEqualTo("workspaces/myotherworkspace"); JSONObject aouJson = dataUriToJson( welderReq.getEntries().stream() .filter( e -> e.getLocalDestinationPath() .equals("workspaces/myotherworkspace/.all_of_us_config.json")) .findFirst() .get() .getSourceUri()); assertThat(aouJson.getString("BILLING_CLOUD_PROJECT")).isEqualTo("other-proj"); }
@Test public void testLocalize_noNotebooks() throws org.pmiops.workbench.notebooks.ApiException { RuntimeLocalizeRequest req = new RuntimeLocalizeRequest(); req.setPlaygroundMode(false); stubGetWorkspace(WORKSPACE_NS, WORKSPACE_ID, LOGGED_IN_USER_EMAIL); RuntimeLocalizeResponse resp = runtimeController.localize(BILLING_PROJECT_ID, req).getBody(); verify(proxyApi) .welderLocalize(eq(BILLING_PROJECT_ID), eq(getRuntimeName()), welderReqCaptor.capture()); Localize welderReq = welderReqCaptor.getValue(); assertThat( welderReq.getEntries().stream() .map(e -> e.getLocalDestinationPath()) .collect(Collectors.toList())) .containsExactly( "workspaces_playground/myfirstworkspace/.all_of_us_config.json", "workspaces/myfirstworkspace/.all_of_us_config.json"); assertThat(resp.getRuntimeLocalDirectory()).isEqualTo("workspaces/myfirstworkspace"); }
@Test public void localize_validateActiveBilling() { doThrow(ForbiddenException.class) .when(mockWorkspaceService) .validateActiveBilling(WORKSPACE_NS, WORKSPACE_ID); RuntimeLocalizeRequest req = new RuntimeLocalizeRequest(); assertThrows(ForbiddenException.class, () -> runtimeController.localize(WORKSPACE_NS, req)); }
@Test public void localize_validateActiveBilling_checkAccessFirst() { doThrow(ForbiddenException.class) .when(mockWorkspaceService) .enforceWorkspaceAccessLevelAndRegisteredAuthDomain( WORKSPACE_NS, WORKSPACE_ID, WorkspaceAccessLevel.WRITER); RuntimeLocalizeRequest req = new RuntimeLocalizeRequest(); assertThrows(ForbiddenException.class, () -> runtimeController.localize(WORKSPACE_NS, req)); verify(mockWorkspaceService, never()).validateActiveBilling(anyString(), anyString()); }
@Test public void testLocalize() throws org.pmiops.workbench.notebooks.ApiException { RuntimeLocalizeRequest req = new RuntimeLocalizeRequest() .notebookNames(ImmutableList.of("foo.ipynb")) .playgroundMode(false); stubGetWorkspace(WORKSPACE_NS, WORKSPACE_ID, LOGGED_IN_USER_EMAIL); RuntimeLocalizeResponse resp = runtimeController.localize(BILLING_PROJECT_ID, req).getBody(); assertThat(resp.getRuntimeLocalDirectory()).isEqualTo("workspaces/myfirstworkspace"); verify(proxyApi) .welderLocalize(eq(BILLING_PROJECT_ID), eq(getRuntimeName()), welderReqCaptor.capture()); Localize welderReq = welderReqCaptor.getValue(); assertThat( welderReq.getEntries().stream() .map(e -> e.getLocalDestinationPath()) .collect(Collectors.toList())) .containsExactly( "workspaces/myfirstworkspace/foo.ipynb", "workspaces_playground/myfirstworkspace/.all_of_us_config.json", "workspaces/myfirstworkspace/.all_of_us_config.json"); assertThat( welderReq.getEntries().stream() .filter( e -> e.getSourceUri().equals("gs: && e.getLocalDestinationPath() .equals("workspaces/myfirstworkspace/foo.ipynb")) .count()) .isAtLeast(1L); JSONObject aouJson = dataUriToJson( welderReq.getEntries().stream() .filter( e -> e.getLocalDestinationPath() .equals("workspaces/myfirstworkspace/.all_of_us_config.json")) .findFirst() .get() .getSourceUri()); assertThat(aouJson.getString("WORKSPACE_ID")).isEqualTo(WORKSPACE_ID); assertThat(aouJson.getString("BILLING_CLOUD_PROJECT")).isEqualTo(BILLING_PROJECT_ID); assertThat(aouJson.getString("API_HOST")).isEqualTo(API_HOST); verify(mockUserRecentResourceService, times(1)) .updateNotebookEntry(anyLong(), anyLong(), anyString()); } |
RuntimeController implements RuntimeApiDelegate { @Override public ResponseEntity<Runtime> getRuntime(String workspaceNamespace) { String firecloudWorkspaceName = lookupWorkspace(workspaceNamespace).getFirecloudName(); workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, firecloudWorkspaceName, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, firecloudWorkspaceName); try { return ResponseEntity.ok( leonardoMapper.toApiRuntime( leonardoNotebooksClient.getRuntime( workspaceNamespace, userProvider.get().getRuntimeName()))); } catch (NotFoundException e) { if (!workbenchConfigProvider.get().featureFlags.enableCustomRuntimes) { throw e; } return ResponseEntity.ok(getOverrideFromListRuntimes(workspaceNamespace)); } } @Autowired RuntimeController(
LeonardoRuntimeAuditor leonardoRuntimeAuditor,
LeonardoNotebooksClient leonardoNotebooksClient,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserService userService,
UserRecentResourceService userRecentResourceService,
UserDao userDao,
LeonardoMapper leonardoMapper,
Clock clock); @Override @AuthorityRequired(Authority.SECURITY_ADMIN) ResponseEntity<List<ListRuntimeResponse>> deleteRuntimesInProject(
String billingProjectId, ListRuntimeDeleteRequest req); @Override ResponseEntity<Runtime> getRuntime(String workspaceNamespace); @Override ResponseEntity<EmptyResponse> createRuntime(String workspaceNamespace, Runtime runtime); @Override ResponseEntity<EmptyResponse> deleteRuntime(String workspaceNamespace); @Override ResponseEntity<RuntimeLocalizeResponse> localize(
String workspaceNamespace, RuntimeLocalizeRequest body); @Override @AuthorityRequired({Authority.DEVELOPER}) ResponseEntity<EmptyResponse> updateClusterConfig(UpdateClusterConfigRequest body); } | @Test public void getRuntime_validateActiveBilling() { doThrow(ForbiddenException.class) .when(mockWorkspaceService) .validateActiveBilling(WORKSPACE_NS, WORKSPACE_ID); assertThrows(ForbiddenException.class, () -> runtimeController.getRuntime(WORKSPACE_NS)); }
@Test public void getRuntime_validateActiveBilling_checkAccessFirst() { doThrow(ForbiddenException.class) .when(mockWorkspaceService) .enforceWorkspaceAccessLevelAndRegisteredAuthDomain( WORKSPACE_NS, WORKSPACE_ID, WorkspaceAccessLevel.WRITER); assertThrows(ForbiddenException.class, () -> runtimeController.getRuntime(WORKSPACE_NS)); verify(mockWorkspaceService, never()).validateActiveBilling(anyString(), anyString()); }
@Test public void testGetRuntime() throws ApiException { when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenReturn(testLeoRuntime); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody()).isEqualTo(testRuntime); }
@Test public void testGetRuntime_noLabel() throws ApiException { testLeoRuntime.setLabels(ImmutableMap.of()); when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenReturn(testLeoRuntime); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody().getConfigurationType()) .isEqualTo(RuntimeConfigurationType.HAILGENOMICANALYSIS); }
@Test public void testGetRuntime_defaultLabel_hail() throws ApiException { testLeoRuntime.setLabels(ImmutableMap.of("all-of-us-config", "preset-hail-genomic-analysis")); when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenReturn(testLeoRuntime); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody().getConfigurationType()) .isEqualTo(RuntimeConfigurationType.HAILGENOMICANALYSIS); }
@Test public void testGetRuntime_defaultLabel_generalAnalysis() throws ApiException { testLeoRuntime.setLabels(ImmutableMap.of("all-of-us-config", "preset-general-analysis")); when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenReturn(testLeoRuntime); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody().getConfigurationType()) .isEqualTo(RuntimeConfigurationType.GENERALANALYSIS); }
@Test public void testGetRuntime_overrideLabel() throws ApiException { testLeoRuntime.setLabels(ImmutableMap.of("all-of-us-config", "user-override")); when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenReturn(testLeoRuntime); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody().getConfigurationType()) .isEqualTo(RuntimeConfigurationType.USEROVERRIDE); }
@Test public void testGetRuntime_noGetRuntime_emptyListRuntimes() throws ApiException { when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn(Collections.emptyList()); assertThrows(NotFoundException.class, () -> runtimeController.getRuntime(BILLING_PROJECT_ID)); }
@Test public void testGetRuntime_fromListRuntimes() throws ApiException { String timestamp = "2020-09-13T19:19:57.347Z"; when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .googleProject("google-project") .runtimeName("expected-runtime") .status(LeonardoRuntimeStatus.CREATING) .auditInfo(new LeonardoAuditInfo().createdDate(timestamp)) .labels(ImmutableMap.of("all-of-us-config", "user-override")))); Runtime runtime = runtimeController.getRuntime(BILLING_PROJECT_ID).getBody(); assertThat(runtime.getRuntimeName()).isEqualTo("expected-runtime"); assertThat(runtime.getGoogleProject()).isEqualTo("google-project"); assertThat(runtime.getStatus()).isEqualTo(RuntimeStatus.DELETED); assertThat(runtime.getConfigurationType()).isEqualTo(RuntimeConfigurationType.USEROVERRIDE); assertThat(runtime.getCreatedDate()).isEqualTo(timestamp); }
@Test public void testGetRuntime_fromListRuntimes_invalidRutime() throws ApiException { String timestamp = "2020-09-13T19:19:57.347Z"; dataprocConfigObj.put("cloudService", "notACloudService"); when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .runtimeConfig(dataprocConfigObj) .labels(ImmutableMap.of("all-of-us-config", "user-override")))); assertThrows(NotFoundException.class, () -> runtimeController.getRuntime(BILLING_PROJECT_ID)); }
@Test public void testGetRuntime_fromListRuntimes_gceConfig() throws ApiException { String timestamp = "2020-09-13T19:19:57.347Z"; when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .runtimeConfig(gceConfigObj) .auditInfo(new LeonardoAuditInfo().createdDate(timestamp)) .labels(ImmutableMap.of("all-of-us-config", "user-override")))); Runtime runtime = runtimeController.getRuntime(BILLING_PROJECT_ID).getBody(); assertThat(runtime.getGceConfig()).isEqualTo(gceConfig); assertThat(runtime.getDataprocConfig()).isNull(); }
@Test public void testGetRuntime_fromListRuntimes_dataprocConfig() throws ApiException { String timestamp = "2020-09-13T19:19:57.347Z"; LinkedTreeMap<String, Object> dataProcConfigObj = new LinkedTreeMap<>(); dataProcConfigObj.put("cloudService", "DATAPROC"); dataProcConfigObj.put("masterDiskSize", 50.0); dataProcConfigObj.put("masterMachineType", "n1-standard-4"); dataProcConfigObj.put("numberOfPreemptibleWorkers", 4); dataProcConfigObj.put("numberOfWorkerLocalSSDs", 8); dataProcConfigObj.put("numberOfWorkers", 3); dataProcConfigObj.put("workerDiskSize", 30); dataProcConfigObj.put("workerMachineType", "n1-standard-2"); when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .runtimeConfig(dataProcConfigObj) .auditInfo(new LeonardoAuditInfo().createdDate(timestamp)) .labels(ImmutableMap.of("all-of-us-config", "user-override")))); Runtime runtime = runtimeController.getRuntime(BILLING_PROJECT_ID).getBody(); assertThat(runtime.getDataprocConfig().getMasterDiskSize()).isEqualTo(50); assertThat(runtime.getDataprocConfig().getMasterMachineType()).isEqualTo("n1-standard-4"); assertThat(runtime.getDataprocConfig().getNumberOfPreemptibleWorkers()).isEqualTo(4); assertThat(runtime.getDataprocConfig().getNumberOfWorkerLocalSSDs()).isEqualTo(8); assertThat(runtime.getDataprocConfig().getNumberOfWorkers()).isEqualTo(3); assertThat(runtime.getDataprocConfig().getWorkerDiskSize()).isEqualTo(30); assertThat(runtime.getDataprocConfig().getWorkerMachineType()).isEqualTo("n1-standard-2"); assertThat(runtime.getGceConfig()).isNull(); }
@Test public void testGetRuntime_fromListRuntimes_checkMostRecent() throws ApiException { String olderTimestamp = "2020-09-13T19:19:57.347Z"; String newerTimestamp = "2020-09-14T19:19:57.347Z"; when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .runtimeName("expected-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(newerTimestamp)) .labels(ImmutableMap.of("all-of-us-config", "user-override")), new LeonardoListRuntimeResponse() .runtimeName("default-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(olderTimestamp)) .labels(ImmutableMap.of("all-of-us-config", "default")))); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody().getRuntimeName()) .isEqualTo("expected-runtime"); }
@Test public void testGetRuntime_fromListRuntimes_checkMostRecent_nullAuditInfo() throws ApiException { String newerTimestamp = "2020-09-14T19:19:57.347Z"; when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .runtimeName("expected-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(newerTimestamp)) .labels(ImmutableMap.of("all-of-us-config", "user-override")), new LeonardoListRuntimeResponse() .runtimeName("default-runtime") .labels(ImmutableMap.of("all-of-us-config", "default")))); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody().getRuntimeName()) .isEqualTo("expected-runtime"); }
@Test public void testGetRuntime_fromListRuntimes_checkMostRecent_nullTimestamp() throws ApiException { String newerTimestamp = "2020-09-14T19:19:57.347Z"; when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .runtimeName("expected-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(newerTimestamp)) .labels(ImmutableMap.of("all-of-us-config", "user-override")), new LeonardoListRuntimeResponse() .runtimeName("default-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(null)) .labels(ImmutableMap.of("all-of-us-config", "default")))); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody().getRuntimeName()) .isEqualTo("expected-runtime"); }
@Test public void testGetRuntime_fromListRuntimes_checkMostRecent_emptyTimestamp() throws ApiException { String newerTimestamp = "2020-09-14T19:19:57.347Z"; when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .runtimeName("expected-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(newerTimestamp)) .labels(ImmutableMap.of("all-of-us-config", "user-override")), new LeonardoListRuntimeResponse() .runtimeName("default-runtime") .auditInfo(new LeonardoAuditInfo().createdDate("")) .labels(ImmutableMap.of("all-of-us-config", "default")))); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody().getRuntimeName()) .isEqualTo("expected-runtime"); }
@Test public void testGetRuntime_fromListRuntime_mostRecentIsDefaultLabel() throws ApiException { String olderTimestamp = "2020-09-13T19:19:57.347Z"; String newerTimestamp = "2020-09-14T19:19:57.347Z"; when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .runtimeName("override-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(olderTimestamp)) .labels(ImmutableMap.of("all-of-us-config", "user-override")), new LeonardoListRuntimeResponse() .runtimeName("default-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(newerTimestamp)) .labels(ImmutableMap.of("all-of-us-config", "default")))); assertThrows(NotFoundException.class, () -> runtimeController.getRuntime(BILLING_PROJECT_ID)); }
@Test public void testGetRuntime_fromListRuntime_mostRecentHasNoLabel() throws ApiException { String olderTimestamp = "2020-09-13T19:19:57.347Z"; String newerTimestamp = "2020-09-14T19:19:57.347Z"; when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenThrow(new ApiException(404, "Not found")); when(userRuntimesApi.listRuntimesByProject(BILLING_PROJECT_ID, null, true)) .thenReturn( ImmutableList.of( new LeonardoListRuntimeResponse() .runtimeName("override-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(newerTimestamp)), new LeonardoListRuntimeResponse() .runtimeName("default-runtime") .auditInfo(new LeonardoAuditInfo().createdDate(olderTimestamp)) .labels(ImmutableMap.of("all-of-us-config", "default")))); assertThrows(NotFoundException.class, () -> runtimeController.getRuntime(BILLING_PROJECT_ID)); }
@Test public void testGetRuntime_gceConfig() throws ApiException { when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenReturn(testLeoRuntime.runtimeConfig(gceConfigObj)); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody()) .isEqualTo(testRuntime.dataprocConfig(null).gceConfig(gceConfig)); }
@Test public void testGetRuntime_UnknownStatus() throws ApiException { when(userRuntimesApi.getRuntime(BILLING_PROJECT_ID, getRuntimeName())) .thenReturn(testLeoRuntime.status(null)); assertThat(runtimeController.getRuntime(BILLING_PROJECT_ID).getBody().getStatus()) .isEqualTo(RuntimeStatus.UNKNOWN); }
@Test(expected = NotFoundException.class) public void testGetRuntime_NullBillingProject() { runtimeController.getRuntime(null); } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term) { cdrVersionService.setCdrVersion(cdrVersionId); validateTerm(term); return ResponseEntity.ok( new DomainInfoResponse().items(cohortBuilderService.findDomainInfos(term))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findDomainInfos() { cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.CONDITION.toString()) .addType(CriteriaType.ICD9CM.toString()) .addCount(0L) .addHierarchy(true) .addStandard(false) .addParentId(0) .addFullText("term*[CONDITION_rank1]") .build()); DbDomainInfo dbDomainInfo = domainInfoDao.save( new DbDomainInfo() .conceptId(1L) .domain((short) 0) .domainId("CONDITION") .name("Conditions") .description("descr") .allConceptCount(0) .standardConceptCount(0) .participantCount(1000)); DomainInfo domainInfo = controller.findDomainInfos(1L, "term").getBody().getItems().get(0); assertEquals(domainInfo.getName(), dbDomainInfo.getName()); assertEquals(domainInfo.getDescription(), dbDomainInfo.getDescription()); assertEquals(domainInfo.getParticipantCount().longValue(), dbDomainInfo.getParticipantCount()); assertEquals(domainInfo.getAllConceptCount().longValue(), 1); assertEquals(domainInfo.getStandardConceptCount().longValue(), 0); } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new SurveysResponse().items(cohortBuilderService.findSurveyModules(term))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findSurveyModules() { DbCriteria surveyCriteria = cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.SURVEY.toString()) .addType(CriteriaType.PPI.toString()) .addSubtype(CriteriaSubType.QUESTION.toString()) .addCount(0L) .addHierarchy(true) .addStandard(false) .addParentId(0) .addConceptId("1") .addName("The Basics") .build()); cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.SURVEY.toString()) .addType(CriteriaType.PPI.toString()) .addSubtype(CriteriaSubType.ANSWER.toString()) .addCount(0L) .addHierarchy(true) .addStandard(false) .addParentId(0) .addConceptId("1") .addFullText("term*[SURVEY_rank1]") .addPath(String.valueOf(surveyCriteria.getId())) .build()); DbSurveyModule dbSurveyModule = surveyModuleDao.save( new DbSurveyModule() .conceptId(1L) .name("The Basics") .description("descr") .questionCount(1) .participantCount(1000)); SurveyModule surveyModule = controller.findSurveyModules(1L, "term").getBody().getItems().get(0); assertEquals(surveyModule.getName(), dbSurveyModule.getName()); assertEquals(surveyModule.getDescription(), dbSurveyModule.getDescription()); assertEquals( surveyModule.getParticipantCount().longValue(), dbSurveyModule.getParticipantCount()); assertEquals(surveyModule.getQuestionCount().longValue(), 1); } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findCriteriaBy() { DbCriteria icd9CriteriaParent = DbCriteria.builder() .addDomainId(DomainType.CONDITION.toString()) .addType(CriteriaType.ICD9CM.toString()) .addCount(0L) .addHierarchy(true) .addStandard(false) .addParentId(0L) .build(); cbCriteriaDao.save(icd9CriteriaParent); DbCriteria icd9Criteria = DbCriteria.builder() .addDomainId(DomainType.CONDITION.toString()) .addType(CriteriaType.ICD9CM.toString()) .addCount(0L) .addHierarchy(true) .addStandard(false) .addParentId(icd9CriteriaParent.getId()) .build(); cbCriteriaDao.save(icd9Criteria); assertEquals( createResponseCriteria(icd9CriteriaParent), controller .findCriteriaBy( 1L, DomainType.CONDITION.toString(), CriteriaType.ICD9CM.toString(), false, 0L) .getBody() .getItems() .get(0)); assertEquals( createResponseCriteria(icd9Criteria), controller .findCriteriaBy( 1L, DomainType.CONDITION.toString(), CriteriaType.ICD9CM.toString(), false, icd9CriteriaParent.getId()) .getBody() .getItems() .get(0)); }
@Test public void findCriteriaByExceptions() { try { controller.findCriteriaBy(1L, null, null, false, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid domain. null is not valid.", bre.getMessage()); } try { controller.findCriteriaBy(1L, "blah", null, false, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid domain. blah is not valid.", bre.getMessage()); } try { controller.findCriteriaBy(1L, DomainType.CONDITION.toString(), "blah", false, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid type. blah is not valid.", bre.getMessage()); } }
@Test public void findCriteriaByDemo() { DbCriteria demoCriteria = DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.AGE.toString()) .addCount(0L) .addParentId(0L) .build(); cbCriteriaDao.save(demoCriteria); assertEquals( createResponseCriteria(demoCriteria), controller .findCriteriaBy( 1L, DomainType.PERSON.toString(), CriteriaType.AGE.toString(), false, null) .getBody() .getItems() .get(0)); } |
FireCloudServiceImpl implements FireCloudService { @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); static final List<String> FIRECLOUD_API_OAUTH_SCOPES; static final List<String> FIRECLOUD_WORKSPACE_REQUIRED_FIELDS; } | @Test(expected = BadRequestException.class) public void testNihCallbackBadRequest() throws Exception { when(nihApi.nihCallback(any())).thenThrow(new ApiException(400, "Bad Request")); service.postNihCallback(new FirecloudJWTWrapper()); }
@Test(expected = ServerErrorException.class) public void testNihCallbackServerError() throws Exception { when(nihApi.nihCallback(any())).thenThrow(new ApiException(500, "Internal Server Error")); service.postNihCallback(new FirecloudJWTWrapper()); }
@Test public void testNihCallback() throws Exception { FirecloudJWTWrapper jwt = new FirecloudJWTWrapper().jwt("asdf"); service.postNihCallback(jwt); verify(nihApi, times(1)).nihCallback(jwt); } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findCriteriaAutoCompleteMatchesSynonyms() { DbCriteria criteria = DbCriteria.builder() .addDomainId(DomainType.MEASUREMENT.toString()) .addType(CriteriaType.LOINC.toString()) .addCount(0L) .addHierarchy(true) .addStandard(true) .addSynonyms("LP12*[MEASUREMENT_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaAutoComplete( 1L, DomainType.MEASUREMENT.toString(), "LP12", CriteriaType.LOINC.toString(), true, null) .getBody() .getItems() .get(0)); }
@Test public void findCriteriaAutoCompleteMatchesCode() { DbCriteria criteria = DbCriteria.builder() .addDomainId(DomainType.MEASUREMENT.toString()) .addType(CriteriaType.LOINC.toString()) .addCount(0L) .addHierarchy(true) .addStandard(true) .addCode("LP123") .addSynonyms("+[MEASUREMENT_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaAutoComplete( 1L, DomainType.MEASUREMENT.toString(), "LP12", CriteriaType.LOINC.toString(), true, null) .getBody() .getItems() .get(0)); }
@Test public void findCriteriaAutoCompleteSnomed() { DbCriteria criteria = DbCriteria.builder() .addDomainId(DomainType.CONDITION.toString()) .addType(CriteriaType.SNOMED.toString()) .addCount(0L) .addHierarchy(true) .addStandard(true) .addSynonyms("LP12*[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaAutoComplete( 1L, DomainType.CONDITION.toString(), "LP12", CriteriaType.SNOMED.toString(), true, null) .getBody() .getItems() .get(0)); }
@Test public void findCriteriaAutoCompleteExceptions() { try { controller.findCriteriaAutoComplete(1L, null, "blah", null, null, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid domain. null is not valid.", bre.getMessage()); } try { controller.findCriteriaAutoComplete(1L, "blah", "blah", "blah", null, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid domain. blah is not valid.", bre.getMessage()); } try { controller.findCriteriaAutoComplete( 1L, DomainType.CONDITION.toString(), "blah", "blah", null, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid type. blah is not valid.", bre.getMessage()); } } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findCriteriaByDomainAndSearchTermMatchesSourceCode() { DbCriteria criteria = DbCriteria.builder() .addCode("001") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.CONDITION.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.ICD9CM.toString()) .addAttribute(Boolean.FALSE) .addStandard(false) .addSynonyms("[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.CONDITION.name(), "001", null) .getBody() .getItems() .get(0)); }
@Test public void findCriteriaByDomainAndSearchTermLikeSourceCode() { DbCriteria criteria = DbCriteria.builder() .addCode("00") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.CONDITION.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.ICD9CM.toString()) .addAttribute(Boolean.FALSE) .addStandard(false) .addSynonyms("+[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); List<Criteria> results = controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.CONDITION.name(), "00", null) .getBody() .getItems(); assertEquals(1, results.size()); assertEquals(createResponseCriteria(criteria), results.get(0)); }
@Test public void findCriteriaByDomainAndSearchTermDrugMatchesStandardCodeBrand() { DbCriteria criteria1 = DbCriteria.builder() .addCode("672535") .addCount(-1L) .addConceptId("19001487") .addDomainId(DomainType.DRUG.toString()) .addGroup(Boolean.FALSE) .addSelectable(Boolean.TRUE) .addName("4-Way") .addParentId(0) .addType(CriteriaType.BRAND.toString()) .addAttribute(Boolean.FALSE) .addStandard(true) .addSynonyms("[DRUG_rank1]") .build(); cbCriteriaDao.save(criteria1); List<Criteria> results = controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.DRUG.name(), "672535", null) .getBody() .getItems(); assertEquals(1, results.size()); assertEquals(createResponseCriteria(criteria1), results.get(0)); }
@Test public void findCriteriaByDomainAndSearchTermMatchesStandardCode() { DbCriteria criteria = DbCriteria.builder() .addCode("LP12") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.CONDITION.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.LOINC.toString()) .addAttribute(Boolean.FALSE) .addStandard(true) .addSynonyms("[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.CONDITION.name(), "LP12", null) .getBody() .getItems() .get(0)); }
@Test public void findCriteriaByDomainAndSearchTermMatchesSynonyms() { DbCriteria criteria = DbCriteria.builder() .addCode("001") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.CONDITION.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.LOINC.toString()) .addAttribute(Boolean.FALSE) .addStandard(true) .addSynonyms("LP12*[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.CONDITION.name(), "LP12", null) .getBody() .getItems() .get(0)); }
@Test public void findCriteriaByDomainAndSearchTermDrugMatchesSynonyms() { jdbcTemplate.execute( "create table cb_criteria_relationship(concept_id_1 integer, concept_id_2 integer)"); DbCriteria criteria = DbCriteria.builder() .addCode("001") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.DRUG.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.ATC.toString()) .addAttribute(Boolean.FALSE) .addStandard(true) .addSynonyms("LP12*[DRUG_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.DRUG.name(), "LP12", null) .getBody() .getItems() .get(0)); jdbcTemplate.execute("drop table cb_criteria_relationship"); } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId( Long cdrVersionId, String domain, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findStandardCriteriaByDomainAndConceptId(domain, conceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findStandardCriteriaByDomainAndConceptId() { jdbcTemplate.execute( "create table cb_criteria_relationship(concept_id_1 integer, concept_id_2 integer)"); jdbcTemplate.execute( "insert into cb_criteria_relationship(concept_id_1, concept_id_2) values (12345, 1)"); DbCriteria criteria = DbCriteria.builder() .addDomainId(DomainType.CONDITION.toString()) .addType(CriteriaType.ICD10CM.toString()) .addStandard(true) .addCount(1L) .addConceptId("1") .addSynonyms("[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findStandardCriteriaByDomainAndConceptId(1L, DomainType.CONDITION.toString(), 12345L) .getBody() .getItems() .get(0)); jdbcTemplate.execute("drop table cb_criteria_relationship"); } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue( Long cdrVersionId, String value, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findDrugBrandOrIngredientByValue(value, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findDrugBrandOrIngredientByName() { DbCriteria drugATCCriteria = DbCriteria.builder() .addDomainId(DomainType.DRUG.toString()) .addType(CriteriaType.ATC.toString()) .addParentId(0L) .addCode("LP12345") .addName("drugName") .addConceptId("12345") .addGroup(true) .addSelectable(true) .addCount(12L) .build(); cbCriteriaDao.save(drugATCCriteria); DbCriteria drugBrandCriteria = DbCriteria.builder() .addDomainId(DomainType.DRUG.toString()) .addType(CriteriaType.BRAND.toString()) .addParentId(0L) .addCode("LP6789") .addName("brandName") .addConceptId("1235") .addGroup(true) .addSelectable(true) .addCount(33L) .build(); cbCriteriaDao.save(drugBrandCriteria); assertEquals( createResponseCriteria(drugATCCriteria), controller.findDrugBrandOrIngredientByValue(1L, "drugN", null).getBody().getItems().get(0)); assertEquals( createResponseCriteria(drugBrandCriteria), controller .findDrugBrandOrIngredientByValue(1L, "brandN", null) .getBody() .getItems() .get(0)); assertEquals( createResponseCriteria(drugBrandCriteria), controller .findDrugBrandOrIngredientByValue(1L, "LP6789", null) .getBody() .getItems() .get(0)); } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId( Long cdrVersionId, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaAttributeListResponse() .items(cohortBuilderService.findCriteriaAttributeByConceptId(conceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findCriteriaAttributeByConceptId() { DbCriteriaAttribute criteriaAttributeMin = cbCriteriaAttributeDao.save( DbCriteriaAttribute.builder() .addConceptId(1L) .addConceptName("MIN") .addEstCount("10") .addType("NUM") .addValueAsConceptId(0L) .build()); DbCriteriaAttribute criteriaAttributeMax = cbCriteriaAttributeDao.save( DbCriteriaAttribute.builder() .addConceptId(1L) .addConceptName("MAX") .addEstCount("100") .addType("NUM") .addValueAsConceptId(0L) .build()); List<CriteriaAttribute> attrs = controller .findCriteriaAttributeByConceptId(1L, criteriaAttributeMin.getConceptId()) .getBody() .getItems(); assertTrue(attrs.contains(createResponseCriteriaAttribute(criteriaAttributeMin))); assertTrue(attrs.contains(createResponseCriteriaAttribute(criteriaAttributeMax))); } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok(cohortBuilderService.findParticipantDemographics()); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findParticipantDemographics() { cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.GENDER.toString()) .addName("Male") .addStandard(true) .addConceptId("1") .addParentId(1) .build()); cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.RACE.toString()) .addName("African American") .addStandard(true) .addConceptId("2") .addParentId(1) .build()); cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.ETHNICITY.toString()) .addName("Not Hispanic or Latino") .addStandard(true) .addConceptId("3") .addParentId(1) .build()); cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.SEX.toString()) .addName("Male") .addStandard(true) .addConceptId("4") .addParentId(1) .build()); ParticipantDemographics demos = controller.findParticipantDemographics(1L).getBody(); assertEquals( new ConceptIdName().conceptId(1L).conceptName("Male"), demos.getGenderList().get(0)); assertEquals( new ConceptIdName().conceptId(2L).conceptName("African American"), demos.getRaceList().get(0)); assertEquals( new ConceptIdName().conceptId(3L).conceptName("Not Hispanic or Latino"), demos.getEthnicityList().get(0)); assertEquals( new ConceptIdName().conceptId(4L).conceptName("Male"), demos.getSexAtBirthList().get(0)); } |
CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId( Long cdrVersionId, Long surveyConceptId, Long questionConceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new SurveyVersionListResponse() .items( cohortBuilderService.findSurveyVersionByQuestionConceptId( surveyConceptId, questionConceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void findSurveyVersionByQuestionConceptId() { jdbcTemplate.execute( "create table cb_survey_version(survey_id integer, concept_id integer, version varchar(50), display_order integer)"); jdbcTemplate.execute( "create table cb_survey_attribute(id integer, question_concept_id integer, answer_concept_id integer, survey_id integer, item_count integer)"); jdbcTemplate.execute( "insert into cb_survey_version(survey_id, concept_id, version, display_order) values (100, 1333342, 'May 2020', 1)"); jdbcTemplate.execute( "insert into cb_survey_version(survey_id, concept_id, version, display_order) values (101, 1333342, 'June 2020', 2)"); jdbcTemplate.execute( "insert into cb_survey_version(survey_id, concept_id, version, display_order) values (102, 1333342, 'July 2020', 3)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (1, 715713, 0, 100, 291)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (2, 715713, 0, 101, 148)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (3, 715713, 0, 102, 150)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (4, 715713, 903096, 100, 154)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (5, 715713, 903096, 101, 82)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (6, 715713, 903096, 102, 31)"); SurveyVersionListResponse response = controller.findSurveyVersionByQuestionConceptId(1L, 1333342L, 715713L).getBody(); assertEquals(response.getItems().get(0).getSurveyId(), new Long("100")); assertEquals(response.getItems().get(0).getVersion(), "May 2020"); assertEquals(response.getItems().get(0).getItemCount(), new Long("291")); assertEquals(response.getItems().get(1).getSurveyId(), new Long("101")); assertEquals(response.getItems().get(1).getVersion(), "June 2020"); assertEquals(response.getItems().get(1).getItemCount(), new Long("148")); assertEquals(response.getItems().get(2).getSurveyId(), new Long("102")); assertEquals(response.getItems().get(2).getVersion(), "July 2020"); assertEquals(response.getItems().get(2).getItemCount(), new Long("150")); jdbcTemplate.execute("drop table cb_survey_version"); jdbcTemplate.execute("drop table cb_survey_attribute"); } |
CohortBuilderController implements CohortBuilderApiDelegate { protected boolean isApproximate(SearchRequest request) { List<SearchGroup> allGroups = ImmutableList.copyOf(Iterables.concat(request.getIncludes(), request.getExcludes())); List<SearchParameter> allParams = allGroups.stream() .flatMap(sg -> sg.getItems().stream()) .flatMap(sgi -> sgi.getSearchParameters().stream()) .collect(Collectors.toList()); return allGroups.stream().anyMatch(SearchGroup::getTemporal) || allParams.stream().anyMatch(sp -> CriteriaSubType.BP.toString().equals(sp.getSubtype())); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | @Test public void isApproximate() { SearchParameter inSearchParameter = new SearchParameter(); SearchParameter exSearchParameter = new SearchParameter(); SearchGroupItem inSearchGroupItem = new SearchGroupItem().addSearchParametersItem(inSearchParameter); SearchGroupItem exSearchGroupItem = new SearchGroupItem().addSearchParametersItem(exSearchParameter); SearchGroup inSearchGroup = new SearchGroup().addItemsItem(inSearchGroupItem); SearchGroup exSearchGroup = new SearchGroup().addItemsItem(exSearchGroupItem); SearchRequest searchRequest = new SearchRequest().addIncludesItem(inSearchGroup).addExcludesItem(exSearchGroup); inSearchGroup.temporal(true); assertTrue(controller.isApproximate(searchRequest)); inSearchGroup.temporal(false); inSearchParameter.subtype(CriteriaSubType.BP.toString()); assertTrue(controller.isApproximate(searchRequest)); inSearchParameter.type(CriteriaType.DECEASED.toString()); assertTrue(controller.isApproximate(searchRequest)); inSearchGroup.temporal(true); inSearchParameter.subtype(CriteriaSubType.BP.toString()); assertTrue(controller.isApproximate(searchRequest)); inSearchGroup.temporal(false); inSearchParameter.type(CriteriaType.ETHNICITY.toString()).subtype(null); assertFalse(controller.isApproximate(searchRequest)); exSearchGroup.temporal(true); assertTrue(controller.isApproximate(searchRequest)); exSearchGroup.temporal(false); exSearchParameter.subtype(CriteriaSubType.BP.toString()); assertTrue(controller.isApproximate(searchRequest)); exSearchParameter.type(CriteriaType.DECEASED.toString()); assertTrue(controller.isApproximate(searchRequest)); exSearchGroup.temporal(true); exSearchParameter.subtype(CriteriaSubType.BP.toString()); assertTrue(controller.isApproximate(searchRequest)); } |
UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | @Test public void testGetUserRecentResourceFromRawBucket() { dbUserRecentResource1.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), "notebook.ipynb"); }
@Test public void testGetUserRecentResourceWithDuplicatedNameInPath() { dbUserRecentResource1.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals( recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), "nb.ipynb"); }
@Test public void testGetUserRecentResourceWithSpacesInPath() { dbUserRecentResource1.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), "My favorite notebook.ipynb"); }
@Test public void testGetUserRecentResourceInvalidURINotebookPath() { dbUserRecentResource1.setNotebookName("my local notebook directory: notebook.ipynb"); when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(recentResources.size(), 0); }
@Test public void testGetUserRecentResourceNotebookPathEndsWithSlash() { dbUserRecentResource1.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertNotNull(recentResources.get(0).getNotebook()); assertEquals( recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), ""); }
@Test public void testGetUserRecentResourceNonexistentNotebook() { dbUserRecentResource1.setNotebookName("gs: dbUserRecentResource2.setCohort(null); dbUserRecentResource2.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(ImmutableList.of(dbUserRecentResource1, dbUserRecentResource2)); when(mockCloudStorageService.getExistingBlobIdsIn(anyList())) .thenReturn(ImmutableSet.of(BlobId.of("bkt", "notebooks/notebook.ipynb"))); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(recentResources.size(), 1); assertNotNull(recentResources.get(0).getNotebook()); assertEquals(recentResources.get(0).getNotebook().getName(), "notebook.ipynb"); }
@Test public void testGetUserRecentResource() { WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(3, recentResources.size()); assertNull(recentResources.get(0).getCohort()); assertEquals(recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), "notebook1.ipynb"); assertNotNull(recentResources.get(1).getCohort()); assertEquals(recentResources.get(1).getCohort().getName(), "Cohort Name"); } |
FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); static final List<String> FIRECLOUD_API_OAUTH_SCOPES; static final List<String> FIRECLOUD_WORKSPACE_REQUIRED_FIELDS; } | @Test public void testCreateAllOfUsBillingProject() throws Exception { workbenchConfig.featureFlags.enableVpcFlowLogs = false; workbenchConfig.featureFlags.enableVpcServicePerimeter = false; workbenchConfig.firecloud.vpcServicePerimeterName = "this will be ignored"; service.createAllOfUsBillingProject("project-name"); ArgumentCaptor<FirecloudCreateRawlsBillingProjectFullRequest> captor = ArgumentCaptor.forClass(FirecloudCreateRawlsBillingProjectFullRequest.class); verify(billingApi).createBillingProjectFull(captor.capture()); FirecloudCreateRawlsBillingProjectFullRequest request = captor.getValue(); assertThat(request.getProjectName()).isEqualTo("project-name"); assertThat(request.getBillingAccount()).isEqualTo("billingAccounts/test-billing-account"); assertThat(request.getEnableFlowLogs()).isFalse(); assertThat(request.getHighSecurityNetwork()).isFalse(); assertThat(request.getServicePerimeter()).isNull(); }
@Test public void testVpcFlowLogsParams() throws Exception { workbenchConfig.featureFlags.enableVpcFlowLogs = true; service.createAllOfUsBillingProject("project-name"); ArgumentCaptor<FirecloudCreateRawlsBillingProjectFullRequest> captor = ArgumentCaptor.forClass(FirecloudCreateRawlsBillingProjectFullRequest.class); verify(billingApi).createBillingProjectFull(captor.capture()); FirecloudCreateRawlsBillingProjectFullRequest request = captor.getValue(); assertThat(request.getEnableFlowLogs()).isTrue(); assertThat(request.getHighSecurityNetwork()).isTrue(); }
@Test public void testVpcServicePerimeterParams() throws Exception { String servicePerimeter = "a-cloud-with-a-fence-around-it"; workbenchConfig.featureFlags.enableVpcServicePerimeter = true; workbenchConfig.firecloud.vpcServicePerimeterName = servicePerimeter; service.createAllOfUsBillingProject("project-name"); ArgumentCaptor<FirecloudCreateRawlsBillingProjectFullRequest> captor = ArgumentCaptor.forClass(FirecloudCreateRawlsBillingProjectFullRequest.class); verify(billingApi).createBillingProjectFull(captor.capture()); FirecloudCreateRawlsBillingProjectFullRequest request = captor.getValue(); assertThat(request.getServicePerimeter()).isEqualTo(servicePerimeter); } |
UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResource> updateRecentResource( String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest) { long wId = getWorkspaceId(workspaceNamespace, workspaceId); String notebookPath; if (recentResourceRequest.getNotebookName().startsWith("gs: notebookPath = recentResourceRequest.getNotebookName(); } else { String bucket = fireCloudService .getWorkspace(workspaceNamespace, workspaceId) .getWorkspace() .getBucketName(); notebookPath = "gs: } DbUserRecentResource recentResource = userRecentResourceService.updateNotebookEntry( wId, userProvider.get().getUserId(), notebookPath); return ResponseEntity.ok(TO_CLIENT.apply(recentResource)); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | @Test public void testUpdateRecentResource() { Timestamp now = new Timestamp(fakeClock.instant().toEpochMilli()); DbUserRecentResource mockUserRecentResource = new DbUserRecentResource(); mockUserRecentResource.setCohort(null); mockUserRecentResource.setWorkspaceId(dbWorkspace2.getWorkspaceId()); mockUserRecentResource.setUserId(dbUser.getUserId()); mockUserRecentResource.setNotebookName("gs: mockUserRecentResource.setLastAccessDate(now); when(mockUserRecentResourceService.updateNotebookEntry( dbWorkspace2.getWorkspaceId(), dbUser.getUserId(), "gs: .thenReturn(mockUserRecentResource); RecentResourceRequest request = new RecentResourceRequest(); request.setNotebookName("gs: WorkspaceResource addedEntry = userMetricsController .updateRecentResource( dbWorkspace2.getWorkspaceNamespace(), dbWorkspace2.getFirecloudName(), request) .getBody(); assertNotNull(addedEntry); assertEquals((long) addedEntry.getWorkspaceId(), dbWorkspace2.getWorkspaceId()); assertNull(addedEntry.getCohort()); assertNotNull(addedEntry.getNotebook()); assertEquals(addedEntry.getNotebook().getName(), "notebook.ipynb"); assertEquals(addedEntry.getNotebook().getPath(), "gs: } |
UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | @Test public void testHasValidBlobIdIfNotebookNamePresent_nullNotebookName_passes() { dbUserRecentResource1.setNotebookName(null); assertTrue(userMetricsController.hasValidBlobIdIfNotebookNamePresent(dbUserRecentResource1)); }
@Test public void testHasValidBlobIdIfNotebookNamePresent_validNotebookName_passes() { assertTrue(userMetricsController.hasValidBlobIdIfNotebookNamePresent(dbUserRecentResource1)); }
@Test public void testHasValidBlobIdIfNotebookNamePresent_invalidNotebookName_fails() { dbUserRecentResource1.setNotebookName("invalid-notebook@name"); assertFalse(userMetricsController.hasValidBlobIdIfNotebookNamePresent(dbUserRecentResource1)); } |
ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test(expected = BadRequestException.class) public void testCreateAccount_invitationKeyMismatch() { createAccountAndDbUserWithAffiliation(); config.access.requireInvitationKey = true; when(mockCloudStorageService.readInvitationKey()).thenReturn("BLAH"); profileController.createAccount(createAccountRequest); }
@Test(expected = BadRequestException.class) public void testCreateAccount_invalidCaptchaToken() { createAccountAndDbUserWithAffiliation(); createAccountRequest.setCaptchaVerificationToken(WRONG_CAPTCHA_TOKEN); profileController.createAccount(createAccountRequest); }
@Test public void testCreateAccount_noRequireInvitationKey() { createAccountAndDbUserWithAffiliation(); config.access.requireInvitationKey = false; when(mockCloudStorageService.readInvitationKey()).thenReturn("BLAH"); profileController.createAccount(createAccountRequest); } |
ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> invitationKeyVerification( InvitationVerificationRequest invitationVerificationRequest) { verifyInvitationKey(invitationVerificationRequest.getInvitationKey()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test(expected = BadRequestException.class) public void testInvitationKeyVerification_invitationKeyMismatch() { invitationVerificationRequest.setInvitationKey("wrong key"); profileController.invitationKeyVerification(invitationVerificationRequest); } |
ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test public void testSubmitDataUseAgreement_success() { createAccountAndDbUserWithAffiliation(); String duaInitials = "NIH"; assertThat(profileController.submitDataUseAgreement(DUA_VERSION, duaInitials).getStatusCode()) .isEqualTo(HttpStatus.OK); List<DbUserDataUseAgreement> dbUserDataUseAgreementList = userDataUseAgreementDao.findByUserIdOrderByCompletionTimeDesc(dbUser.getUserId()); assertThat(dbUserDataUseAgreementList.size()).isEqualTo(1); DbUserDataUseAgreement dbUserDataUseAgreement = dbUserDataUseAgreementList.get(0); assertThat(dbUserDataUseAgreement.getUserFamilyName()).isEqualTo(dbUser.getFamilyName()); assertThat(dbUserDataUseAgreement.getUserGivenName()).isEqualTo(dbUser.getGivenName()); assertThat(dbUserDataUseAgreement.getUserInitials()).isEqualTo(duaInitials); assertThat(dbUserDataUseAgreement.getDataUseAgreementSignedVersion()).isEqualTo(DUA_VERSION); }
@Test(expected = BadRequestException.class) public void testSubmitDataUseAgreement_wrongVersion() { createAccountAndDbUserWithAffiliation(); String duaInitials = "NIH"; profileController.submitDataUseAgreement(DUA_VERSION - 1, duaInitials); } |
ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test public void testMe_success() { createAccountAndDbUserWithAffiliation(); Profile profile = profileController.getMe().getBody(); assertProfile( profile, PRIMARY_EMAIL, CONTACT_EMAIL, FAMILY_NAME, GIVEN_NAME, DataAccessLevel.UNREGISTERED, TIMESTAMP, false); verify(mockFireCloudService).registerUser(CONTACT_EMAIL, GIVEN_NAME, FAMILY_NAME); verify(mockProfileAuditor).fireLoginAction(dbUser); }
@Test public void testMe_userBeforeNotLoggedInSuccess() { createAccountAndDbUserWithAffiliation(); Profile profile = profileController.getMe().getBody(); assertProfile( profile, PRIMARY_EMAIL, CONTACT_EMAIL, FAMILY_NAME, GIVEN_NAME, DataAccessLevel.UNREGISTERED, TIMESTAMP, false); verify(mockFireCloudService).registerUser(CONTACT_EMAIL, GIVEN_NAME, FAMILY_NAME); fakeClock.increment(1); profile = profileController.getMe().getBody(); assertProfile( profile, PRIMARY_EMAIL, CONTACT_EMAIL, FAMILY_NAME, GIVEN_NAME, DataAccessLevel.UNREGISTERED, TIMESTAMP, false); } |
ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test(expected = NotFoundException.class) public void updateVerifiedInstitutionalAffiliation_noSuchInstitution() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation original = createVerifiedInstitutionalAffiliation(); createAccountAndDbUserWithAffiliation(original, grantAdminAuthority); final VerifiedInstitutionalAffiliation newAffil = new VerifiedInstitutionalAffiliation() .institutionShortName("NotTheBroad") .institutionDisplayName("The Narrow Institute?") .institutionalRoleEnum(InstitutionalRole.PRE_DOCTORAL); profileController.updateVerifiedInstitutionalAffiliation(dbUser.getUserId(), newAffil); }
@Test public void updateVerifiedInstitutionalAffiliation_update() { boolean grantAdminAuthority = true; VerifiedInstitutionalAffiliation verifiedInstitutionalAffiliation = createVerifiedInstitutionalAffiliation(); createAccountAndDbUserWithAffiliation(verifiedInstitutionalAffiliation, grantAdminAuthority); verifiedInstitutionalAffiliation.setInstitutionalRoleEnum(InstitutionalRole.ADMIN); profileController.updateVerifiedInstitutionalAffiliation( dbUser.getUserId(), verifiedInstitutionalAffiliation); Profile updatedProfile = profileService.getProfile(dbUser); assertThat(updatedProfile.getVerifiedInstitutionalAffiliation()) .isEqualTo(verifiedInstitutionalAffiliation); }
@Test(expected = BadRequestException.class) public void updateVerifiedInstitutionalAffiliation_removeForbidden() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation original = createVerifiedInstitutionalAffiliation(); createAccountAndDbUserWithAffiliation(original, grantAdminAuthority); profileController.updateVerifiedInstitutionalAffiliation(dbUser.getUserId(), null); } |
ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test public void updateContactEmail_forbidden() { createAccountAndDbUserWithAffiliation(); dbUser.setFirstSignInTime(TIMESTAMP); String originalEmail = dbUser.getContactEmail(); ResponseEntity<Void> response = profileController.updateContactEmail( new UpdateContactEmailRequest() .contactEmail("[email protected]") .username(dbUser.getUsername()) .creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); assertThat(dbUser.getContactEmail()).isEqualTo(originalEmail); }
@Test public void updateContactEmail_badRequest() { createAccountAndDbUserWithAffiliation(); when(mockDirectoryService.resetUserPassword(anyString())).thenReturn(googleUser); dbUser.setFirstSignInTime(null); String originalEmail = dbUser.getContactEmail(); ResponseEntity<Void> response = profileController.updateContactEmail( new UpdateContactEmailRequest() .contactEmail("bad email address *(SD&(*D&F&*(DS ") .username(dbUser.getUsername()) .creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); assertThat(dbUser.getContactEmail()).isEqualTo(originalEmail); }
@Test public void updateContactEmail_OK() { createAccountAndDbUserWithAffiliation(); dbUser.setFirstSignInTime(null); when(mockDirectoryService.resetUserPassword(anyString())).thenReturn(googleUser); ResponseEntity<Void> response = profileController.updateContactEmail( new UpdateContactEmailRequest() .contactEmail("[email protected]") .username(dbUser.getUsername()) .creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); assertThat(dbUser.getContactEmail()).isEqualTo("[email protected]"); } |
ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test public void resendWelcomeEmail_messagingException() throws MessagingException { createAccountAndDbUserWithAffiliation(); dbUser.setFirstSignInTime(null); when(mockDirectoryService.resetUserPassword(anyString())).thenReturn(googleUser); doThrow(new MessagingException("exception")) .when(mockMailService) .sendWelcomeEmail(any(), any(), any()); ResponseEntity<Void> response = profileController.resendWelcomeEmail( new ResendWelcomeEmailRequest().username(dbUser.getUsername()).creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR); verify(mockMailService, times(2)).sendWelcomeEmail(any(), any(), any()); verify(mockDirectoryService, times(1)).resetUserPassword(anyString()); }
@Test public void resendWelcomeEmail_OK() throws MessagingException { createAccountAndDbUserWithAffiliation(); when(mockDirectoryService.resetUserPassword(anyString())).thenReturn(googleUser); doNothing().when(mockMailService).sendWelcomeEmail(any(), any(), any()); ResponseEntity<Void> response = profileController.resendWelcomeEmail( new ResendWelcomeEmailRequest().username(dbUser.getUsername()).creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); verify(mockMailService, times(2)).sendWelcomeEmail(any(), any(), any()); verify(mockDirectoryService, times(1)).resetUserPassword(anyString()); } |
ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test public void testUpdateNihToken() { config.featureFlags.useNewShibbolethService = false; NihToken nihToken = new NihToken().jwt("test"); FirecloudJWTWrapper firecloudJwt = new FirecloudJWTWrapper().jwt("test"); createAccountAndDbUserWithAffiliation(); profileController.updateNihToken(nihToken); verify(mockFireCloudService).postNihCallback(eq(firecloudJwt)); }
@Test(expected = ServerErrorException.class) public void testUpdateNihToken_serverError() { config.featureFlags.useNewShibbolethService = false; doThrow(new ServerErrorException()).when(mockFireCloudService).postNihCallback(any()); profileController.updateNihToken(new NihToken().jwt("test")); }
@Test public void testUpdateNihToken_newShibbolethService() { config.featureFlags.useNewShibbolethService = true; NihToken nihToken = new NihToken().jwt("test"); String jwt = "test"; createAccountAndDbUserWithAffiliation(); profileController.updateNihToken(nihToken); verify(shibbolethService).updateShibbolethToken(eq(jwt)); }
@Test(expected = BadRequestException.class) public void testUpdateNihToken_badRequest_1() { profileController.updateNihToken(null); }
@Test(expected = BadRequestException.class) public void testUpdateNihToken_badRequest_noJwt() { profileController.updateNihToken(new NihToken()); } |
BillingProjectBufferService implements GaugeDataCollector { public void bufferBillingProjects() { int creationAttempts = this.workbenchConfigProvider.get().billing.bufferRefillProjectsPerTask; for (int i = 0; i < creationAttempts; i++) { bufferBillingProject(); } } @Autowired BillingProjectBufferService(
BillingProjectBufferEntryDao billingProjectBufferEntryDao,
Clock clock,
FireCloudService fireCloudService,
Provider<WorkbenchConfig> workbenchConfigProvider); void bufferBillingProjects(); @Override Collection<MeasurementBundle> getGaugeData(); void syncBillingProjectStatus(); void cleanBillingBuffer(); DbBillingProjectBufferEntry assignBillingProject(DbUser dbUser); BillingProjectBufferStatus getStatus(); } | @Test public void canBufferMultipleProjectsPerTask() { workbenchConfig.billing.bufferRefillProjectsPerTask = 2; billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times(2)).createAllOfUsBillingProject(anyString()); }
@Test public void fillBuffer() { billingProjectBufferService.bufferBillingProjects(); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); verify(mockFireCloudService).createAllOfUsBillingProject(captor.capture()); String billingProjectName = captor.getValue(); assertThat(billingProjectName).startsWith(workbenchConfig.billing.projectNamePrefix); assertThat( billingProjectBufferEntryDao .findByFireCloudProjectName(billingProjectName) .getStatusEnum()) .isEqualTo(BufferEntryStatus.CREATING); }
@Test public void fillBuffer_failedCreateRequest() { long expectedCount = billingProjectBufferEntryDao.count() + 1; doThrow(RuntimeException.class) .when(mockFireCloudService) .createAllOfUsBillingProject(anyString()); try { billingProjectBufferService.bufferBillingProjects(); } catch (Exception e) { } assertThat(billingProjectBufferEntryDao.count()).isEqualTo(expectedCount); }
@Test public void fillBuffer_prefixName() { workbenchConfig.billing.projectNamePrefix = "test-prefix-"; billingProjectBufferService.bufferBillingProjects(); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); verify(mockFireCloudService).createAllOfUsBillingProject(captor.capture()); String billingProjectName = captor.getValue(); assertThat(billingProjectName).doesNotContain("--"); }
@Test public void fillBuffer_capacity() { for (int i = 0; i < BUFFER_CAPACITY; i++) { billingProjectBufferService.bufferBillingProjects(); } int expectedCallCount = 0; billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY + expectedCallCount)) .createAllOfUsBillingProject(anyString()); DbBillingProjectBufferEntry entry = billingProjectBufferEntryDao.findAll().iterator().next(); entry.setStatusEnum(BufferEntryStatus.ASSIGNED, this::getCurrentTimestamp); billingProjectBufferEntryDao.save(entry); expectedCallCount++; billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY + expectedCallCount)) .createAllOfUsBillingProject(anyString()); expectedCallCount++; workbenchConfig.billing.bufferCapacity = (int) BUFFER_CAPACITY + 1; billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY + expectedCallCount)) .createAllOfUsBillingProject(anyString()); billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY + expectedCallCount)) .createAllOfUsBillingProject(anyString()); }
@Test public void fillBuffer_decreaseCapacity() { for (int i = 0; i < BUFFER_CAPACITY; i++) { billingProjectBufferService.bufferBillingProjects(); } workbenchConfig.billing.bufferCapacity = (int) BUFFER_CAPACITY - 2; billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY)) .createAllOfUsBillingProject(anyString()); Iterator<DbBillingProjectBufferEntry> bufferEntries = billingProjectBufferEntryDao.findAll().iterator(); DbBillingProjectBufferEntry entry = bufferEntries.next(); entry.setStatusEnum(BufferEntryStatus.ASSIGNED, this::getCurrentTimestamp); billingProjectBufferEntryDao.save(entry); billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY)) .createAllOfUsBillingProject(anyString()); entry = bufferEntries.next(); entry.setStatusEnum(BufferEntryStatus.ASSIGNED, this::getCurrentTimestamp); billingProjectBufferEntryDao.save(entry); billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY)) .createAllOfUsBillingProject(anyString()); entry = bufferEntries.next(); entry.setStatusEnum(BufferEntryStatus.ASSIGNED, this::getCurrentTimestamp); billingProjectBufferEntryDao.save(entry); billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY + 1)) .createAllOfUsBillingProject(anyString()); } |
ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> syncEraCommonsStatus() { userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test public void testSyncEraCommons() { FirecloudNihStatus nihStatus = new FirecloudNihStatus(); String linkedUsername = "linked"; nihStatus.setLinkedNihUsername(linkedUsername); nihStatus.setLinkExpireTime(TIMESTAMP.getTime()); when(mockFireCloudService.getNihStatus()).thenReturn(nihStatus); createAccountAndDbUserWithAffiliation(); profileController.syncEraCommonsStatus(); assertThat(userDao.findUserByUsername(PRIMARY_EMAIL).getEraCommonsLinkedNihUsername()) .isEqualTo(linkedUsername); assertThat(userDao.findUserByUsername(PRIMARY_EMAIL).getEraCommonsLinkExpireTime()).isNotNull(); assertThat(userDao.findUserByUsername(PRIMARY_EMAIL).getEraCommonsCompletionTime()).isNotNull(); } |
ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> deleteProfile() { if (!workbenchConfigProvider.get().featureFlags.unsafeAllowDeleteUser) { throw new ForbiddenException("Self account deletion is disallowed in this environment."); } DbUser user = userProvider.get(); log.log(Level.WARNING, "Deleting profile: user email: " + user.getUsername()); directoryService.deleteUser(user.getUsername()); userDao.delete(user.getUserId()); profileAuditor.fireDeleteAction(user.getUserId(), user.getUsername()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test public void testDeleteProfile() { createAccountAndDbUserWithAffiliation(); profileController.deleteProfile(); verify(mockProfileAuditor).fireDeleteAction(dbUser.getUserId(), dbUser.getUsername()); } |
ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<EmptyResponse> bypassAccessRequirement( Long userId, AccessBypassRequest request) { userService.updateBypassTime(userId, request); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test public void testBypassAccessModule() { Profile profile = createAccountAndDbUserWithAffiliation(); profileController.bypassAccessRequirement( profile.getUserId(), new AccessBypassRequest().isBypassed(true).moduleName(AccessModule.DATA_USE_AGREEMENT)); DbUser dbUser = userDao.findUserByUsername(PRIMARY_EMAIL); assertThat(dbUser.getDataUseAgreementBypassTime()).isNotNull(); } |
ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | @Test(expected = NotFoundException.class) public void test_updateAccountProperties_null_user() { profileService.updateAccountProperties(new AccountPropertyUpdate()); }
@Test(expected = NotFoundException.class) public void test_updateAccountProperties_user_not_found() { final AccountPropertyUpdate request = new AccountPropertyUpdate().username("not found"); profileService.updateAccountProperties(request); }
@Test public void test_updateAccountProperties_no_change() { final Profile original = createAccountAndDbUserWithAffiliation(); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL); final Profile retrieved = profileService.updateAccountProperties(request); retrieved.setDemographicSurveyCompletionTime(null); assertThat(retrieved).isEqualTo(original); }
@Test public void test_updateAccountProperties_contactEmail() { boolean grantAdminAuthority = true; final String newContactEmail = "[email protected]"; final Institution broadPlus = new Institution() .shortName("Broad") .displayName("The Broad Institute") .emailAddresses(ImmutableList.of(CONTACT_EMAIL, newContactEmail)) .duaTypeEnum(DuaType.RESTRICTED) .organizationTypeEnum(OrganizationType.ACADEMIC_RESEARCH_INSTITUTION); institutionService.createInstitution(broadPlus); final VerifiedInstitutionalAffiliation affiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(broadPlus.getShortName()) .institutionDisplayName(broadPlus.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(affiliation, grantAdminAuthority); assertThat(original.getContactEmail()).isEqualTo(CONTACT_EMAIL); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).contactEmail(newContactEmail); final Profile retrieved = profileService.updateAccountProperties(request); assertThat(retrieved.getContactEmail()).isEqualTo(newContactEmail); verify(mockProfileAuditor).fireUpdateAction(original, retrieved); }
@Test(expected = BadRequestException.class) public void test_updateAccountProperties_contactEmail_user() { boolean grantAdminAuthority = false; final String newContactEmail = "[email protected]"; final Institution broadPlus = new Institution() .shortName("Broad") .displayName("The Broad Institute") .emailAddresses(ImmutableList.of(CONTACT_EMAIL, newContactEmail)) .duaTypeEnum(DuaType.RESTRICTED) .organizationTypeEnum(OrganizationType.ACADEMIC_RESEARCH_INSTITUTION); institutionService.createInstitution(broadPlus); final VerifiedInstitutionalAffiliation affiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(broadPlus.getShortName()) .institutionDisplayName(broadPlus.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(affiliation, grantAdminAuthority); assertThat(original.getContactEmail()).isEqualTo(CONTACT_EMAIL); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).contactEmail(newContactEmail); profileService.updateAccountProperties(request); }
@Test(expected = BadRequestException.class) public void test_updateAccountProperties_contactEmail_no_match() { boolean grantAdminAuthority = true; createAccountAndDbUserWithAffiliation(grantAdminAuthority); final String newContactEmail = "[email protected]"; final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).contactEmail(newContactEmail); profileService.updateAccountProperties(request); }
@Test public void test_updateAccountProperties_newAffiliation() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation expectedOriginalAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName("Broad") .institutionDisplayName("The Broad Institute") .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(grantAdminAuthority); assertThat(original.getVerifiedInstitutionalAffiliation()) .isEqualTo(expectedOriginalAffiliation); final Institution massGeneral = new Institution() .shortName("MGH123") .displayName("Massachusetts General Hospital") .emailAddresses(ImmutableList.of(CONTACT_EMAIL)) .duaTypeEnum(DuaType.RESTRICTED) .organizationTypeEnum(OrganizationType.HEALTH_CENTER_NON_PROFIT); institutionService.createInstitution(massGeneral); final VerifiedInstitutionalAffiliation newAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(massGeneral.getShortName()) .institutionDisplayName(massGeneral.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.POST_DOCTORAL); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).affiliation(newAffiliation); final Profile retrieved = profileService.updateAccountProperties(request); assertThat(retrieved.getVerifiedInstitutionalAffiliation()).isEqualTo(newAffiliation); verify(mockProfileAuditor).fireUpdateAction(original, retrieved); }
@Test(expected = BadRequestException.class) public void test_updateAccountProperties_newAffiliation_no_match() { boolean grantAdminAuthority = true; createAccountAndDbUserWithAffiliation(grantAdminAuthority); final Institution massGeneral = new Institution() .shortName("MGH123") .displayName("Massachusetts General Hospital") .duaTypeEnum(DuaType.MASTER) .emailDomains(ImmutableList.of("mgh.org", "massgeneral.hospital")) .organizationTypeEnum(OrganizationType.HEALTH_CENTER_NON_PROFIT); institutionService.createInstitution(massGeneral); final VerifiedInstitutionalAffiliation newAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(massGeneral.getShortName()) .institutionDisplayName(massGeneral.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.POST_DOCTORAL); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).affiliation(newAffiliation); profileService.updateAccountProperties(request); }
@Test public void test_updateAccountProperties_contactEmail_newAffiliation_self_match() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation expectedOriginalAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName("Broad") .institutionDisplayName("The Broad Institute") .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(grantAdminAuthority); assertThat(original.getContactEmail()).isEqualTo(CONTACT_EMAIL); assertThat(original.getVerifiedInstitutionalAffiliation()) .isEqualTo(expectedOriginalAffiliation); final String newContactEmail = "[email protected]"; final Institution massGeneral = new Institution() .shortName("MGH123") .displayName("Massachusetts General Hospital") .duaTypeEnum(DuaType.MASTER) .emailDomains(ImmutableList.of("mgh.org", "massgeneral.hospital")) .organizationTypeEnum(OrganizationType.HEALTH_CENTER_NON_PROFIT); institutionService.createInstitution(massGeneral); final VerifiedInstitutionalAffiliation newAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(massGeneral.getShortName()) .institutionDisplayName(massGeneral.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.POST_DOCTORAL); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .contactEmail(newContactEmail) .affiliation(newAffiliation); final Profile retrieved = profileService.updateAccountProperties(request); assertThat(retrieved.getContactEmail()).isEqualTo(newContactEmail); assertThat(retrieved.getVerifiedInstitutionalAffiliation()).isEqualTo(newAffiliation); verify(mockProfileAuditor).fireUpdateAction(original, retrieved); }
@Test(expected = BadRequestException.class) public void test_updateAccountProperties_contactEmail_newAffiliation_no_match() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation expectedOriginalAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName("Broad") .institutionDisplayName("The Broad Institute") .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(grantAdminAuthority); assertThat(original.getContactEmail()).isEqualTo(CONTACT_EMAIL); assertThat(original.getVerifiedInstitutionalAffiliation()) .isEqualTo(expectedOriginalAffiliation); final String newContactEmail = "[email protected]"; final Institution massGeneral = new Institution() .shortName("MGH123") .displayName("Massachusetts General Hospital") .duaTypeEnum(DuaType.MASTER) .emailDomains(ImmutableList.of("mgh.org", "massgeneral.hospital")) .organizationTypeEnum(OrganizationType.HEALTH_CENTER_NON_PROFIT); institutionService.createInstitution(massGeneral); final VerifiedInstitutionalAffiliation newAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(massGeneral.getShortName()) .institutionDisplayName(massGeneral.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.POST_DOCTORAL); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .contactEmail(newContactEmail) .affiliation(newAffiliation); profileService.updateAccountProperties(request); }
@Test public void test_updateAccountProperties_no_bypass_requests() { final Profile original = createAccountAndDbUserWithAffiliation(); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .accessBypassRequests(Collections.emptyList()); final Profile retrieved = profileService.updateAccountProperties(request); retrieved.setDemographicSurveyCompletionTime(null); assertThat(retrieved).isEqualTo(original); }
@Test public void test_updateAccountProperties_bypass_requests() { final Profile original = createAccountAndDbUserWithAffiliation(); assertThat(original.getDataUseAgreementBypassTime()).isNull(); assertThat(original.getComplianceTrainingBypassTime()).isNull(); assertThat(original.getBetaAccessBypassTime()).isNull(); assertThat(original.getEraCommonsBypassTime()).isNull(); assertThat(original.getTwoFactorAuthBypassTime()).isNull(); final List<AccessBypassRequest> bypasses1 = ImmutableList.of( new AccessBypassRequest().moduleName(AccessModule.DATA_USE_AGREEMENT).isBypassed(true), new AccessBypassRequest().moduleName(AccessModule.COMPLIANCE_TRAINING).isBypassed(true), new AccessBypassRequest().moduleName(AccessModule.BETA_ACCESS).isBypassed(false)); final AccountPropertyUpdate request1 = new AccountPropertyUpdate().username(PRIMARY_EMAIL).accessBypassRequests(bypasses1); final Profile retrieved1 = profileService.updateAccountProperties(request1); assertThat(retrieved1.getDataUseAgreementBypassTime()).isNotNull(); assertThat(retrieved1.getComplianceTrainingBypassTime()).isNotNull(); assertThat(retrieved1.getBetaAccessBypassTime()).isNull(); assertThat(retrieved1.getEraCommonsBypassTime()).isNull(); assertThat(retrieved1.getTwoFactorAuthBypassTime()).isNull(); final List<AccessBypassRequest> bypasses2 = ImmutableList.of( new AccessBypassRequest().moduleName(AccessModule.DATA_USE_AGREEMENT).isBypassed(false), new AccessBypassRequest() .moduleName(AccessModule.COMPLIANCE_TRAINING) .isBypassed(false), new AccessBypassRequest().moduleName(AccessModule.ERA_COMMONS).isBypassed(true), new AccessBypassRequest().moduleName(AccessModule.TWO_FACTOR_AUTH).isBypassed(true)); final AccountPropertyUpdate request2 = request1.accessBypassRequests(bypasses2); final Profile retrieved2 = profileService.updateAccountProperties(request2); assertThat(retrieved2.getDataUseAgreementBypassTime()).isNull(); assertThat(retrieved2.getComplianceTrainingBypassTime()).isNull(); assertThat(retrieved2.getBetaAccessBypassTime()).isNull(); assertThat(retrieved2.getEraCommonsBypassTime()).isNotNull(); assertThat(retrieved2.getTwoFactorAuthBypassTime()).isNotNull(); verify(mockProfileAuditor).fireUpdateAction(original, retrieved1); verify(mockProfileAuditor).fireUpdateAction(retrieved1, retrieved2); verify(mockUserServiceAuditor, times(2)) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.DATA_USE_AGREEMENT_BYPASS_TIME), any(), any()); verify(mockUserServiceAuditor, times(2)) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.COMPLIANCE_TRAINING_BYPASS_TIME), any(), any()); verify(mockUserServiceAuditor) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.BETA_ACCESS_BYPASS_TIME), any(), any()); verify(mockUserServiceAuditor) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.ERA_COMMONS_BYPASS_TIME), any(), any()); verify(mockUserServiceAuditor) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.TWO_FACTOR_AUTH_BYPASS_TIME), any(), any()); }
@Test public void test_updateAccountProperties_free_tier_quota() { createAccountAndDbUserWithAffiliation(); final Double originalQuota = dbUser.getFreeTierCreditsLimitDollarsOverride(); final Double newQuota = 123.4; final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).freeCreditsLimit(newQuota); final Profile retrieved = profileService.updateAccountProperties(request); assertThat(retrieved.getFreeTierDollarQuota()).isWithin(0.01).of(newQuota); verify(mockUserServiceAuditor) .fireSetFreeTierDollarLimitOverride(dbUser.getUserId(), originalQuota, newQuota); }
@Test public void test_updateAccountProperties_free_tier_quota_no_change() { final Profile original = createAccountAndDbUserWithAffiliation(); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .freeCreditsLimit(original.getFreeTierDollarQuota()); profileService.updateAccountProperties(request); verify(mockUserServiceAuditor, never()) .fireSetFreeTierDollarLimitOverride(anyLong(), anyDouble(), anyDouble()); }
@Test public void test_updateAccountProperties_free_tier_quota_no_override() { config.billing.defaultFreeCreditsDollarLimit = 123.45; final Profile original = createAccountAndDbUserWithAffiliation(); assertThat(original.getFreeTierDollarQuota()).isWithin(0.01).of(123.45); config.billing.defaultFreeCreditsDollarLimit = 234.56; assertThat(profileService.getProfile(dbUser).getFreeTierDollarQuota()) .isWithin(0.01) .of(234.56); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .freeCreditsLimit(config.billing.defaultFreeCreditsDollarLimit); profileService.updateAccountProperties(request); verify(mockUserServiceAuditor, never()) .fireSetFreeTierDollarLimitOverride(anyLong(), anyDouble(), anyDouble()); config.billing.defaultFreeCreditsDollarLimit = 345.67; assertThat(profileService.getProfile(dbUser).getFreeTierDollarQuota()) .isWithin(0.01) .of(345.67); } |
SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request); static final String SUMOLOGIC_KEY_FILENAME; } | @Test public void testLogsApiKeyFailure() { assertThrows( UnauthorizedException.class, () -> sumoLogicController.logEgressEvent("bad-key", request)); verify(mockEgressEventAuditor).fireBadApiKey("bad-key", request); }
@Test public void testLogsRequestParsingFailure() { request.setEventsJsonArray("bad-json"); assertThrows( BadRequestException.class, () -> sumoLogicController.logEgressEvent(API_KEY, request)); verify(mockEgressEventAuditor).fireFailedToParseEgressEventRequest(request); }
@Test public void testLogsSingleEvent() { sumoLogicController.logEgressEvent(API_KEY, request); verify(mockEgressEventService).handleEvent(event); }
@Test public void testLogsMultipleEvents() throws JsonProcessingException { EgressEvent event2 = new EgressEvent(); request.setEventsJsonArray(objectMapper.writeValueAsString(Arrays.asList(event, event2))); sumoLogicController.logEgressEvent(API_KEY, request); verify(mockEgressEventService, times(2)).handleEvent(any()); } |
CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<CohortListResponse> getCohortsInWorkspace( String workspaceNamespace, String workspaceId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DbWorkspace workspace = workspaceService.getRequiredWithCohorts(workspaceNamespace, workspaceId); CohortListResponse response = new CohortListResponse(); Set<DbCohort> cohorts = workspace.getCohorts(); if (cohorts != null) { response.setItems( cohorts.stream() .map(cohortMapper::dbModelToClient) .sorted(Comparator.comparing(c -> c.getName())) .collect(Collectors.toList())); } return ResponseEntity.ok(response); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } | @Test public void testGetCohortsInWorkspace() throws Exception { Cohort c1 = createDefaultCohort(); c1.setName("c1"); c1 = cohortsController.createCohort(workspace.getNamespace(), workspace.getId(), c1).getBody(); Cohort c2 = createDefaultCohort(); c2.setName("c2"); c2 = cohortsController.createCohort(workspace.getNamespace(), workspace.getId(), c2).getBody(); List<Cohort> cohorts = cohortsController .getCohortsInWorkspace(workspace.getNamespace(), workspace.getId()) .getBody() .getItems(); assertThat(cohorts).containsAllOf(c1, c2); assertThat(cohorts.size()).isEqualTo(2); } |
CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> createCohort( String workspaceNamespace, String workspaceId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); try { new Gson().fromJson(cohort.getCriteria(), SearchRequest.class); } catch (JsonSyntaxException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), cohort.getName()), e); } checkForDuplicateCohortNameException(cohort.getName(), workspace); DbCohort newCohort = cohortFactory.createCohort(cohort, userProvider.get(), workspace.getWorkspaceId()); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (DataIntegrityViolationException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } | @Test(expected = ServerErrorException.class) public void testCreateCohortBadCriteria() { Cohort cohort = createDefaultCohort(); cohort.setCriteria(badCohortCriteria); cohortsController.createCohort(workspace.getNamespace(), workspace.getId(), cohort).getBody(); } |
CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> updateCohort( String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbCohort dbCohort = getDbCohort(workspaceNamespace, workspaceId, cohortId); if (Strings.isNullOrEmpty(cohort.getEtag())) { throw new BadRequestException("missing required update field 'etag'"); } int version = Etags.toVersion(cohort.getEtag()); if (dbCohort.getVersion() != version) { throw new ConflictException("Attempted to modify outdated cohort version"); } if (cohort.getType() != null) { dbCohort.setType(cohort.getType()); } if (cohort.getName() != null) { dbCohort.setName(cohort.getName()); } if (cohort.getDescription() != null) { dbCohort.setDescription(cohort.getDescription()); } if (cohort.getCriteria() != null) { dbCohort.setCriteria(cohort.getCriteria()); } Timestamp now = new Timestamp(clock.instant().toEpochMilli()); dbCohort.setLastModifiedTime(now); try { dbCohort = cohortDao.save(dbCohort); } catch (OptimisticLockException e) { log.log(Level.WARNING, "version conflict for cohort update", e); throw new ConflictException("Failed due to concurrent cohort modification"); } return ResponseEntity.ok(cohortMapper.dbModelToClient(dbCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } | @Test public void testUpdateCohort() throws Exception { Cohort cohort = createDefaultCohort(); cohort = cohortsController .createCohort(workspace.getNamespace(), workspace.getId(), cohort) .getBody(); cohort.setName("updated-name"); Cohort updated = cohortsController .updateCohort(workspace.getNamespace(), workspace.getId(), cohort.getId(), cohort) .getBody(); cohort.setEtag(updated.getEtag()); assertThat(updated).isEqualTo(cohort); cohort.setName("updated-name2"); updated = cohortsController .updateCohort(workspace.getNamespace(), workspace.getId(), cohort.getId(), cohort) .getBody(); cohort.setEtag(updated.getEtag()); assertThat(updated).isEqualTo(cohort); Cohort got = cohortsController .getCohort(workspace.getNamespace(), workspace.getId(), cohort.getId()) .getBody(); assertThat(got).isEqualTo(cohort); } |
CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> duplicateCohort( String workspaceNamespace, String workspaceId, DuplicateCohortRequest params) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); checkForDuplicateCohortNameException(params.getNewName(), workspace); DbCohort originalCohort = getDbCohort(workspaceNamespace, workspaceId, params.getOriginalCohortId()); DbCohort newCohort = cohortFactory.duplicateCohort( params.getNewName(), userProvider.get(), workspace, originalCohort); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (Exception e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } | @Test public void testDuplicateCohort() { Cohort originalCohort = createDefaultCohort(); originalCohort = cohortsController .createCohort(workspace.getNamespace(), workspace.getId(), originalCohort) .getBody(); DuplicateCohortRequest params = new DuplicateCohortRequest(); params.setNewName("New Cohort Name"); params.setOriginalCohortId(originalCohort.getId()); Cohort newCohort = cohortsController .duplicateCohort(workspace.getNamespace(), workspace.getId(), params) .getBody(); newCohort = cohortsController .getCohort(workspace.getNamespace(), workspace.getId(), newCohort.getId()) .getBody(); assertThat(newCohort.getName()).isEqualTo(params.getNewName()); assertThat(newCohort.getCriteria()).isEqualTo(originalCohort.getCriteria()); assertThat(newCohort.getType()).isEqualTo(originalCohort.getType()); assertThat(newCohort.getDescription()).isEqualTo(originalCohort.getDescription()); } |
DataSetController implements DataSetApiDelegate { @VisibleForTesting public void addFieldValuesFromBigQueryToPreviewList( List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList) { IntStream.range(0, fieldValueList.size()) .forEach( columnNumber -> valuePreviewList .get(columnNumber) .addQueryValueItem( Optional.ofNullable(fieldValueList.get(columnNumber).getValue()) .map(Object::toString) .orElse(EMPTY_CELL_MARKER))); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } | @Test public void testAddFieldValuesFromBigQueryToPreviewListWorksWithNullValues() { DataSetPreviewValueList dataSetPreviewValueList = new DataSetPreviewValueList(); List<DataSetPreviewValueList> valuePreviewList = ImmutableList.of(dataSetPreviewValueList); List<FieldValue> fieldValueListRows = ImmutableList.of(FieldValue.of(FieldValue.Attribute.PRIMITIVE, null)); FieldValueList fieldValueList = FieldValueList.of(fieldValueListRows); dataSetController.addFieldValuesFromBigQueryToPreviewList(valuePreviewList, fieldValueList); assertThat(valuePreviewList.get(0).getQueryValue().get(0)) .isEqualTo(DataSetController.EMPTY_CELL_MARKER); } |
DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } | @Test(expected = BadRequestException.class) public void testGetQueryFailsWithNoCohort() { DataSetRequest dataSet = buildEmptyDataSetRequest(); dataSet = dataSet .addConceptSetIdsItem(CONCEPT_SET_ONE_ID) .domainValuePairs(ImmutableList.of(new DomainValuePair().domain(Domain.CONDITION))); dataSetController.generateCode( workspace.getNamespace(), WORKSPACE_NAME, KernelTypeEnum.PYTHON.toString(), dataSet); }
@Test(expected = BadRequestException.class) public void testGetQueryFailsWithNoConceptSet() { DataSetRequest dataSet = buildEmptyDataSetRequest(); dataSet = dataSet .addCohortIdsItem(COHORT_ONE_ID) .domainValuePairs(ImmutableList.of(new DomainValuePair().domain(Domain.CONDITION))); dataSetController.generateCode( workspace.getNamespace(), WORKSPACE_NAME, KernelTypeEnum.PYTHON.toString(), dataSet); }
@Test public void testGetQueryDropsQueriesWithNoValue() { final DataSetRequest dataSet = buildEmptyDataSetRequest() .dataSetId(1l) .addCohortIdsItem(COHORT_ONE_ID) .addConceptSetIdsItem(CONCEPT_SET_ONE_ID); expectedException.expect(BadRequestException.class); DataSetCodeResponse response = dataSetController .generateCode( workspace.getNamespace(), WORKSPACE_NAME, KernelTypeEnum.PYTHON.toString(), dataSet) .getBody(); } |
DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DataSet> createDataSet( String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest) { validateDataSetCreateRequest(dataSetRequest); final long workspaceId = workspaceService .getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceFirecloudName, WorkspaceAccessLevel.WRITER) .getWorkspaceId(); dataSetRequest.setWorkspaceId(workspaceId); return ResponseEntity.ok( dataSetService.saveDataSet(dataSetRequest, userProvider.get().getUserId())); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } | @Test public void createDataSetMissingArguments() { DataSetRequest dataSet = buildEmptyDataSetRequest().name(null); List<Long> cohortIds = new ArrayList<>(); cohortIds.add(1L); List<Long> conceptIds = new ArrayList<>(); conceptIds.add(1L); List<DomainValuePair> valuePairList = new ArrayList<>(); DomainValuePair domainValue = new DomainValuePair(); domainValue.setDomain(Domain.DRUG); domainValue.setValue("DRUGS_VALUE"); valuePairList.add(domainValue); dataSet.setDomainValuePairs(valuePairList); dataSet.setConceptSetIds(conceptIds); dataSet.setCohortIds(cohortIds); expectedException.expect(BadRequestException.class); expectedException.expectMessage("Missing name"); dataSetController.createDataSet(workspace.getNamespace(), WORKSPACE_NAME, dataSet); dataSet.setName("dataSet"); dataSet.setCohortIds(null); expectedException.expect(BadRequestException.class); expectedException.expectMessage("Missing cohort ids"); dataSetController.createDataSet(workspace.getNamespace(), WORKSPACE_NAME, dataSet); dataSet.setCohortIds(cohortIds); dataSet.setConceptSetIds(null); expectedException.expect(BadRequestException.class); expectedException.expectMessage("Missing concept set ids"); dataSetController.createDataSet(workspace.getNamespace(), WORKSPACE_NAME, dataSet); dataSet.setConceptSetIds(conceptIds); dataSet.setDomainValuePairs(null); expectedException.expect(BadRequestException.class); expectedException.expectMessage("Missing values"); dataSetController.createDataSet(workspace.getNamespace(), WORKSPACE_NAME, dataSet); } |
DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } | @Test public void exportToNewNotebook() { DataSetRequest dataSet = buildEmptyDataSetRequest().name("blah"); dataSet = dataSet.addCohortIdsItem(COHORT_ONE_ID); dataSet = dataSet.addConceptSetIdsItem(CONCEPT_SET_ONE_ID); List<DomainValuePair> domainValuePairs = mockDomainValuePair(); dataSet.setDomainValuePairs(domainValuePairs); ArrayList<String> tables = new ArrayList<>(); tables.add("FROM `" + TEST_CDR_TABLE + ".condition_occurrence` c_occurrence"); mockLinkingTableQuery(tables); String notebookName = "Hello World"; DataSetExportRequest request = new DataSetExportRequest() .dataSetRequest(dataSet) .newNotebook(true) .notebookName(notebookName) .kernelType(KernelTypeEnum.PYTHON); dataSetController.exportToNotebook(workspace.getNamespace(), WORKSPACE_NAME, request).getBody(); verify(mockNotebooksService, never()).getNotebookContents(any(), any()); verify(mockNotebooksService, times(1)) .saveNotebook(eq(WORKSPACE_BUCKET_NAME), eq(notebookName), any(JSONObject.class)); }
@Test(expected = ForbiddenException.class) public void exportToNotebook_requiresActiveBilling() { DbWorkspace dbWorkspace = workspaceDao.findByWorkspaceNamespaceAndFirecloudNameAndActiveStatus( workspace.getNamespace(), WORKSPACE_NAME, DbStorageEnums.workspaceActiveStatusToStorage(WorkspaceActiveStatus.ACTIVE)); dbWorkspace.setBillingStatus(BillingStatus.INACTIVE); workspaceDao.save(dbWorkspace); DataSetExportRequest request = new DataSetExportRequest(); dataSetController.exportToNotebook(workspace.getNamespace(), WORKSPACE_NAME, request); }
@Test public void exportToExistingNotebook() { DataSetRequest dataSet = buildEmptyDataSetRequest(); dataSet = dataSet.addCohortIdsItem(COHORT_ONE_ID); dataSet = dataSet.addConceptSetIdsItem(CONCEPT_SET_ONE_ID); List<DomainValuePair> domainValuePairs = mockDomainValuePair(); dataSet.setDomainValuePairs(domainValuePairs); ArrayList<String> tables = new ArrayList<>(); tables.add("FROM `" + TEST_CDR_TABLE + ".condition_occurrence` c_occurrence"); mockLinkingTableQuery(tables); String notebookName = "Hello World"; when(mockNotebooksService.getNotebookContents(WORKSPACE_BUCKET_NAME, notebookName)) .thenReturn( new JSONObject() .put("cells", new JSONArray()) .put("metadata", new JSONObject()) .put("nbformat", 4) .put("nbformat_minor", 2)); DataSetExportRequest request = new DataSetExportRequest() .dataSetRequest(dataSet) .newNotebook(false) .notebookName(notebookName); dataSetController.exportToNotebook(workspace.getNamespace(), WORKSPACE_NAME, request).getBody(); verify(mockNotebooksService, times(1)).getNotebookContents(WORKSPACE_BUCKET_NAME, notebookName); verify(mockNotebooksService, times(1)) .saveNotebook(eq(WORKSPACE_BUCKET_NAME), eq(notebookName), any(JSONObject.class)); } |
DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DomainValuesResponse> getValuesFromDomain( String workspaceNamespace, String workspaceId, String domainValue) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DomainValuesResponse response = new DomainValuesResponse(); FieldList fieldList = bigQueryService.getTableFieldsFromDomain(Domain.valueOf(domainValue)); response.setItems( fieldList.stream() .map(field -> new DomainValue().value(field.getName().toLowerCase())) .collect(Collectors.toList())); return ResponseEntity.ok(response); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } | @Test public void testGetValuesFromDomain() { when(mockBigQueryService.getTableFieldsFromDomain(Domain.CONDITION)) .thenReturn( FieldList.of( Field.of("FIELD_ONE", LegacySQLTypeName.STRING), Field.of("FIELD_TWO", LegacySQLTypeName.STRING))); List<DomainValue> domainValues = dataSetController .getValuesFromDomain( workspace.getNamespace(), WORKSPACE_NAME, Domain.CONDITION.toString()) .getBody() .getItems(); verify(mockBigQueryService).getTableFieldsFromDomain(Domain.CONDITION); assertThat(domainValues) .containsExactly( new DomainValue().value("field_one"), new DomainValue().value("field_two")); } |
OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } | @Test public void testBulkSyncTrainingStatusV1() throws org.pmiops.workbench.moodle.ApiException, NotFoundException { workbenchConfig.featureFlags.enableMoodleV2Api = false; doAnswer(i -> i.getArgument(0)).when(userService).syncComplianceTrainingStatusV1(any(), any()); offlineUserController.bulkSyncComplianceTrainingStatus(); verify(userService, times(4)).syncComplianceTrainingStatusV1(any(), any()); }
@Test public void testBulkSyncTrainingStatusV2() throws org.pmiops.workbench.moodle.ApiException, NotFoundException { workbenchConfig.featureFlags.enableMoodleV2Api = true; doAnswer(i -> i.getArgument(0)).when(userService).syncComplianceTrainingStatusV2(any(), any()); offlineUserController.bulkSyncComplianceTrainingStatus(); verify(userService, times(4)).syncComplianceTrainingStatusV2(any(), any()); }
@Test(expected = ServerErrorException.class) public void testBulkSyncTrainingStatusWithSingleUserErrorV1() throws org.pmiops.workbench.moodle.ApiException, NotFoundException { workbenchConfig.featureFlags.enableMoodleV2Api = false; doAnswer(i -> i.getArgument(0)).when(userService).syncComplianceTrainingStatusV1(any(), any()); doThrow(new org.pmiops.workbench.moodle.ApiException("Unknown error")) .when(userService) .syncComplianceTrainingStatusV1( argThat(user -> user.getUsername().equals("[email protected]")), any()); offlineUserController.bulkSyncComplianceTrainingStatus(); verify(userService, times(4)).syncComplianceTrainingStatusV1(any(), any()); }
@Test(expected = ServerErrorException.class) public void testBulkSyncTrainingStatusWithSingleUserErrorV2() throws org.pmiops.workbench.moodle.ApiException, NotFoundException { workbenchConfig.featureFlags.enableMoodleV2Api = true; doAnswer(i -> i.getArgument(0)).when(userService).syncComplianceTrainingStatusV2(any(), any()); doThrow(new org.pmiops.workbench.moodle.ApiException("Unknown error")) .when(userService) .syncComplianceTrainingStatusV2( argThat(user -> user.getUsername().equals("[email protected]")), any()); offlineUserController.bulkSyncComplianceTrainingStatus(); verify(userService, times(4)).syncComplianceTrainingStatusV2(any(), any()); } |
OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncEraCommonsStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { if (user.getFirstSignInTime() == null) { continue; } Timestamp oldTime = user.getEraCommonsCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser = userService.syncEraCommonsStatusUsingImpersonation(user, Agent.asSystem()); Timestamp newTime = updatedUser.getEraCommonsCompletionTime(); DataAccessLevel newLevel = user.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "eRA Commons completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.firecloud.ApiException e) { errorCount++; log.severe( String.format( "Error syncing eRA Commons status for user %s: %s", user.getUsername(), e.getMessage())); } catch (IOException e) { errorCount++; log.severe( String.format( "Error fetching impersonated creds for user %s: %s", user.getUsername(), e.getMessage())); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during eRA Commons sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } | @Test public void testBulkSyncEraCommonsStatus() throws IOException, org.pmiops.workbench.firecloud.ApiException { doAnswer(i -> i.getArgument(0)) .when(userService) .syncEraCommonsStatusUsingImpersonation(any(), any()); offlineUserController.bulkSyncEraCommonsStatus(); verify(userService, times(3)).syncEraCommonsStatusUsingImpersonation(any(), any()); }
@Test(expected = ServerErrorException.class) public void testBulkSyncEraCommonsStatusWithSingleUserError() throws ApiException, NotFoundException, IOException, org.pmiops.workbench.firecloud.ApiException { doAnswer(i -> i.getArgument(0)) .when(userService) .syncEraCommonsStatusUsingImpersonation(any(), any()); doThrow(new org.pmiops.workbench.firecloud.ApiException("Unknown error")) .when(userService) .syncEraCommonsStatusUsingImpersonation( argThat(user -> user.getUsername().equals("[email protected]")), any()); offlineUserController.bulkSyncEraCommonsStatus(); verify(userService, times(3)).syncEraCommonsStatusUsingImpersonation(any(), any()); } |
OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkAuditProjectAccess() { int errorCount = 0; List<DbUser> users = userService.getAllUsers(); for (DbUser user : users) { try { List<String> unauthorizedLogs = cloudResourceManagerService.getAllProjectsForUser(user).stream() .filter( project -> project.getParent() == null || !(WHITELISTED_ORG_IDS.contains(project.getParent().getId()))) .map( project -> project.getName() + " in organization " + Optional.ofNullable(project.getParent()) .map(ResourceId::getId) .orElse("[none]")) .collect(Collectors.toList()); if (unauthorizedLogs.size() > 0) { log.warning( "User " + user.getUsername() + " has access to projects: " + String.join(", ", unauthorizedLogs)); } } catch (IOException e) { log.log(Level.SEVERE, "failed to audit project access for user " + user.getUsername(), e); errorCount++; } } if (errorCount > 0) { log.severe(String.format("encountered errors on %d/%d users", errorCount, users.size())); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(); } log.info(String.format("successfully audited %d users", users.size())); return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } | @Test public void testBulkProjectAudit() throws Exception { List<Project> projectList = new ArrayList<>(); doReturn(projectList).when(cloudResourceManagerService).getAllProjectsForUser(any()); offlineUserController.bulkAuditProjectAccess(); verify(cloudResourceManagerService, times(4)).getAllProjectsForUser(any()); } |
AuthDomainController implements AuthDomainApiDelegate { @AuthorityRequired({Authority.DEVELOPER}) @Override public ResponseEntity<EmptyResponse> createAuthDomain(String groupName) { fireCloudService.createGroup(groupName); return ResponseEntity.ok(new EmptyResponse()); } @Autowired AuthDomainController(
FireCloudService fireCloudService,
UserService userService,
UserDao userDao,
AuthDomainAuditor authDomainAuditAdapter); @AuthorityRequired({Authority.DEVELOPER}) @Override ResponseEntity<EmptyResponse> createAuthDomain(String groupName); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Void> updateUserDisabledStatus(UpdateUserDisabledRequest request); } | @Test public void testCreateAuthDomain() { ResponseEntity<EmptyResponse> response = this.authDomainController.createAuthDomain(""); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); } |
AuthDomainController implements AuthDomainApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Void> updateUserDisabledStatus(UpdateUserDisabledRequest request) { final DbUser targetDbUser = userService.getByUsernameOrThrow(request.getEmail()); final Boolean previousDisabled = targetDbUser.getDisabled(); final DbUser updatedTargetUser = userService.setDisabledStatus(targetDbUser.getUserId(), request.getDisabled()); auditAdminActions(request, previousDisabled, updatedTargetUser); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } @Autowired AuthDomainController(
FireCloudService fireCloudService,
UserService userService,
UserDao userDao,
AuthDomainAuditor authDomainAuditAdapter); @AuthorityRequired({Authority.DEVELOPER}) @Override ResponseEntity<EmptyResponse> createAuthDomain(String groupName); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Void> updateUserDisabledStatus(UpdateUserDisabledRequest request); } | @Test public void testDisableUser() { final boolean oldDisabledValue = false; final DbUser createdUser = createUser(oldDisabledValue); final boolean newDisabledValue = true; UpdateUserDisabledRequest request = new UpdateUserDisabledRequest().email(PRIMARY_EMAIL).disabled(newDisabledValue); ResponseEntity<Void> response = this.authDomainController.updateUserDisabledStatus(request); verify(mockAuthDomainAuditAdapter) .fireSetAccountDisabledStatus(createdUser.getUserId(), newDisabledValue, oldDisabledValue); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); DbUser updatedUser = userDao.findUserByUsername(PRIMARY_EMAIL); assertThat(updatedUser.getDisabled()).isTrue(); }
@Test public void testEnableUser() { final boolean oldDisabledValue = true; final DbUser createdUser = createUser(oldDisabledValue); final boolean newDisabledValue = false; UpdateUserDisabledRequest request = new UpdateUserDisabledRequest().email(PRIMARY_EMAIL).disabled(newDisabledValue); ResponseEntity<Void> response = this.authDomainController.updateUserDisabledStatus(request); verify(mockAuthDomainAuditAdapter) .fireSetAccountDisabledStatus(createdUser.getUserId(), newDisabledValue, oldDisabledValue); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); DbUser updatedUser = userDao.findUserByUsername(PRIMARY_EMAIL); assertThat(updatedUser.getDisabled()).isFalse(); } |
CohortAnnotationDefinitionController implements CohortAnnotationDefinitionApiDelegate { @Override public ResponseEntity<CohortAnnotationDefinition> createCohortAnnotationDefinition( String workspaceNamespace, String workspaceId, Long cohortId, CohortAnnotationDefinition cohortAnnotationDefinition) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); validateColumnName(cohortAnnotationDefinition.getColumnName()); validateCohortExist(cohortId); validateDefinitionExists(cohortId, cohortAnnotationDefinition.getColumnName()); cohortAnnotationDefinition.setCohortId(cohortId); cohortAnnotationDefinition.etag(Etags.fromVersion(0)); CohortAnnotationDefinition response = save(cohortAnnotationDefinition); return ResponseEntity.ok(response); } @Autowired CohortAnnotationDefinitionController(
CohortAnnotationDefinitionService cohortAnnotationDefinitionService,
CohortReviewService cohortReviewService,
WorkspaceService workspaceService); @Override ResponseEntity<CohortAnnotationDefinition> createCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
CohortAnnotationDefinition cohortAnnotationDefinition); @Override ResponseEntity<EmptyResponse> deleteCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinition> getCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinitionListResponse> getCohortAnnotationDefinitions(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortAnnotationDefinition> updateCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long annotationDefinitionId,
CohortAnnotationDefinition cohortAnnotationDefinitionRequest); } | @Test public void createCohortAnnotationDefinition_BadCohortId() { setupWorkspaceServiceMock(); try { cohortAnnotationDefinitionController.createCohortAnnotationDefinition( NAMESPACE, NAME, 0L, new CohortAnnotationDefinition().columnName("column_name")); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException e) { assertEquals("Not Found: No Cohort exists for cohortId: " + 0L, e.getMessage()); } }
@Test public void createCohortAnnotationDefinition_NameConflict() { setupWorkspaceServiceMock(); CohortAnnotationDefinition request = new CohortAnnotationDefinition() .cohortAnnotationDefinitionId( dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()) .cohortId(cohort.getCohortId()) .columnName(dbCohortAnnotationDefinition.getColumnName()) .annotationType(AnnotationType.STRING) .enumValues(new ArrayList<>()) .etag(Etags.fromVersion(0)); try { cohortAnnotationDefinitionController.createCohortAnnotationDefinition( NAMESPACE, NAME, cohort.getCohortId(), request); fail("Should have thrown a ConflictException!"); } catch (ConflictException e) { assertEquals( "Conflict: Cohort Annotation Definition name exists for: " + dbCohortAnnotationDefinition.getColumnName(), e.getMessage()); } }
@Test public void createCohortAnnotationDefinition() { setupWorkspaceServiceMock(); CohortAnnotationDefinition request = new CohortAnnotationDefinition() .cohortId(cohort.getCohortId()) .columnName(NEW_COLUMN_NAME) .annotationType(AnnotationType.STRING) .enumValues(new ArrayList<>()) .etag(Etags.fromVersion(0)); CohortAnnotationDefinition response = cohortAnnotationDefinitionController .createCohortAnnotationDefinition(NAMESPACE, NAME, cohort.getCohortId(), request) .getBody(); CohortAnnotationDefinition expectedResponse = new CohortAnnotationDefinition() .cohortAnnotationDefinitionId(response.getCohortAnnotationDefinitionId()) .cohortId(cohort.getCohortId()) .columnName(NEW_COLUMN_NAME) .annotationType(AnnotationType.STRING) .enumValues(new ArrayList<>()) .etag(Etags.fromVersion(0)); assertEquals(expectedResponse, response); }
@Test public void createCohortAnnotationDefinitionEnumValues() { setupWorkspaceServiceMock(); List<String> enumValues = Arrays.asList("value"); CohortAnnotationDefinition request = new CohortAnnotationDefinition() .cohortId(cohort.getCohortId()) .columnName(NEW_COLUMN_NAME) .annotationType(AnnotationType.ENUM) .enumValues(enumValues) .etag(Etags.fromVersion(0)); CohortAnnotationDefinition response = cohortAnnotationDefinitionController .createCohortAnnotationDefinition(NAMESPACE, NAME, cohort.getCohortId(), request) .getBody(); CohortAnnotationDefinition expectedResponse = new CohortAnnotationDefinition() .cohortAnnotationDefinitionId(response.getCohortAnnotationDefinitionId()) .cohortId(cohort.getCohortId()) .columnName(NEW_COLUMN_NAME) .annotationType(AnnotationType.ENUM) .enumValues(enumValues) .etag(Etags.fromVersion(0)); assertEquals(expectedResponse, response); } |
CohortAnnotationDefinitionController implements CohortAnnotationDefinitionApiDelegate { @Override public ResponseEntity<CohortAnnotationDefinition> updateCohortAnnotationDefinition( String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId, CohortAnnotationDefinition cohortAnnotationDefinitionRequest) { String columnName = cohortAnnotationDefinitionRequest.getColumnName(); workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); validateColumnName(columnName); validateCohortExist(cohortId); CohortAnnotationDefinition cohortAnnotationDefinition = findCohortAnnotationDefinition(cohortId, annotationDefinitionId).columnName(columnName); validateEtag(cohortAnnotationDefinitionRequest.getEtag(), cohortAnnotationDefinition); validateDefinitionExists(cohortId, columnName); return ResponseEntity.ok(save(cohortAnnotationDefinition)); } @Autowired CohortAnnotationDefinitionController(
CohortAnnotationDefinitionService cohortAnnotationDefinitionService,
CohortReviewService cohortReviewService,
WorkspaceService workspaceService); @Override ResponseEntity<CohortAnnotationDefinition> createCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
CohortAnnotationDefinition cohortAnnotationDefinition); @Override ResponseEntity<EmptyResponse> deleteCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinition> getCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinitionListResponse> getCohortAnnotationDefinitions(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortAnnotationDefinition> updateCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long annotationDefinitionId,
CohortAnnotationDefinition cohortAnnotationDefinitionRequest); } | @Test public void updateCohortAnnotationDefinition_BadCohortId() { setupWorkspaceServiceMock(); CohortAnnotationDefinition request = new CohortAnnotationDefinition().columnName("ignore"); try { cohortAnnotationDefinitionController.updateCohortAnnotationDefinition( NAMESPACE, NAME, 99L, dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId(), request); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException e) { assertEquals("Not Found: No Cohort exists for cohortId: " + 99L, e.getMessage()); } }
@Test public void updateCohortAnnotationDefinition_BadAnnotationDefinitionId() { setupWorkspaceServiceMock(); CohortAnnotationDefinition request = new CohortAnnotationDefinition().columnName("ignore"); try { cohortAnnotationDefinitionController.updateCohortAnnotationDefinition( NAMESPACE, NAME, cohort.getCohortId(), 99L, request); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException e) { assertEquals( "Not Found: No Cohort Annotation Definition exists for annotationDefinitionId: " + 99L, e.getMessage()); } }
@Test public void updateCohortAnnotationDefinition_NameConflict() { setupWorkspaceServiceMock(); CohortAnnotationDefinition request = new CohortAnnotationDefinition() .columnName(EXISTING_COLUMN_NAME) .etag(Etags.fromVersion(0)); try { cohortAnnotationDefinitionController.updateCohortAnnotationDefinition( NAMESPACE, NAME, cohort.getCohortId(), dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId(), request); fail("Should have thrown a ConflictException!"); } catch (ConflictException e) { assertEquals( "Conflict: Cohort Annotation Definition name exists for: " + EXISTING_COLUMN_NAME, e.getMessage()); } }
@Test public void updateCohortAnnotationDefinition() { setupWorkspaceServiceMock(); CohortAnnotationDefinition request = new CohortAnnotationDefinition() .cohortAnnotationDefinitionId( dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()) .columnName(NEW_COLUMN_NAME) .etag(Etags.fromVersion(0)) .cohortId(cohort.getCohortId()); CohortAnnotationDefinition expectedResponse = new CohortAnnotationDefinition() .cohortAnnotationDefinitionId( dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()) .cohortId(cohort.getCohortId()) .columnName(NEW_COLUMN_NAME) .annotationType(AnnotationType.STRING) .enumValues(new ArrayList<>()) .etag(Etags.fromVersion(0)); CohortAnnotationDefinition responseDefinition = cohortAnnotationDefinitionController .updateCohortAnnotationDefinition( NAMESPACE, NAME, cohort.getCohortId(), dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId(), request) .getBody(); assertEquals(expectedResponse, responseDefinition); } |
CohortAnnotationDefinitionController implements CohortAnnotationDefinitionApiDelegate { @Override public ResponseEntity<EmptyResponse> deleteCohortAnnotationDefinition( String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); validateCohortExist(cohortId); findCohortAnnotationDefinition(cohortId, annotationDefinitionId); cohortAnnotationDefinitionService.delete(annotationDefinitionId); return ResponseEntity.ok(new EmptyResponse()); } @Autowired CohortAnnotationDefinitionController(
CohortAnnotationDefinitionService cohortAnnotationDefinitionService,
CohortReviewService cohortReviewService,
WorkspaceService workspaceService); @Override ResponseEntity<CohortAnnotationDefinition> createCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
CohortAnnotationDefinition cohortAnnotationDefinition); @Override ResponseEntity<EmptyResponse> deleteCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinition> getCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinitionListResponse> getCohortAnnotationDefinitions(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortAnnotationDefinition> updateCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long annotationDefinitionId,
CohortAnnotationDefinition cohortAnnotationDefinitionRequest); } | @Test public void deleteCohortAnnotationDefinition_BadCohortId() { setupWorkspaceServiceMock(); try { cohortAnnotationDefinitionController.deleteCohortAnnotationDefinition( NAMESPACE, NAME, 99L, dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException e) { assertEquals("Not Found: No Cohort exists for cohortId: " + 99L, e.getMessage()); } }
@Test public void deleteCohortAnnotationDefinition_BadAnnotationDefinitionId() { setupWorkspaceServiceMock(); try { cohortAnnotationDefinitionController.deleteCohortAnnotationDefinition( NAMESPACE, NAME, cohort.getCohortId(), 99L); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException e) { assertEquals( "Not Found: No Cohort Annotation Definition exists for annotationDefinitionId: " + 99L, e.getMessage()); } }
@Test public void deleteCohortAnnotationDefinition() { setupWorkspaceServiceMock(); EmptyResponse response = cohortAnnotationDefinitionController .deleteCohortAnnotationDefinition( NAMESPACE, NAME, cohort.getCohortId(), dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()) .getBody(); assertEquals(new EmptyResponse(), response); } |
CohortAnnotationDefinitionController implements CohortAnnotationDefinitionApiDelegate { @Override public ResponseEntity<CohortAnnotationDefinition> getCohortAnnotationDefinition( String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); validateCohortExist(cohortId); return ResponseEntity.ok(findCohortAnnotationDefinition(cohortId, annotationDefinitionId)); } @Autowired CohortAnnotationDefinitionController(
CohortAnnotationDefinitionService cohortAnnotationDefinitionService,
CohortReviewService cohortReviewService,
WorkspaceService workspaceService); @Override ResponseEntity<CohortAnnotationDefinition> createCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
CohortAnnotationDefinition cohortAnnotationDefinition); @Override ResponseEntity<EmptyResponse> deleteCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinition> getCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinitionListResponse> getCohortAnnotationDefinitions(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortAnnotationDefinition> updateCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long annotationDefinitionId,
CohortAnnotationDefinition cohortAnnotationDefinitionRequest); } | @Test public void getCohortAnnotationDefinition_NotFoundCohort() { setupWorkspaceServiceMock(); try { cohortAnnotationDefinitionController.getCohortAnnotationDefinition( NAMESPACE, NAME, 99L, dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException e) { assertEquals("Not Found: No Cohort exists for cohortId: " + 99L, e.getMessage()); } }
@Test public void getCohortAnnotationDefinition_NotFoundAnnotationDefinition() { setupWorkspaceServiceMock(); try { cohortAnnotationDefinitionController.getCohortAnnotationDefinition( NAMESPACE, NAME, cohort.getCohortId(), 99L); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException e) { assertEquals( "Not Found: No Cohort Annotation Definition exists for annotationDefinitionId: " + 99L, e.getMessage()); } }
@Test public void getCohortAnnotationDefinition() { setupWorkspaceServiceMock(); CohortAnnotationDefinition responseDefinition = cohortAnnotationDefinitionController .getCohortAnnotationDefinition( NAMESPACE, NAME, cohort.getCohortId(), dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()) .getBody(); CohortAnnotationDefinition expectedResponse = new CohortAnnotationDefinition() .cohortAnnotationDefinitionId( dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()) .cohortId(cohort.getCohortId()) .annotationType(AnnotationType.STRING) .columnName(dbCohortAnnotationDefinition.getColumnName()) .enumValues(new ArrayList<>()) .etag(Etags.fromVersion(0)); assertEquals(expectedResponse, responseDefinition); } |
CohortAnnotationDefinitionController implements CohortAnnotationDefinitionApiDelegate { @Override public ResponseEntity<CohortAnnotationDefinitionListResponse> getCohortAnnotationDefinitions( String workspaceNamespace, String workspaceId, Long cohortId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); validateCohortExist(cohortId); List<CohortAnnotationDefinition> defs = cohortAnnotationDefinitionService.findByCohortId(cohortId); return ResponseEntity.ok(new CohortAnnotationDefinitionListResponse().items(defs)); } @Autowired CohortAnnotationDefinitionController(
CohortAnnotationDefinitionService cohortAnnotationDefinitionService,
CohortReviewService cohortReviewService,
WorkspaceService workspaceService); @Override ResponseEntity<CohortAnnotationDefinition> createCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
CohortAnnotationDefinition cohortAnnotationDefinition); @Override ResponseEntity<EmptyResponse> deleteCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinition> getCohortAnnotationDefinition(
String workspaceNamespace, String workspaceId, Long cohortId, Long annotationDefinitionId); @Override ResponseEntity<CohortAnnotationDefinitionListResponse> getCohortAnnotationDefinitions(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortAnnotationDefinition> updateCohortAnnotationDefinition(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long annotationDefinitionId,
CohortAnnotationDefinition cohortAnnotationDefinitionRequest); } | @Test public void getCohortAnnotationDefinitions_NotFoundCohort() { setupWorkspaceServiceMock(); try { cohortAnnotationDefinitionController.getCohortAnnotationDefinitions(NAMESPACE, NAME, 99L); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException e) { assertEquals("Not Found: No Cohort exists for cohortId: " + 99L, e.getMessage()); } }
@Test public void getCohortAnnotationDefinitions() { setupWorkspaceServiceMock(); CohortAnnotationDefinitionListResponse responseDefinition = cohortAnnotationDefinitionController .getCohortAnnotationDefinitions(NAMESPACE, NAME, cohort.getCohortId()) .getBody(); CohortAnnotationDefinition expectedResponse = new CohortAnnotationDefinition() .cohortAnnotationDefinitionId( dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()) .cohortId(cohort.getCohortId()) .annotationType(AnnotationType.STRING) .columnName(dbCohortAnnotationDefinition.getColumnName()) .enumValues(new ArrayList<>()) .etag(Etags.fromVersion(0)); assertEquals(1, responseDefinition.getItems().size()); assertEquals(expectedResponse, responseDefinition.getItems().get(0)); } |
BillingProjectBufferService implements GaugeDataCollector { public DbBillingProjectBufferEntry assignBillingProject(DbUser dbUser) { DbBillingProjectBufferEntry bufferEntry = consumeBufferEntryForAssignment(); fireCloudService.addOwnerToBillingProject( dbUser.getUsername(), bufferEntry.getFireCloudProjectName()); bufferEntry.setStatusEnum(BufferEntryStatus.ASSIGNED, this::getCurrentTimestamp); bufferEntry.setAssignedUser(dbUser); bufferEntry = billingProjectBufferEntryDao.save(bufferEntry); return bufferEntry; } @Autowired BillingProjectBufferService(
BillingProjectBufferEntryDao billingProjectBufferEntryDao,
Clock clock,
FireCloudService fireCloudService,
Provider<WorkbenchConfig> workbenchConfigProvider); void bufferBillingProjects(); @Override Collection<MeasurementBundle> getGaugeData(); void syncBillingProjectStatus(); void cleanBillingBuffer(); DbBillingProjectBufferEntry assignBillingProject(DbUser dbUser); BillingProjectBufferStatus getStatus(); } | @Test public void assignBillingProject() { DbBillingProjectBufferEntry entry = new DbBillingProjectBufferEntry(); entry.setStatusEnum(BufferEntryStatus.AVAILABLE, this::getCurrentTimestamp); entry.setFireCloudProjectName("test-project-name"); entry.setCreationTime(getCurrentTimestamp()); billingProjectBufferEntryDao.save(entry); DbUser user = mock(DbUser.class); doReturn("[email protected]").when(user).getUsername(); DbBillingProjectBufferEntry assignedEntry = billingProjectBufferService.assignBillingProject(user); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); ArgumentCaptor<String> secondCaptor = ArgumentCaptor.forClass(String.class); verify(mockFireCloudService).addOwnerToBillingProject(captor.capture(), secondCaptor.capture()); String invokedEmail = captor.getValue(); String invokedProjectName = secondCaptor.getValue(); assertThat(invokedEmail).isEqualTo("[email protected]"); assertThat(invokedProjectName).isEqualTo("test-project-name"); assertThat(billingProjectBufferEntryDao.findOne(assignedEntry.getId()).getStatusEnum()) .isEqualTo(BufferEntryStatus.ASSIGNED); } |
WorkspaceAdminController implements WorkspaceAdminApiDelegate { @Override @AuthorityRequired({Authority.RESEARCHER_DATA_VIEW}) public ResponseEntity<WorkspaceAdminView> getWorkspaceAdminView(String workspaceNamespace) { return ResponseEntity.ok(workspaceAdminService.getWorkspaceAdminView(workspaceNamespace)); } @Autowired WorkspaceAdminController(WorkspaceAdminService workspaceAdminService); @Override @AuthorityRequired({Authority.RESEARCHER_DATA_VIEW}) ResponseEntity<CloudStorageTraffic> getCloudStorageTraffic(String workspaceNamespace); @Override @AuthorityRequired({Authority.RESEARCHER_DATA_VIEW}) ResponseEntity<WorkspaceAdminView> getWorkspaceAdminView(String workspaceNamespace); @Override @AuthorityRequired({Authority.RESEARCHER_DATA_VIEW}) ResponseEntity<WorkspaceAuditLogQueryResponse> getAuditLogEntries(
String workspaceNamespace,
Integer limit,
Long afterMillis,
@Nullable Long beforeMillisNullable); @Override @AuthorityRequired({Authority.RESEARCHER_DATA_VIEW}) ResponseEntity<ReadOnlyNotebookResponse> adminReadOnlyNotebook(
String workspaceNamespace, String notebookName, AccessReason accessReason); @Override @AuthorityRequired({Authority.RESEARCHER_DATA_VIEW}) ResponseEntity<List<FileDetail>> listFiles(String workspaceNamespace); } | @Test(expected = NotFoundException.class) public void getWorkspaceAdminView_404sWhenNotFound() { doThrow( new NotFoundException( String.format("No workspace found for namespace %s", NONSENSE_NAMESPACE))) .when(mockWorkspaceAdminService) .getWorkspaceAdminView(NONSENSE_NAMESPACE); workspaceAdminController.getWorkspaceAdminView(NONSENSE_NAMESPACE); } |
ConceptsController implements ConceptsApiDelegate { @Override public ResponseEntity<ConceptListResponse> searchConcepts( String workspaceNamespace, String workspaceId, SearchConceptsRequest request) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); Slice<DbConcept> concepts = conceptService.searchConcepts( request.getQuery(), request.getStandardConceptFilter(), request.getDomain(), calculateResultLimit(request.getMaxResults()), Optional.ofNullable(request.getPageNumber()).orElse(0)); return ResponseEntity.ok( new ConceptListResponse() .items( concepts.getContent().stream() .map(ConceptService::toClientConcept) .collect(Collectors.toList()))); } @Autowired ConceptsController(ConceptService conceptService, WorkspaceService workspaceService); @Override ResponseEntity<DomainInfoResponse> getDomainInfo(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<List<SurveyQuestions>> searchSurveys(
String workspaceNamespace, String workspaceId, SearchSurveysRequest request); @Override ResponseEntity<SurveysResponse> getSurveyInfo(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<DomainCountsListResponse> domainCounts(
String workspaceNamespace, String workspaceId, DomainCountsRequest request); @Override ResponseEntity<ConceptListResponse> searchConcepts(
String workspaceNamespace, String workspaceId, SearchConceptsRequest request); } | @Test public void testSearchConceptsBlankQuery() { assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query(" ") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS))); }
@Test public void testSearchConceptsBlankQueryWithResults() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query(" ") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS)), CLIENT_CONCEPT_6, CLIENT_CONCEPT_5, CLIENT_CONCEPT_3, CLIENT_CONCEPT_1); }
@Test public void testSearchNoConcepts() { assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("a") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS))); }
@Test public void testSearchConceptsNameNoMatches() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("x") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS))); }
@Test public void testSearchConceptsCodeMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptA") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_1); }
@Test public void testSearchConceptsConceptIdMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("123") .domain(Domain.OBSERVATION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_4); }
@Test public void testSearchConceptsVocabIdMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("V456") .domain(Domain.OBSERVATION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_4); }
@Test public void testSearchConceptsMatchOrder() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptD") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS)), CLIENT_CONCEPT_6, CLIENT_CONCEPT_5); }
@Test public void testSearchConceptsWithVocabularyStandard() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptD") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_5); }
@Test public void testSearchConceptsNonStandard() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .domain(Domain.MEASUREMENT) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS) .query("conceptB")), CLIENT_CONCEPT_2); }
@Test public void testSearchConceptsStandardConcept() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .domain(Domain.CONDITION) .query("conceptA") .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_1); }
@Test public void testSearchConceptsDomainIdNoMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("zzz") .domain(Domain.OBSERVATION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS))); }
@Test public void testSearchConceptsDomainIdMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptA") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_1); }
@Test public void testSearchConceptsMultipleMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("con") .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS) .domain(Domain.CONDITION)), CLIENT_CONCEPT_5, CLIENT_CONCEPT_1); }
@Test public void testSearchConceptsOneResult() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptC") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS) .maxResults(1)), CLIENT_CONCEPT_3); }
@Test public void testSearchConceptsSubstring() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("est") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS) .maxResults(1000)), CLIENT_CONCEPT_6, CLIENT_CONCEPT_5); } |
ConceptsController implements ConceptsApiDelegate { @Override public ResponseEntity<DomainCountsListResponse> domainCounts( String workspaceNamespace, String workspaceId, DomainCountsRequest request) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); List<DomainCount> counts = conceptService.countDomains( request.getQuery(), request.getSurveyName(), request.getStandardConceptFilter()); return ResponseEntity.ok(new DomainCountsListResponse().domainCounts(counts)); } @Autowired ConceptsController(ConceptService conceptService, WorkspaceService workspaceService); @Override ResponseEntity<DomainInfoResponse> getDomainInfo(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<List<SurveyQuestions>> searchSurveys(
String workspaceNamespace, String workspaceId, SearchSurveysRequest request); @Override ResponseEntity<SurveysResponse> getSurveyInfo(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<DomainCountsListResponse> domainCounts(
String workspaceNamespace, String workspaceId, DomainCountsRequest request); @Override ResponseEntity<ConceptListResponse> searchConcepts(
String workspaceNamespace, String workspaceId, SearchConceptsRequest request); } | @Test public void testDomainCountSourceAndStandardTotalCount() { saveConcepts(); saveDomains(); ResponseEntity<DomainCountsListResponse> response = conceptsController.domainCounts( "ns", "name", new DomainCountsRequest().standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS)); assertCounts( response, ImmutableList.of( toDomainCount(CONDITION_DOMAIN, false), toDomainCount(DRUG_DOMAIN, false), toDomainCount(MEASUREMENT_DOMAIN, false), toDomainCount(OBSERVATION_DOMAIN, false), toDomainCount(PROCEDURE_DOMAIN, false), toDomainCount(SURVEY_DOMAIN, 0))); }
@Test public void testDomainCountStandardTotalCount() { saveConcepts(); saveDomains(); ResponseEntity<DomainCountsListResponse> response = conceptsController.domainCounts( "ns", "name", new DomainCountsRequest() .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)); assertCounts( response, ImmutableList.of( toDomainCount(CONDITION_DOMAIN, true), toDomainCount(DRUG_DOMAIN, true), toDomainCount(MEASUREMENT_DOMAIN, true), toDomainCount(OBSERVATION_DOMAIN, true), toDomainCount(PROCEDURE_DOMAIN, true), toDomainCount(SURVEY_DOMAIN, true))); }
@Test public void testDomainCountStandardWithSearchTerm() { saveConcepts(); saveDomains(); ResponseEntity<DomainCountsListResponse> response = conceptsController.domainCounts( "ns", "name", new DomainCountsRequest() .query("conceptD") .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)); assertCounts( response, ImmutableList.of( toDomainCount(CONDITION_DOMAIN, 1), toDomainCount(DRUG_DOMAIN, 0), toDomainCount(MEASUREMENT_DOMAIN, 0), toDomainCount(OBSERVATION_DOMAIN, 1), toDomainCount(PROCEDURE_DOMAIN, 0), toDomainCount(SURVEY_DOMAIN, 0))); }
@Test public void testSurveyCountSourceAndStandardWithSurveyName() { saveConcepts(); saveDomains(); ResponseEntity<DomainCountsListResponse> response = conceptsController.domainCounts( "ns", "name", new DomainCountsRequest() .surveyName("The Basics") .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS)); assertCounts( response, ImmutableList.of( toDomainCount(CONDITION_DOMAIN, false), toDomainCount(DRUG_DOMAIN, false), toDomainCount(MEASUREMENT_DOMAIN, false), toDomainCount(OBSERVATION_DOMAIN, false), toDomainCount(PROCEDURE_DOMAIN, false), toDomainCount(SURVEY_DOMAIN, 0))); } |
BillingProjectBufferService implements GaugeDataCollector { public BillingProjectBufferStatus getStatus() { final long bufferSize = billingProjectBufferEntryDao.countByStatus( DbStorageEnums.billingProjectBufferEntryStatusToStorage(BufferEntryStatus.AVAILABLE)); return new BillingProjectBufferStatus().bufferSize(bufferSize); } @Autowired BillingProjectBufferService(
BillingProjectBufferEntryDao billingProjectBufferEntryDao,
Clock clock,
FireCloudService fireCloudService,
Provider<WorkbenchConfig> workbenchConfigProvider); void bufferBillingProjects(); @Override Collection<MeasurementBundle> getGaugeData(); void syncBillingProjectStatus(); void cleanBillingBuffer(); DbBillingProjectBufferEntry assignBillingProject(DbUser dbUser); BillingProjectBufferStatus getStatus(); } | @Test public void testGetStatus() { final long numberAvailable = billingProjectBufferEntryDao.countByStatus( DbStorageEnums.billingProjectBufferEntryStatusToStorage(BufferEntryStatus.AVAILABLE)); final BillingProjectBufferStatus bufferStatus = billingProjectBufferService.getStatus(); assertThat(bufferStatus.getBufferSize()).isEqualTo(numberAvailable); } |
BillingProjectBufferService implements GaugeDataCollector { @Override public Collection<MeasurementBundle> getGaugeData() { final ImmutableMap<BufferEntryStatus, Long> entryStatusToCount = ImmutableMap.copyOf(billingProjectBufferEntryDao.getCountByStatusMap()); return Arrays.stream(BufferEntryStatus.values()) .map( status -> MeasurementBundle.builder() .addMeasurement( GaugeMetric.BILLING_BUFFER_PROJECT_COUNT, entryStatusToCount.getOrDefault(status, 0L)) .addTag(MetricLabel.BUFFER_ENTRY_STATUS, status.toString()) .build()) .collect(Collectors.toList()); } @Autowired BillingProjectBufferService(
BillingProjectBufferEntryDao billingProjectBufferEntryDao,
Clock clock,
FireCloudService fireCloudService,
Provider<WorkbenchConfig> workbenchConfigProvider); void bufferBillingProjects(); @Override Collection<MeasurementBundle> getGaugeData(); void syncBillingProjectStatus(); void cleanBillingBuffer(); DbBillingProjectBufferEntry assignBillingProject(DbUser dbUser); BillingProjectBufferStatus getStatus(); } | @Test public void testGetGaugeData() { final Collection<MeasurementBundle> bundles = billingProjectBufferService.getGaugeData(); assertThat(bundles.size()).isGreaterThan(0); Optional<MeasurementBundle> entryStatusBundle = bundles.stream() .filter(b -> b.getMeasurements().containsKey(GaugeMetric.BILLING_BUFFER_PROJECT_COUNT)) .findFirst(); assertThat(entryStatusBundle.isPresent()).isTrue(); assertThat(entryStatusBundle.get().getTags()).isNotEmpty(); } |
ConceptsController implements ConceptsApiDelegate { @Override public ResponseEntity<DomainInfoResponse> getDomainInfo( String workspaceNamespace, String workspaceId) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); return ResponseEntity.ok( new DomainInfoResponse() .items( conceptService.getDomainInfo().stream() .map(this::toClientDomainInfo) .collect(Collectors.toList()))); } @Autowired ConceptsController(ConceptService conceptService, WorkspaceService workspaceService); @Override ResponseEntity<DomainInfoResponse> getDomainInfo(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<List<SurveyQuestions>> searchSurveys(
String workspaceNamespace, String workspaceId, SearchSurveysRequest request); @Override ResponseEntity<SurveysResponse> getSurveyInfo(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<DomainCountsListResponse> domainCounts(
String workspaceNamespace, String workspaceId, DomainCountsRequest request); @Override ResponseEntity<ConceptListResponse> searchConcepts(
String workspaceNamespace, String workspaceId, SearchConceptsRequest request); } | @Test public void testGetDomainInfo() { saveConcepts(); saveDomains(); List<DomainInfo> domainInfos = conceptsController.getDomainInfo("ns", "name").getBody().getItems(); assertThat(domainInfos) .containsExactly( new DomainInfo() .domain(CONDITION_DOMAIN.getDomainEnum()) .name(CONDITION_DOMAIN.getName()) .description(CONDITION_DOMAIN.getDescription()) .participantCount(CONDITION_DOMAIN.getParticipantCount()) .allConceptCount(CONDITION_DOMAIN.getAllConceptCount()) .standardConceptCount(CONDITION_DOMAIN.getStandardConceptCount()), new DomainInfo() .domain(DRUG_DOMAIN.getDomainEnum()) .name(DRUG_DOMAIN.getName()) .description(DRUG_DOMAIN.getDescription()) .participantCount(DRUG_DOMAIN.getParticipantCount()) .allConceptCount(DRUG_DOMAIN.getAllConceptCount()) .standardConceptCount(DRUG_DOMAIN.getStandardConceptCount()), new DomainInfo() .domain(MEASUREMENT_DOMAIN.getDomainEnum()) .name(MEASUREMENT_DOMAIN.getName()) .description(MEASUREMENT_DOMAIN.getDescription()) .participantCount(MEASUREMENT_DOMAIN.getParticipantCount()) .allConceptCount(MEASUREMENT_DOMAIN.getAllConceptCount()) .standardConceptCount(MEASUREMENT_DOMAIN.getStandardConceptCount()), new DomainInfo() .domain(OBSERVATION_DOMAIN.getDomainEnum()) .name(OBSERVATION_DOMAIN.getName()) .description(OBSERVATION_DOMAIN.getDescription()) .participantCount(OBSERVATION_DOMAIN.getParticipantCount()) .allConceptCount(OBSERVATION_DOMAIN.getAllConceptCount()) .standardConceptCount(OBSERVATION_DOMAIN.getStandardConceptCount()), new DomainInfo() .domain(PROCEDURE_DOMAIN.getDomainEnum()) .name(PROCEDURE_DOMAIN.getName()) .description(PROCEDURE_DOMAIN.getDescription()) .participantCount(PROCEDURE_DOMAIN.getParticipantCount()) .allConceptCount(PROCEDURE_DOMAIN.getAllConceptCount()) .standardConceptCount(PROCEDURE_DOMAIN.getStandardConceptCount())) .inOrder(); } |
ConceptsController implements ConceptsApiDelegate { @Override public ResponseEntity<SurveysResponse> getSurveyInfo( String workspaceNamespace, String workspaceId) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); return ResponseEntity.ok( new SurveysResponse() .items( conceptService.getSurveyInfo().stream() .map(this::toClientSurveyModule) .collect(Collectors.toList()))); } @Autowired ConceptsController(ConceptService conceptService, WorkspaceService workspaceService); @Override ResponseEntity<DomainInfoResponse> getDomainInfo(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<List<SurveyQuestions>> searchSurveys(
String workspaceNamespace, String workspaceId, SearchSurveysRequest request); @Override ResponseEntity<SurveysResponse> getSurveyInfo(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<DomainCountsListResponse> domainCounts(
String workspaceNamespace, String workspaceId, DomainCountsRequest request); @Override ResponseEntity<ConceptListResponse> searchConcepts(
String workspaceNamespace, String workspaceId, SearchConceptsRequest request); } | @Test public void testGetSurveyInfo() { saveSurveyInfo(); List<SurveyModule> surveyModules = conceptsController.getSurveyInfo("ns", "name").getBody().getItems(); assertThat(surveyModules) .containsExactly( new SurveyModule() .conceptId(BASICS_SURVEY_MODULE.getConceptId()) .description(BASICS_SURVEY_MODULE.getDescription()) .name(BASICS_SURVEY_MODULE.getName()) .orderNumber(BASICS_SURVEY_MODULE.getOrderNumber()) .participantCount(BASICS_SURVEY_MODULE.getParticipantCount()) .questionCount(BASICS_SURVEY_MODULE.getQuestionCount()), new SurveyModule() .conceptId(OVERALL_HEALTH_SURVEY_MODULE.getConceptId()) .description(OVERALL_HEALTH_SURVEY_MODULE.getDescription()) .name(OVERALL_HEALTH_SURVEY_MODULE.getName()) .orderNumber(OVERALL_HEALTH_SURVEY_MODULE.getOrderNumber()) .participantCount(OVERALL_HEALTH_SURVEY_MODULE.getParticipantCount()) .questionCount(OVERALL_HEALTH_SURVEY_MODULE.getQuestionCount()), new SurveyModule() .conceptId(LIFESTYLE_SURVEY_MODULE.getConceptId()) .description(LIFESTYLE_SURVEY_MODULE.getDescription()) .name(LIFESTYLE_SURVEY_MODULE.getName()) .orderNumber(LIFESTYLE_SURVEY_MODULE.getOrderNumber()) .participantCount(LIFESTYLE_SURVEY_MODULE.getParticipantCount()) .questionCount(LIFESTYLE_SURVEY_MODULE.getQuestionCount())) .inOrder(); } |
ConceptSetsController implements ConceptSetsApiDelegate { @Override public ResponseEntity<ConceptSetListResponse> getConceptSetsInWorkspace( String workspaceNamespace, String workspaceId) { DbWorkspace workspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); List<ConceptSet> conceptSets = conceptSetService.findByWorkspaceId(workspace.getWorkspaceId()).stream() .sorted(Comparator.comparing(ConceptSet::getName)) .collect(Collectors.toList()); return ResponseEntity.ok(new ConceptSetListResponse().items(conceptSets)); } @Autowired ConceptSetsController(
WorkspaceService workspaceService,
ConceptSetService conceptSetService,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider); @Override ResponseEntity<ConceptSet> createConceptSet(
String workspaceNamespace, String workspaceId, CreateConceptSetRequest request); @Override ResponseEntity<EmptyResponse> deleteConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSet> getConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSetListResponse> getConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ConceptSetListResponse> getSurveyConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId, String surveyName); @Override ResponseEntity<ConceptSet> updateConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId, ConceptSet conceptSet); @Override ResponseEntity<ConceptSet> updateConceptSetConcepts(
String workspaceNamespace,
String workspaceId,
Long conceptSetId,
UpdateConceptSetRequest request); @Override ResponseEntity<ConceptSet> copyConceptSet(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromConceptSetId,
CopyRequest copyRequest); } | @Test public void testGetConceptSetsInWorkspaceEmpty() { assertThat( conceptSetsController .getConceptSetsInWorkspace(workspace.getNamespace(), WORKSPACE_NAME) .getBody() .getItems()) .isEmpty(); } |
ConceptSetsController implements ConceptSetsApiDelegate { @Override public ResponseEntity<ConceptSet> getConceptSet( String workspaceNamespace, String workspaceId, Long conceptSetId) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); return ResponseEntity.ok(conceptSetService.getConceptSet(conceptSetId)); } @Autowired ConceptSetsController(
WorkspaceService workspaceService,
ConceptSetService conceptSetService,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider); @Override ResponseEntity<ConceptSet> createConceptSet(
String workspaceNamespace, String workspaceId, CreateConceptSetRequest request); @Override ResponseEntity<EmptyResponse> deleteConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSet> getConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSetListResponse> getConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ConceptSetListResponse> getSurveyConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId, String surveyName); @Override ResponseEntity<ConceptSet> updateConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId, ConceptSet conceptSet); @Override ResponseEntity<ConceptSet> updateConceptSetConcepts(
String workspaceNamespace,
String workspaceId,
Long conceptSetId,
UpdateConceptSetRequest request); @Override ResponseEntity<ConceptSet> copyConceptSet(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromConceptSetId,
CopyRequest copyRequest); } | @Test(expected = NotFoundException.class) public void testGetConceptSetNotExists() { conceptSetsController.getConceptSet(workspace.getNamespace(), WORKSPACE_NAME, 1L); }
@Test(expected = NotFoundException.class) public void testGetSurveyConceptSetWrongConceptId() { makeSurveyConceptSet1(); conceptSetsController.getConceptSet(workspace2.getNamespace(), WORKSPACE_NAME_2, 99L); }
@Test public void testGetConceptSet() { ConceptSet conceptSet = makeConceptSet1(); assertThat( conceptSetsController .getConceptSet(workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId()) .getBody()) .isEqualTo(conceptSet); assertThat( conceptSetsController .getConceptSetsInWorkspace(workspace.getNamespace(), WORKSPACE_NAME) .getBody() .getItems()) .contains(conceptSet.concepts(null)); assertThat( conceptSetsController .getConceptSetsInWorkspace(workspace2.getNamespace(), WORKSPACE_NAME_2) .getBody() .getItems()) .isEmpty(); }
@Test(expected = NotFoundException.class) public void testGetConceptSetWrongConceptSetId() { makeConceptSet1(); conceptSetsController.getConceptSet(workspace2.getNamespace(), WORKSPACE_NAME_2, 99L); } |
ConceptSetsController implements ConceptSetsApiDelegate { @Override public ResponseEntity<ConceptSet> updateConceptSet( String workspaceNamespace, String workspaceId, Long conceptSetId, ConceptSet conceptSet) { validateUpdateConceptSet(conceptSet); workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); return ResponseEntity.ok(conceptSetService.updateConceptSet(conceptSetId, conceptSet)); } @Autowired ConceptSetsController(
WorkspaceService workspaceService,
ConceptSetService conceptSetService,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider); @Override ResponseEntity<ConceptSet> createConceptSet(
String workspaceNamespace, String workspaceId, CreateConceptSetRequest request); @Override ResponseEntity<EmptyResponse> deleteConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSet> getConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSetListResponse> getConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ConceptSetListResponse> getSurveyConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId, String surveyName); @Override ResponseEntity<ConceptSet> updateConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId, ConceptSet conceptSet); @Override ResponseEntity<ConceptSet> updateConceptSetConcepts(
String workspaceNamespace,
String workspaceId,
Long conceptSetId,
UpdateConceptSetRequest request); @Override ResponseEntity<ConceptSet> copyConceptSet(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromConceptSetId,
CopyRequest copyRequest); } | @Test(expected = NotFoundException.class) public void testUpdateConceptSetNotExists() { ConceptSet conceptSet = new ConceptSet(); conceptSet.setDescription("desc 1"); conceptSet.setName("concept set 1"); conceptSet.setDomain(Domain.CONDITION); conceptSet.setId(1L); conceptSet.setEtag(Etags.fromVersion(1)); conceptSetsController.updateConceptSet( workspace.getNamespace(), WORKSPACE_NAME, 1L, conceptSet); }
@Test public void testUpdateConceptSet() { conceptDao.save(CONCEPT_1); ConceptSet conceptSet = makeConceptSet1(); conceptSet.setDescription("new description"); conceptSet.setName("new name"); Instant newInstant = NOW.plusMillis(1); CLOCK.setInstant(newInstant); ConceptSet updatedConceptSet = conceptSetsController .updateConceptSet( workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId(), conceptSet) .getBody(); assertThat(updatedConceptSet.getCreator()).isEqualTo(USER_EMAIL); assertThat(updatedConceptSet.getConcepts()).isNotNull(); assertThat(updatedConceptSet.getCreationTime()).isEqualTo(NOW.toEpochMilli()); assertThat(updatedConceptSet.getDescription()).isEqualTo("new description"); assertThat(updatedConceptSet.getDomain()).isEqualTo(Domain.CONDITION); assertThat(updatedConceptSet.getEtag()).isEqualTo(Etags.fromVersion(2)); assertThat(updatedConceptSet.getLastModifiedTime()).isEqualTo(newInstant.toEpochMilli()); assertThat(updatedConceptSet.getParticipantCount()).isEqualTo(0); assertThat(conceptSet.getName()).isEqualTo("new name"); assertThat( conceptSetsController .getConceptSet(workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId()) .getBody()) .isEqualTo(updatedConceptSet); assertThat( conceptSetsController .getConceptSetsInWorkspace(workspace.getNamespace(), WORKSPACE_NAME) .getBody() .getItems()) .contains(updatedConceptSet.concepts(null)); assertThat( conceptSetsController .getConceptSetsInWorkspace(workspace2.getNamespace(), WORKSPACE_NAME_2) .getBody() .getItems()) .isEmpty(); }
@Test(expected = ConflictException.class) public void testUpdateConceptSetDomainChange() { ConceptSet conceptSet = makeConceptSet1(); conceptSet.setDescription("new description"); conceptSet.setName("new name"); conceptSet.setDomain(Domain.DEATH); conceptSetsController.updateConceptSet( workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId(), conceptSet); }
@Test(expected = ConflictException.class) public void testUpdateConceptSetWrongEtag() { ConceptSet conceptSet = makeConceptSet1(); conceptSet.setDescription("new description"); conceptSet.setName("new name"); conceptSet.setEtag(Etags.fromVersion(2)); conceptSetsController.updateConceptSet( workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId(), conceptSet); } |
ConceptSetsController implements ConceptSetsApiDelegate { @Override public ResponseEntity<ConceptSet> createConceptSet( String workspaceNamespace, String workspaceId, CreateConceptSetRequest request) { validateCreateConceptSetRequest(request); DbWorkspace workspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); ConceptSet conceptSet = conceptSetService.createConceptSet(request, userProvider.get(), workspace.getWorkspaceId()); userRecentResourceService.updateConceptSetEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), conceptSet.getId()); return ResponseEntity.ok(conceptSet); } @Autowired ConceptSetsController(
WorkspaceService workspaceService,
ConceptSetService conceptSetService,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider); @Override ResponseEntity<ConceptSet> createConceptSet(
String workspaceNamespace, String workspaceId, CreateConceptSetRequest request); @Override ResponseEntity<EmptyResponse> deleteConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSet> getConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSetListResponse> getConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ConceptSetListResponse> getSurveyConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId, String surveyName); @Override ResponseEntity<ConceptSet> updateConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId, ConceptSet conceptSet); @Override ResponseEntity<ConceptSet> updateConceptSetConcepts(
String workspaceNamespace,
String workspaceId,
Long conceptSetId,
UpdateConceptSetRequest request); @Override ResponseEntity<ConceptSet> copyConceptSet(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromConceptSetId,
CopyRequest copyRequest); } | @Test public void testCreateConceptSet() { ConceptSet conceptSet = new ConceptSet(); conceptSet.setDescription("desc 1"); conceptSet.setName("concept set 1"); conceptSet.setDomain(Domain.CONDITION); conceptSet = conceptSetsController .createConceptSet( workspace.getNamespace(), WORKSPACE_NAME, new CreateConceptSetRequest() .conceptSet(conceptSet) .addAddedIdsItem(CLIENT_CONCEPT_1.getConceptId())) .getBody(); assertThat(conceptSet.getConcepts()).isNotNull(); assertThat(conceptSet.getCreationTime()).isEqualTo(NOW.toEpochMilli()); assertThat(conceptSet.getDescription()).isEqualTo("desc 1"); assertThat(conceptSet.getDomain()).isEqualTo(Domain.CONDITION); assertThat(conceptSet.getEtag()).isEqualTo(Etags.fromVersion(1)); assertThat(conceptSet.getLastModifiedTime()).isEqualTo(NOW.toEpochMilli()); assertThat(conceptSet.getName()).isEqualTo("concept set 1"); assertThat(conceptSet.getParticipantCount()).isEqualTo(0); assertThat( conceptSetsController .getConceptSet(workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId()) .getBody()) .isEqualTo(conceptSet); assertThat( conceptSetsController .getConceptSetsInWorkspace(workspace.getNamespace(), WORKSPACE_NAME) .getBody() .getItems()) .contains(conceptSet.concepts(null)); assertThat( conceptSetsController .getConceptSetsInWorkspace(workspace2.getNamespace(), WORKSPACE_NAME_2) .getBody() .getItems()) .isEmpty(); } |
FreeTierBillingService { public void checkFreeTierBillingUsage() { final Map<DbUser, Double> previousUserCosts = workspaceFreeTierUsageDao.getUserCostMap(); final Map<DbWorkspace, Double> workspaceCosts = getFreeTierWorkspaceCostsFromBQ(); workspaceCosts.forEach(workspaceFreeTierUsageDao::updateCost); final Map<DbUser, Double> userCosts = workspaceCosts.entrySet().stream() .collect( Collectors.groupingBy( e -> e.getKey().getCreator(), Collectors.summingDouble(Entry::getValue))); final Set<DbUser> previouslyExpiredUsers = getExpiredUsersFromDb(); final Set<DbUser> expiredUsers = userCosts.entrySet().stream() .filter(e -> costAboveLimit(e.getKey(), e.getValue())) .map(Entry::getKey) .collect(Collectors.toSet()); final Set<DbUser> newlyExpiredUsers = Sets.difference(expiredUsers, previouslyExpiredUsers); for (final DbUser user : newlyExpiredUsers) { try { mailService.alertUserFreeTierExpiration(user); } catch (final MessagingException e) { logger.log(Level.WARNING, e.getMessage()); } updateFreeTierWorkspacesStatus(user, BillingStatus.INACTIVE); } final Set<DbUser> usersWithNonNullRegistration = userDao.findByFirstRegistrationCompletionTimeNotNull(); final Set<DbUser> usersToThresholdCheck = Sets.difference(usersWithNonNullRegistration, expiredUsers); sendAlertsForCostThresholds(usersToThresholdCheck, previousUserCosts, userCosts); } @Autowired FreeTierBillingService(
BigQueryService bigQueryService,
Clock clock,
MailService mailService,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserServiceAuditor userServiceAuditor,
WorkspaceDao workspaceDao,
WorkspaceFreeTierUsageDao workspaceFreeTierUsageDao); double getWorkspaceFreeTierBillingUsage(DbWorkspace dbWorkspace); void checkFreeTierBillingUsage(); @Nullable Double getCachedFreeTierUsage(DbUser user); boolean userHasRemainingFreeTierCredits(DbUser user); double getUserFreeTierDollarLimit(DbUser user); boolean maybeSetDollarLimitOverride(DbUser user, double newDollarLimit); Map<Long, Double> getUserIdToTotalCost(); } | @Test public void checkFreeTierBillingUsage_exceedsDollarThresholds() throws MessagingException { final double limit = 100.0; final double costUnderThreshold = 49.5; double threshold = 0.5; double costOverThreshold = 50.5; double remaining = limit - costOverThreshold; workbenchConfig.billing.defaultFreeCreditsDollarLimit = limit; final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT); final Instant registrationTime = START_INSTANT.minus(Period.ofDays(100)); user.setFirstRegistrationCompletionTime(Timestamp.from(registrationTime)); userDao.save(user); doReturn(mockBQTableSingleResult(costUnderThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); doReturn(mockBQTableSingleResult(costOverThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService) .alertUserFreeTierDollarThreshold( eq(user), eq(threshold), eq(costOverThreshold), eq(remaining)); doReturn(mockBQTableSingleResult(costOverThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); threshold = 0.75; costOverThreshold = 75.3; remaining = limit - costOverThreshold; doReturn(mockBQTableSingleResult(costOverThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService) .alertUserFreeTierDollarThreshold( eq(user), eq(threshold), eq(costOverThreshold), eq(remaining)); doReturn(mockBQTableSingleResult(costOverThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); final double costToTriggerExpiration = 100.01; doReturn(mockBQTableSingleResult(costToTriggerExpiration)) .when(bigQueryService) .executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService).alertUserFreeTierExpiration(eq(user)); doReturn(mockBQTableSingleResult(costToTriggerExpiration)) .when(bigQueryService) .executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); }
@Test public void checkFreeTierBillingUsage_altDollarThresholds() throws MessagingException { workbenchConfig.billing.freeTierCostAlertThresholds = new ArrayList<>(Doubles.asList(.3, .65)); final double limit = 100.0; final double costUnderThreshold = 29.9; double threshold = 0.3; double costOverThreshold = 30.1; double remaining = limit - costOverThreshold; workbenchConfig.billing.defaultFreeCreditsDollarLimit = limit; final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT); doReturn(mockBQTableSingleResult(costUnderThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); doReturn(mockBQTableSingleResult(costOverThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService) .alertUserFreeTierDollarThreshold( eq(user), eq(threshold), eq(costOverThreshold), eq(remaining)); doReturn(mockBQTableSingleResult(costOverThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); threshold = 0.65; costOverThreshold = 65.01; remaining = limit - costOverThreshold; doReturn(mockBQTableSingleResult(costOverThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService) .alertUserFreeTierDollarThreshold( eq(user), eq(threshold), eq(costOverThreshold), eq(remaining)); doReturn(mockBQTableSingleResult(costOverThreshold)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); final double costToTriggerExpiration = 100.01; doReturn(mockBQTableSingleResult(costToTriggerExpiration)) .when(bigQueryService) .executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService).alertUserFreeTierExpiration(eq(user)); doReturn(mockBQTableSingleResult(costToTriggerExpiration)) .when(bigQueryService) .executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); }
@Test public void checkFreeTierBillingUsage_disabledUserNotIgnored() throws MessagingException { workbenchConfig.billing.defaultFreeCreditsDollarLimit = 100.0; doReturn(mockBQTableSingleResult(100.01)).when(bigQueryService).executeQuery(any()); final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); user.setDisabled(true); userDao.save(user); final DbWorkspace workspace = createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService).alertUserFreeTierExpiration(eq(user)); assertSingleWorkspaceTestDbState(user, workspace, BillingStatus.INACTIVE, 100.01); }
@Test public void checkFreeTierBillingUsage_deletedWorkspaceNotIgnored() throws MessagingException { workbenchConfig.billing.defaultFreeCreditsDollarLimit = 100.0; doReturn(mockBQTableSingleResult(100.01)).when(bigQueryService).executeQuery(any()); final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); final DbWorkspace workspace = createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT); workspace.setWorkspaceActiveStatusEnum(WorkspaceActiveStatus.DELETED); workspaceDao.save(workspace); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService).alertUserFreeTierExpiration(eq(user)); assertSingleWorkspaceTestDbState(user, workspace, BillingStatus.INACTIVE, 100.01); }
@Test public void checkFreeTierBillingUsage_noAlert() { workbenchConfig.billing.defaultFreeCreditsDollarLimit = 100.0; doReturn(mockBQTableSingleResult(49.99)).when(bigQueryService).executeQuery(any()); final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); final DbWorkspace workspace = createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); assertSingleWorkspaceTestDbState(user, workspace, BillingStatus.ACTIVE, 49.99); }
@Test public void checkFreeTierBillingUsage_workspaceMissingCreatorNoNPE() { workbenchConfig.billing.defaultFreeCreditsDollarLimit = 100.0; doReturn(mockBQTableSingleResult(49.99)).when(bigQueryService).executeQuery(any()); final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); final DbWorkspace workspace = createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT); createWorkspace(null, "rumney"); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); assertSingleWorkspaceTestDbState(user, workspace, BillingStatus.ACTIVE, 49.99); }
@Test public void checkFreeTierBillingUsage_combinedProjectsExceedsLimit() throws MessagingException { final String ns1 = "namespace-1"; final String ns2 = "namespace-2"; final double cost1 = 123.45; final double cost2 = 234.56; final double sum = cost1 + cost2; workbenchConfig.billing.defaultFreeCreditsDollarLimit = sum - 0.01; doReturn(mockBQTableResult(ImmutableMap.of(ns1, cost1, ns2, cost2))) .when(bigQueryService) .executeQuery(any()); final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); final DbWorkspace ws1 = createWorkspace(user, ns1); final DbWorkspace ws2 = createWorkspace(user, ns2); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService).alertUserFreeTierExpiration(eq(user)); assertThat(workspaceFreeTierUsageDao.count()).isEqualTo(2); for (DbWorkspace ws : Arrays.asList(ws1, ws2)) { DbWorkspace dbWorkspace = workspaceDao.findOne(ws.getWorkspaceId()); assertThat(dbWorkspace.getBillingStatus()).isEqualTo(BillingStatus.INACTIVE); assertThat(dbWorkspace.getBillingAccountType()).isEqualTo(BillingAccountType.FREE_TIER); } final DbWorkspaceFreeTierUsage usage1 = workspaceFreeTierUsageDao.findOneByWorkspace(ws1); assertThat(usage1.getUser()).isEqualTo(user); assertWithinBillingTolerance(usage1.getCost(), cost1); final DbWorkspaceFreeTierUsage usage2 = workspaceFreeTierUsageDao.findOneByWorkspace(ws2); assertThat(usage2.getUser()).isEqualTo(user); assertWithinBillingTolerance(usage2.getCost(), cost2); }
@Test public void checkFreeTierBillingUsage_twoUsers() throws MessagingException { final String ns1 = "namespace-1"; final String ns2 = "namespace-2"; final double cost1 = 123.45; final double cost2 = 234.56; workbenchConfig.billing.defaultFreeCreditsDollarLimit = Math.min(cost1, cost2) - 0.01; doReturn(mockBQTableResult(ImmutableMap.of(ns1, cost1, ns2, cost2))) .when(bigQueryService) .executeQuery(any()); DbUser user1 = createUser(SINGLE_WORKSPACE_TEST_USER); DbWorkspace ws1 = createWorkspace(user1, ns1); DbUser user2 = createUser("[email protected]"); DbWorkspace ws2 = createWorkspace(user2, ns2); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService).alertUserFreeTierExpiration(eq(user1)); verify(mailService).alertUserFreeTierExpiration(eq(user2)); assertThat(workspaceFreeTierUsageDao.count()).isEqualTo(2); final DbWorkspace dbWorkspace1 = workspaceDao.findOne(ws1.getWorkspaceId()); assertThat(dbWorkspace1.getBillingStatus()).isEqualTo(BillingStatus.INACTIVE); assertThat(dbWorkspace1.getBillingAccountType()).isEqualTo(BillingAccountType.FREE_TIER); final DbWorkspaceFreeTierUsage usage1 = workspaceFreeTierUsageDao.findOneByWorkspace(ws1); assertThat(usage1.getUser()).isEqualTo(user1); assertWithinBillingTolerance(usage1.getCost(), cost1); final DbWorkspace dbWorkspace2 = workspaceDao.findOne(ws2.getWorkspaceId()); assertThat(dbWorkspace2.getBillingStatus()).isEqualTo(BillingStatus.INACTIVE); assertThat(dbWorkspace2.getBillingAccountType()).isEqualTo(BillingAccountType.FREE_TIER); final DbWorkspaceFreeTierUsage usage2 = workspaceFreeTierUsageDao.findOneByWorkspace(ws2); assertThat(usage2.getUser()).isEqualTo(user2); assertWithinBillingTolerance(usage2.getCost(), cost2); }
@Test public void checkFreeTierBillingUsage_ignoreOLDMigrationStatus() { workbenchConfig.billing.defaultFreeCreditsDollarLimit = 100.0; doReturn(mockBQTableSingleResult(100.01)).when(bigQueryService).executeQuery(any()); final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT, BillingMigrationStatus.OLD); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); assertThat(workspaceFreeTierUsageDao.count()).isEqualTo(0); }
@Test public void checkFreeTierBillingUsage_ignoreMIGRATEDMigrationStatus() { workbenchConfig.billing.defaultFreeCreditsDollarLimit = 100.0; doReturn(mockBQTableSingleResult(100.01)).when(bigQueryService).executeQuery(any()); final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT, BillingMigrationStatus.MIGRATED); freeTierBillingService.checkFreeTierBillingUsage(); verifyZeroInteractions(mailService); assertThat(workspaceFreeTierUsageDao.count()).isEqualTo(0); }
@Test public void checkFreeTierBillingUsage_dbUpdate() throws MessagingException { workbenchConfig.billing.defaultFreeCreditsDollarLimit = 100.0; doReturn(mockBQTableSingleResult(100.01)).when(bigQueryService).executeQuery(any()); final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); final DbWorkspace workspace = createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService).alertUserFreeTierExpiration(eq(user)); assertSingleWorkspaceTestDbState(user, workspace, BillingStatus.INACTIVE, 100.01); Timestamp t0 = workspaceFreeTierUsageDao.findAll().iterator().next().getLastUpdateTime(); final double newTotalCost = 123.45; doReturn(mockBQTableSingleResult(newTotalCost)).when(bigQueryService).executeQuery(any()); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService, times(1)).alertUserFreeTierExpiration(eq(user)); DbWorkspace dbWorkspace = workspaceDao.findOne(workspace.getWorkspaceId()); assertThat(dbWorkspace.getBillingStatus()).isEqualTo(BillingStatus.INACTIVE); assertThat(dbWorkspace.getBillingAccountType()).isEqualTo(BillingAccountType.FREE_TIER); assertThat(workspaceFreeTierUsageDao.count()).isEqualTo(1); DbWorkspaceFreeTierUsage dbEntry = workspaceFreeTierUsageDao.findAll().iterator().next(); assertThat(dbEntry.getUser()).isEqualTo(user); assertThat(dbEntry.getWorkspace()).isEqualTo(workspace); assertWithinBillingTolerance(dbEntry.getCost(), newTotalCost); Timestamp t1 = dbEntry.getLastUpdateTime(); assertThat(t1.after(t0)).isTrue(); }
@Test public void test_disableOnlyFreeTierWorkspaces() throws MessagingException { workbenchConfig.billing.defaultFreeCreditsDollarLimit = 100.0; doReturn(mockBQTableSingleResult(100.01)).when(bigQueryService).executeQuery(any()); final DbUser user = createUser(SINGLE_WORKSPACE_TEST_USER); final DbWorkspace freeTierWorkspace = createWorkspace(user, SINGLE_WORKSPACE_TEST_PROJECT); final DbWorkspace userAccountWorkspace = new DbWorkspace(); userAccountWorkspace.setCreator(user); userAccountWorkspace.setWorkspaceNamespace("some other namespace"); userAccountWorkspace.setBillingMigrationStatusEnum(BillingMigrationStatus.NEW); userAccountWorkspace.setBillingAccountName("some other account"); userAccountWorkspace.setBillingStatus(BillingStatus.ACTIVE); workspaceDao.save(userAccountWorkspace); freeTierBillingService.checkFreeTierBillingUsage(); verify(mailService).alertUserFreeTierExpiration(eq(user)); assertSingleWorkspaceTestDbState(user, freeTierWorkspace, BillingStatus.INACTIVE, 100.01); final DbWorkspace retrievedWorkspace = workspaceDao.findOne(userAccountWorkspace.getWorkspaceId()); assertThat(retrievedWorkspace.getBillingStatus()).isEqualTo(BillingStatus.ACTIVE); } |
ConceptSetsController implements ConceptSetsApiDelegate { @Override public ResponseEntity<ConceptSet> updateConceptSetConcepts( String workspaceNamespace, String workspaceId, Long conceptSetId, UpdateConceptSetRequest request) { validateUpdateConceptSetConcepts(request); workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); return ResponseEntity.ok(conceptSetService.updateConceptSetConcepts(conceptSetId, request)); } @Autowired ConceptSetsController(
WorkspaceService workspaceService,
ConceptSetService conceptSetService,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider); @Override ResponseEntity<ConceptSet> createConceptSet(
String workspaceNamespace, String workspaceId, CreateConceptSetRequest request); @Override ResponseEntity<EmptyResponse> deleteConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSet> getConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSetListResponse> getConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ConceptSetListResponse> getSurveyConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId, String surveyName); @Override ResponseEntity<ConceptSet> updateConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId, ConceptSet conceptSet); @Override ResponseEntity<ConceptSet> updateConceptSetConcepts(
String workspaceNamespace,
String workspaceId,
Long conceptSetId,
UpdateConceptSetRequest request); @Override ResponseEntity<ConceptSet> copyConceptSet(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromConceptSetId,
CopyRequest copyRequest); } | @Test public void testUpdateConceptSetConceptsAddAndRemove() { saveConcepts(); when(conceptBigQueryService.getParticipantCountForConcepts( Domain.CONDITION, "condition_occurrence", ImmutableSet.of(CLIENT_CONCEPT_1.getConceptId()))) .thenReturn(123); when(conceptBigQueryService.getParticipantCountForConcepts( Domain.CONDITION, "condition_occurrence", ImmutableSet.of(CLIENT_CONCEPT_1.getConceptId(), CLIENT_CONCEPT_3.getConceptId()))) .thenReturn(246); ConceptSet conceptSet = makeConceptSet1(); ConceptSet updated = conceptSetsController .updateConceptSetConcepts( workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId(), addConceptsRequest(conceptSet.getEtag(), CLIENT_CONCEPT_3.getConceptId())) .getBody(); assertThat(updated.getConcepts()).contains(CLIENT_CONCEPT_3); assertThat(updated.getEtag()).isNotEqualTo(conceptSet.getEtag()); assertThat(updated.getParticipantCount()).isEqualTo(246); ConceptSet removed = conceptSetsController .updateConceptSetConcepts( workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId(), removeConceptsRequest(updated.getEtag(), CLIENT_CONCEPT_3.getConceptId())) .getBody(); assertThat(removed.getConcepts().size()).isEqualTo(1); assertThat(removed.getEtag()).isNotEqualTo(conceptSet.getEtag()); assertThat(removed.getEtag()).isNotEqualTo(updated.getEtag()); assertThat(removed.getParticipantCount()).isEqualTo(123); }
@Test public void testUpdateConceptSetConceptsAddMany() { saveConcepts(); ConceptSetService.MAX_CONCEPTS_PER_SET = 1000; when(conceptBigQueryService.getParticipantCountForConcepts( Domain.CONDITION, "condition_occurrence", ImmutableSet.of( CLIENT_CONCEPT_1.getConceptId(), CLIENT_CONCEPT_3.getConceptId(), CLIENT_CONCEPT_4.getConceptId()))) .thenReturn(456); ConceptSet conceptSet = makeConceptSet1(); ConceptSet updated = conceptSetsController .updateConceptSetConcepts( workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId(), addConceptsRequest( conceptSet.getEtag(), CLIENT_CONCEPT_1.getConceptId(), CLIENT_CONCEPT_3.getConceptId(), CLIENT_CONCEPT_4.getConceptId())) .getBody(); assertThat(updated.getConcepts()) .containsExactly(CLIENT_CONCEPT_1, CLIENT_CONCEPT_4, CLIENT_CONCEPT_3); assertThat(updated.getEtag()).isNotEqualTo(conceptSet.getEtag()); assertThat(updated.getParticipantCount()).isEqualTo(456); when(conceptBigQueryService.getParticipantCountForConcepts( Domain.CONDITION, "condition_occurrence", ImmutableSet.of(CLIENT_CONCEPT_1.getConceptId()))) .thenReturn(123); ConceptSet removed = conceptSetsController .updateConceptSetConcepts( workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId(), removeConceptsRequest( updated.getEtag(), CLIENT_CONCEPT_3.getConceptId(), CLIENT_CONCEPT_4.getConceptId())) .getBody(); assertThat(removed.getConcepts()).containsExactly(CLIENT_CONCEPT_1); assertThat(removed.getEtag()).isNotEqualTo(conceptSet.getEtag()); assertThat(removed.getEtag()).isNotEqualTo(updated.getEtag()); assertThat(removed.getParticipantCount()).isEqualTo(123); }
@Test(expected = ConflictException.class) public void testUpdateConceptSetConceptsAddTooMany() { saveConcepts(); ConceptSet conceptSet = makeConceptSet1(); ConceptSetService.MAX_CONCEPTS_PER_SET = 2; conceptSetsController .updateConceptSetConcepts( workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId(), addConceptsRequest( conceptSet.getEtag(), CLIENT_CONCEPT_1.getConceptId(), CLIENT_CONCEPT_3.getConceptId(), CLIENT_CONCEPT_4.getConceptId())) .getBody(); }
@Test(expected = ConflictException.class) public void testUpdateConceptSetConceptsWrongEtag() { saveConcepts(); ConceptSet conceptSet = makeConceptSet1(); conceptSetsController.updateConceptSetConcepts( workspace.getNamespace(), WORKSPACE_NAME, conceptSet.getId(), addConceptsRequest(Etags.fromVersion(2), CLIENT_CONCEPT_1.getConceptId())); } |
ConceptSetsController implements ConceptSetsApiDelegate { @Override public ResponseEntity<EmptyResponse> deleteConceptSet( String workspaceNamespace, String workspaceId, Long conceptSetId) { conceptSetService.delete(conceptSetId); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ConceptSetsController(
WorkspaceService workspaceService,
ConceptSetService conceptSetService,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider); @Override ResponseEntity<ConceptSet> createConceptSet(
String workspaceNamespace, String workspaceId, CreateConceptSetRequest request); @Override ResponseEntity<EmptyResponse> deleteConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSet> getConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId); @Override ResponseEntity<ConceptSetListResponse> getConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ConceptSetListResponse> getSurveyConceptSetsInWorkspace(
String workspaceNamespace, String workspaceId, String surveyName); @Override ResponseEntity<ConceptSet> updateConceptSet(
String workspaceNamespace, String workspaceId, Long conceptSetId, ConceptSet conceptSet); @Override ResponseEntity<ConceptSet> updateConceptSetConcepts(
String workspaceNamespace,
String workspaceId,
Long conceptSetId,
UpdateConceptSetRequest request); @Override ResponseEntity<ConceptSet> copyConceptSet(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromConceptSetId,
CopyRequest copyRequest); } | @Test public void testDeleteConceptSet() { saveConcepts(); ConceptSetService.MAX_CONCEPTS_PER_SET = 1000; ConceptSet conceptSet1 = makeConceptSet1(); ConceptSet conceptSet2 = makeConceptSet2(); ConceptSet updatedConceptSet = conceptSetsController .updateConceptSetConcepts( workspace.getNamespace(), WORKSPACE_NAME, conceptSet1.getId(), addConceptsRequest( conceptSet1.getEtag(), CLIENT_CONCEPT_1.getConceptId(), CLIENT_CONCEPT_3.getConceptId(), CLIENT_CONCEPT_4.getConceptId())) .getBody(); ConceptSet updatedConceptSet2 = conceptSetsController .updateConceptSetConcepts( workspace.getNamespace(), WORKSPACE_NAME, conceptSet2.getId(), addConceptsRequest(conceptSet2.getEtag(), CLIENT_CONCEPT_2.getConceptId())) .getBody(); assertThat(updatedConceptSet.getConcepts()) .containsExactly(CLIENT_CONCEPT_1, CLIENT_CONCEPT_3, CLIENT_CONCEPT_4); assertThat(updatedConceptSet2.getConcepts()).containsExactly(CLIENT_CONCEPT_2); conceptSetsController.deleteConceptSet( workspace.getNamespace(), WORKSPACE_NAME, conceptSet1.getId()); try { conceptSetsController.getConceptSet( workspace.getNamespace(), WORKSPACE_NAME, conceptSet1.getId()); fail("NotFoundException expected"); } catch (NotFoundException e) { } conceptSet2 = conceptSetsController .getConceptSet(workspace.getNamespace(), WORKSPACE_NAME, conceptSet2.getId()) .getBody(); assertThat(conceptSet2.getConcepts()).containsExactly(CLIENT_CONCEPT_2); } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<CohortReview> createCohortReview( String workspaceNamespace, String workspaceId, Long cohortId, Long cdrVersionId, CreateReviewRequest request) { if (request.getSize() <= 0 || request.getSize() > MAX_REVIEW_SIZE) { throw new BadRequestException( String.format( "Bad Request: Cohort Review size must be between %s and %s", 0, MAX_REVIEW_SIZE)); } workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); CohortReview cohortReview; DbCohort cohort = cohortReviewService.findCohort(cohortId); try { cohortReview = cohortReviewService.findCohortReview(cohortId, cdrVersionId); } catch (NotFoundException nfe) { cohortReview = initializeCohortReview(cdrVersionId, cohort); cohortReview = cohortReviewService.saveCohortReview(cohortReview, userProvider.get()); } if (cohortReview.getReviewSize() > 0) { throw new BadRequestException( String.format( "Bad Request: Cohort Review already created for cohortId: %s, cdrVersionId: %s", cohortId, cdrVersionId)); } SearchRequest searchRequest = new Gson().fromJson(getCohortDefinition(cohort), SearchRequest.class); TableResult result = bigQueryService.executeQuery( bigQueryService.filterBigQueryConfig( cohortQueryBuilder.buildRandomParticipantQuery( new ParticipantCriteria(searchRequest), request.getSize(), 0L))); Map<String, Integer> rm = bigQueryService.getResultMapper(result); List<DbParticipantCohortStatus> participantCohortStatuses = createParticipantCohortStatusesList(cohortReview.getCohortReviewId(), result, rm); cohortReview .reviewSize(Long.valueOf(participantCohortStatuses.size())) .reviewStatus(ReviewStatus.CREATED); cohortReviewService.saveFullCohortReview(cohortReview, participantCohortStatuses); PageRequest pageRequest = new PageRequest() .page(PAGE) .pageSize(PAGE_SIZE) .sortOrder(SortOrder.ASC) .sortColumn(FilterColumns.PARTICIPANTID.toString()); List<ParticipantCohortStatus> paginatedPCS = cohortReviewService.findAll(cohortReview.getCohortReviewId(), pageRequest); cohortReview .page(pageRequest.getPage()) .pageSize(pageRequest.getPageSize()) .sortOrder(pageRequest.getSortOrder().toString()) .sortColumn(pageRequest.getSortColumn()) .participantCohortStatuses(paginatedPCS); return ResponseEntity.ok(cohortReview); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void createCohortReviewLessThanMinSize() { try { cohortReviewController.createCohortReview( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohort.getCohortId(), cdrVersion.getCdrVersionId(), new CreateReviewRequest().size(0)); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertThat(bre.getMessage()) .isEqualTo("Bad Request: Cohort Review size must be between 0 and 10000"); } }
@Test public void createCohortReviewMoreThanMaxSize() { try { cohortReviewController.createCohortReview( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohort.getCohortId(), cdrVersion.getCdrVersionId(), new CreateReviewRequest().size(10001)); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertThat(bre.getMessage()) .isEqualTo("Bad Request: Cohort Review size must be between 0 and 10000"); } }
@Test public void createCohortReviewAlreadyExists() { when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(workspace); stubBigQueryCohortCalls(); try { cohortReviewController.createCohortReview( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohort.getCohortId(), cdrVersion.getCdrVersionId(), new CreateReviewRequest().size(1)); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertThat(bre.getMessage()) .isEqualTo( "Bad Request: Cohort Review already created for cohortId: " + cohort.getCohortId() + ", cdrVersionId: " + cdrVersion.getCdrVersionId()); } }
@Test public void createCohortReview() { when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(workspace); stubBigQueryCohortCalls(); CohortReview cohortReview = cohortReviewController .createCohortReview( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortWithoutReview.getCohortId(), cdrVersion.getCdrVersionId(), new CreateReviewRequest().size(1)) .getBody(); assertThat(cohortReview.getReviewStatus()).isEqualTo(ReviewStatus.CREATED); assertThat(cohortReview.getCohortName()).isEqualTo(cohortWithoutReview.getName()); assertThat(cohortReview.getDescription()).isEqualTo(cohortWithoutReview.getDescription()); assertThat(cohortReview.getReviewSize()).isEqualTo(1); assertThat(cohortReview.getParticipantCohortStatuses().size()).isEqualTo(1); assertThat(cohortReview.getParticipantCohortStatuses().get(0).getStatus()) .isEqualTo(CohortStatus.NOT_REVIEWED); }
@Test public void createCohortReviewNoCohortException() { long cohortId = 99; when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(workspace); stubBigQueryCohortCalls(); try { cohortReviewController .createCohortReview( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortId, cdrVersion.getCdrVersionId(), new CreateReviewRequest().size(1)) .getBody(); fail("Should have thrown NotFoundException!"); } catch (NotFoundException nfe) { assertEquals("Not Found: No Cohort exists for cohortId: " + cohortId, nfe.getMessage()); } } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<CohortReview> updateCohortReview( String workspaceNamespace, String workspaceId, Long cohortReviewId, CohortReview cohortReview) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); return ResponseEntity.ok( cohortReviewService.updateCohortReview( cohortReview, cohortReviewId, new Timestamp(clock.instant().toEpochMilli()))); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void updateCohortReview() { when(workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(WorkspaceAccessLevel.WRITER); CohortReview requestCohortReview = new CohortReview() .cohortReviewId(cohortReview.getCohortReviewId()) .etag(Etags.fromVersion(cohortReview.getVersion())); requestCohortReview.setCohortName("blahblah"); requestCohortReview.setDescription("new desc"); CohortReview responseCohortReview = cohortReviewController .updateCohortReview( WORKSPACE_NAMESPACE, WORKSPACE_NAME, requestCohortReview.getCohortReviewId(), requestCohortReview) .getBody(); assertThat(responseCohortReview.getCohortName()).isEqualTo(requestCohortReview.getCohortName()); assertThat(responseCohortReview.getDescription()) .isEqualTo(requestCohortReview.getDescription()); assertThat(responseCohortReview.getLastModifiedTime()).isNotNull(); } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<EmptyResponse> deleteCohortReview( String workspaceNamespace, String workspaceId, Long cohortReviewId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); cohortReviewService.deleteCohortReview(cohortReviewId); return ResponseEntity.ok(new EmptyResponse()); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void deleteCohortReview() { when(workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(WorkspaceAccessLevel.WRITER); CohortReview requestCohortReview = new CohortReview() .cohortReviewId(cohortReview.getCohortReviewId()) .etag(Etags.fromVersion(cohortReview.getVersion())); EmptyResponse emptyResponse = cohortReviewController .deleteCohortReview( WORKSPACE_NAMESPACE, WORKSPACE_NAME, requestCohortReview.getCohortReviewId()) .getBody(); assertThat(emptyResponse).isNotNull(); } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation( String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId, ParticipantCohortAnnotation request) { if (!request.getCohortReviewId().equals(cohortReviewId)) { throw new BadRequestException( "Bad Request: request cohort review id must equal path parameter cohort review id."); } workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); return ResponseEntity.ok( cohortReviewService.saveParticipantCohortAnnotation(request.getCohortReviewId(), request)); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void createParticipantCohortAnnotationNoAnnotationDefinitionFound() { Long participantId = participantCohortStatus1.getParticipantKey().getParticipantId(); when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(workspace); try { cohortReviewController .createParticipantCohortAnnotation( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortReview.getCohortReviewId(), participantId, new ParticipantCohortAnnotation() .cohortReviewId(cohortReview.getCohortReviewId()) .participantId(participantId) .annotationValueString("test") .cohortAnnotationDefinitionId(9999L)) .getBody(); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException nfe) { assertThat(nfe.getMessage()) .isEqualTo("Not Found: No cohort annotation definition found for id: 9999"); } }
@Test public void createParticipantCohortAnnotation() { Long participantId = participantCohortStatus1.getParticipantKey().getParticipantId(); participantCohortAnnotationDao.delete(participantAnnotation); assertCreateParticipantCohortAnnotation( participantId, stringAnnotationDefinition.getCohortAnnotationDefinitionId(), new ParticipantCohortAnnotation() .cohortReviewId(cohortReview.getCohortReviewId()) .participantId(participantId) .annotationValueString("test") .cohortAnnotationDefinitionId( stringAnnotationDefinition.getCohortAnnotationDefinitionId())); assertCreateParticipantCohortAnnotation( participantId, enumAnnotationDefinition.getCohortAnnotationDefinitionId(), new ParticipantCohortAnnotation() .cohortReviewId(cohortReview.getCohortReviewId()) .participantId(participantId) .annotationValueEnum("test") .cohortAnnotationDefinitionId( enumAnnotationDefinition.getCohortAnnotationDefinitionId())); assertCreateParticipantCohortAnnotation( participantId, dateAnnotationDefinition.getCohortAnnotationDefinitionId(), new ParticipantCohortAnnotation() .cohortReviewId(cohortReview.getCohortReviewId()) .participantId(participantId) .annotationValueDate("2018-02-02") .cohortAnnotationDefinitionId( dateAnnotationDefinition.getCohortAnnotationDefinitionId())); assertCreateParticipantCohortAnnotation( participantId, booleanAnnotationDefinition.getCohortAnnotationDefinitionId(), new ParticipantCohortAnnotation() .cohortReviewId(cohortReview.getCohortReviewId()) .participantId(participantId) .annotationValueBoolean(true) .cohortAnnotationDefinitionId( booleanAnnotationDefinition.getCohortAnnotationDefinitionId())); assertCreateParticipantCohortAnnotation( participantId, integerAnnotationDefinition.getCohortAnnotationDefinitionId(), new ParticipantCohortAnnotation() .cohortReviewId(cohortReview.getCohortReviewId()) .participantId(participantId) .annotationValueInteger(1) .cohortAnnotationDefinitionId( integerAnnotationDefinition.getCohortAnnotationDefinitionId())); } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation( String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId, Long annotationId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); cohortReviewService.deleteParticipantCohortAnnotation( annotationId, cohortReviewId, participantId); return ResponseEntity.ok(new EmptyResponse()); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void deleteParticipantCohortAnnotation() { DbParticipantCohortAnnotation annotation = new DbParticipantCohortAnnotation() .cohortReviewId(cohortReview.getCohortReviewId()) .participantId(participantCohortStatus1.getParticipantKey().getParticipantId()) .annotationValueString("test") .cohortAnnotationDefinitionId( stringAnnotationDefinition.getCohortAnnotationDefinitionId()); participantCohortAnnotationDao.save(annotation); when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(workspace); cohortReviewController.deleteParticipantCohortAnnotation( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortReview.getCohortReviewId(), participantCohortStatus1.getParticipantKey().getParticipantId(), annotation.getAnnotationId()); assertThat(participantCohortAnnotationDao.findOne(annotation.getAnnotationId())) .isEqualTo(null); }
@Test public void deleteParticipantCohortAnnotationNoAnnotation() { Long participantId = participantCohortStatus1.getParticipantKey().getParticipantId(); Long annotationId = 9999L; when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(workspace); try { cohortReviewController.deleteParticipantCohortAnnotation( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortReview.getCohortReviewId(), participantId, annotationId); fail("Should have thrown a NotFoundException!"); } catch (NotFoundException nfe) { assertThat(nfe.getMessage()) .isEqualTo( "Not Found: No participant cohort annotation found for annotationId: " + annotationId + ", cohortReviewId: " + cohortReview.getCohortReviewId() + ", participantId: " + participantId); } } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations( String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); List<ParticipantCohortAnnotation> annotations = cohortReviewService.findParticipantCohortAnnotations(cohortReviewId, participantId); return ResponseEntity.ok(new ParticipantCohortAnnotationListResponse().items(annotations)); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void getParticipantCohortAnnotations() { when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.READER)) .thenReturn(workspace); ParticipantCohortAnnotationListResponse response = cohortReviewController .getParticipantCohortAnnotations( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortReview.getCohortReviewId(), participantCohortStatus1.getParticipantKey().getParticipantId()) .getBody(); assertThat(response.getItems().size()).isEqualTo(1); assertThat(response.getItems().get(0).getCohortReviewId()) .isEqualTo(cohortReview.getCohortReviewId()); assertThat(response.getItems().get(0).getParticipantId()) .isEqualTo(participantCohortStatus1.getParticipantKey().getParticipantId()); } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus( String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); return ResponseEntity.ok( cohortReviewService.findParticipantCohortStatus(cohortReviewId, participantId)); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void getParticipantCohortStatus() { when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.READER)) .thenReturn(workspace); ParticipantCohortStatus response = cohortReviewController .getParticipantCohortStatus( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortReview.getCohortReviewId(), participantCohortStatus1.getParticipantKey().getParticipantId()) .getBody(); assertThat(response.getParticipantId()) .isEqualTo(participantCohortStatus1.getParticipantKey().getParticipantId()); assertThat(response.getStatus()) .isEqualTo(DbStorageEnums.cohortStatusFromStorage(participantCohortStatus1.getStatus())); assertThat(response.getEthnicityConceptId()) .isEqualTo(participantCohortStatus1.getEthnicityConceptId()); assertThat(response.getRaceConceptId()).isEqualTo(participantCohortStatus1.getRaceConceptId()); assertThat(response.getGenderConceptId()) .isEqualTo(participantCohortStatus1.getGenderConceptId()); assertThat(response.getSexAtBirthConceptId()) .isEqualTo(participantCohortStatus1.getSexAtBirthConceptId()); } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<CohortReview> getParticipantCohortStatuses( String workspaceNamespace, String workspaceId, Long cohortId, Long cdrVersionId, PageFilterRequest request) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); CohortReview cohortReview; List<ParticipantCohortStatus> participantCohortStatuses = new ArrayList<>(); DbCohort cohort = cohortReviewService.findCohort(cohortId); PageRequest pageRequest = createPageRequest(request); convertGenderRaceEthnicitySortOrder(pageRequest); try { cohortReview = cohortReviewService.findCohortReview(cohortId, cdrVersionId); participantCohortStatuses = cohortReviewService.findAll(cohortReview.getCohortReviewId(), pageRequest); } catch (NotFoundException nfe) { cohortReview = initializeCohortReview(cdrVersionId, cohort); } cohortReview .page(pageRequest.getPage()) .pageSize(pageRequest.getPageSize()) .sortOrder(pageRequest.getSortOrder().toString()) .sortColumn(pageRequest.getSortColumn()) .participantCohortStatuses(participantCohortStatuses) .queryResultSize( pageRequest.getFilters().isEmpty() ? cohortReview.getReviewSize() : cohortReviewService.findCount(cohortReview.getCohortReviewId(), pageRequest)); userRecentResourceService.updateCohortEntry( cohort.getWorkspaceId(), userProvider.get().getUserId(), cohortId); return ResponseEntity.ok(cohortReview); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void getParticipantCohortStatuses() { int page = 0; int pageSize = 25; CohortReview expectedReview1 = createCohortReview( cohortReview, ImmutableList.of(participantCohortStatus1, participantCohortStatus2), page, pageSize, SortOrder.DESC, FilterColumns.STATUS); CohortReview expectedReview2 = createCohortReview( cohortReview, ImmutableList.of(participantCohortStatus2, participantCohortStatus1), page, pageSize, SortOrder.DESC, FilterColumns.PARTICIPANTID); CohortReview expectedReview3 = createCohortReview( cohortReview, ImmutableList.of(participantCohortStatus1, participantCohortStatus2), page, pageSize, SortOrder.ASC, FilterColumns.STATUS); CohortReview expectedReview4 = createCohortReview( cohortReview, ImmutableList.of(participantCohortStatus1, participantCohortStatus2), page, pageSize, SortOrder.ASC, FilterColumns.PARTICIPANTID); when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.READER)) .thenReturn(workspace); assertParticipantCohortStatuses( expectedReview1, page, pageSize, SortOrder.DESC, FilterColumns.STATUS); assertParticipantCohortStatuses( expectedReview2, page, pageSize, SortOrder.DESC, FilterColumns.PARTICIPANTID); assertParticipantCohortStatuses(expectedReview3, null, null, null, FilterColumns.STATUS); assertParticipantCohortStatuses(expectedReview4, null, null, SortOrder.ASC, null); assertParticipantCohortStatuses(expectedReview4, null, pageSize, null, null); assertParticipantCohortStatuses(expectedReview4, page, null, null, null); assertParticipantCohortStatuses(expectedReview4, null, null, null, null); } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation( String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId, Long annotationId, ModifyParticipantCohortAnnotationRequest request) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); return ResponseEntity.ok( cohortReviewService.updateParticipantCohortAnnotation( annotationId, cohortReviewId, participantId, request)); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void updateParticipantCohortAnnotation() { when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(workspace); ParticipantCohortAnnotation participantCohortAnnotation = cohortReviewController .updateParticipantCohortAnnotation( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortReview.getCohortReviewId(), participantCohortStatus1.getParticipantKey().getParticipantId(), participantAnnotation.getAnnotationId(), new ModifyParticipantCohortAnnotationRequest().annotationValueString("test1")) .getBody(); assertThat(participantCohortAnnotation.getAnnotationValueString()).isEqualTo("test1"); }
@Test public void updateParticipantCohortAnnotationNoAnnotationForIdException() { long badAnnotationId = 99; when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(workspace); try { cohortReviewController .updateParticipantCohortAnnotation( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortReview.getCohortReviewId(), participantCohortStatus1.getParticipantKey().getParticipantId(), badAnnotationId, new ModifyParticipantCohortAnnotationRequest().annotationValueString("test1")) .getBody(); } catch (NotFoundException nfe) { assertEquals( "Not Found: Participant Cohort Annotation does not exist for annotationId: " + badAnnotationId + ", cohortReviewId: " + cohortReview.getCohortReviewId() + ", participantId: " + participantCohortStatus1.getParticipantKey().getParticipantId(), nfe.getMessage()); } } |
CohortReviewController implements CohortReviewApiDelegate { @Override public ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus( String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId, ModifyCohortStatusRequest cohortStatusRequest) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); return ResponseEntity.ok( cohortReviewService.updateParticipantCohortStatus( cohortReviewId, participantId, cohortStatusRequest.getStatus(), new Timestamp(clock.instant().toEpochMilli()))); } @Autowired CohortReviewController(
CohortReviewService cohortReviewService,
BigQueryService bigQueryService,
CohortBuilderService cohortBuilderService,
CohortQueryBuilder cohortQueryBuilder,
ReviewQueryBuilder reviewQueryBuilder,
UserRecentResourceService userRecentResourceService,
Provider<DbUser> userProvider,
WorkspaceService workspaceService,
Clock clock); @Override ResponseEntity<CohortReview> createCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
CreateReviewRequest request); @Override ResponseEntity<ParticipantCohortAnnotation> createParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ParticipantCohortAnnotation request); @Override ResponseEntity<EmptyResponse> deleteCohortReview(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<EmptyResponse> deleteParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId); @Override ResponseEntity<CohortChartDataListResponse> getCohortChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
String domain,
Integer limit); @Override ResponseEntity<CohortReviewListResponse> getCohortReviewsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ParticipantChartDataListResponse> getParticipantChartData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
String domain,
Integer limit); @Override ResponseEntity<ParticipantCohortAnnotationListResponse> getParticipantCohortAnnotations(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<ParticipantCohortStatus> getParticipantCohortStatus(
String workspaceNamespace, String workspaceId, Long cohortReviewId, Long participantId); @Override ResponseEntity<CohortReview> getParticipantCohortStatuses(
String workspaceNamespace,
String workspaceId,
Long cohortId,
Long cdrVersionId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataCountResponse> getParticipantCount(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<ParticipantDataListResponse> getParticipantData(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
PageFilterRequest request); @Override ResponseEntity<VocabularyListResponse> getVocabularies(
String workspaceNamespace, String workspaceId, Long cohortReviewId); @Override ResponseEntity<CohortReview> updateCohortReview(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
CohortReview cohortReview); @Override ResponseEntity<ParticipantCohortAnnotation> updateParticipantCohortAnnotation(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
Long annotationId,
ModifyParticipantCohortAnnotationRequest request); @Override ResponseEntity<ParticipantCohortStatus> updateParticipantCohortStatus(
String workspaceNamespace,
String workspaceId,
Long cohortReviewId,
Long participantId,
ModifyCohortStatusRequest cohortStatusRequest); static final Integer PAGE; static final Integer PAGE_SIZE; static final Integer MAX_REVIEW_SIZE; static final Integer MIN_LIMIT; static final Integer MAX_LIMIT; static final Integer DEFAULT_LIMIT; static final List<String> SEX_GENDER_RACE_ETHNICITY_TYPES; } | @Test public void updateParticipantCohortStatus() { when(workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( WORKSPACE_NAMESPACE, WORKSPACE_NAME, WorkspaceAccessLevel.WRITER)) .thenReturn(workspace); ParticipantCohortStatus participantCohortStatus = cohortReviewController .updateParticipantCohortStatus( WORKSPACE_NAMESPACE, WORKSPACE_NAME, cohortReview.getCohortReviewId(), participantCohortStatus1.getParticipantKey().getParticipantId(), new ModifyCohortStatusRequest().status(CohortStatus.INCLUDED)) .getBody(); assertThat(participantCohortStatus.getStatus()).isEqualTo(CohortStatus.INCLUDED); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<WorkspaceResponseListResponse> getWorkspaces() { final WorkspaceResponseListResponse response = new WorkspaceResponseListResponse(); response.setItems(recordOperationTime(workspaceService::getWorkspaces, "getWorkspaces")); return ResponseEntity.ok(response); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void getWorkspaces() { Workspace workspace = createWorkspace(); workspace = workspacesController.createWorkspace(workspace).getBody(); verify(mockWorkspaceAuditor).fireCreateAction(any(Workspace.class), anyLong()); FirecloudWorkspaceResponse fcResponse = new FirecloudWorkspaceResponse(); fcResponse.setWorkspace( testMockFactory.createFirecloudWorkspace( workspace.getNamespace(), workspace.getName(), null)); fcResponse.setAccessLevel(WorkspaceAccessLevel.OWNER.toString()); doReturn(Collections.singletonList(fcResponse)).when(fireCloudService).getWorkspaces(); assertThat(workspacesController.getWorkspaces().getBody().getItems().size()).isEqualTo(1); }
@Test public void testEmptyFireCloudWorkspaces() { when(fireCloudService.getWorkspaces()).thenReturn(new ArrayList<>()); try { ResponseEntity<org.pmiops.workbench.model.WorkspaceResponseListResponse> response = workspacesController.getWorkspaces(); assertThat(response.getBody().getItems()).isEmpty(); } catch (Exception ex) { fail(); } } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void testCreateWorkspace() throws Exception { Workspace workspace = createWorkspace(); workspace = workspacesController.createWorkspace(workspace).getBody(); verify(fireCloudService).createWorkspace(workspace.getNamespace(), workspace.getName()); stubGetWorkspace( workspace.getNamespace(), workspace.getName(), LOGGED_IN_USER_EMAIL, WorkspaceAccessLevel.OWNER); Workspace workspace2 = workspacesController .getWorkspace(workspace.getNamespace(), workspace.getId()) .getBody() .getWorkspace(); assertThat(workspace2.getCreationTime()).isEqualTo(NOW_TIME); assertThat(workspace2.getLastModifiedTime()).isEqualTo(NOW_TIME); assertThat(workspace2.getCdrVersionId()).isEqualTo(cdrVersionId); assertThat(workspace2.getCreator()).isEqualTo(LOGGED_IN_USER_EMAIL); assertThat(workspace2.getDataAccessLevel()).isEqualTo(DataAccessLevel.PROTECTED); assertThat(workspace2.getId()).isEqualTo("name"); assertThat(workspace2.getName()).isEqualTo("name"); assertThat(workspace2.getResearchPurpose().getDiseaseFocusedResearch()).isTrue(); assertThat(workspace2.getResearchPurpose().getDiseaseOfFocus()).isEqualTo("cancer"); assertThat(workspace2.getResearchPurpose().getMethodsDevelopment()).isTrue(); assertThat(workspace2.getResearchPurpose().getControlSet()).isTrue(); assertThat(workspace2.getResearchPurpose().getAncestry()).isTrue(); assertThat(workspace2.getResearchPurpose().getCommercialPurpose()).isTrue(); assertThat(workspace2.getResearchPurpose().getSocialBehavioral()).isTrue(); assertThat(workspace2.getResearchPurpose().getPopulationHealth()).isTrue(); assertThat(workspace2.getResearchPurpose().getEducational()).isTrue(); assertThat(workspace2.getResearchPurpose().getDrugDevelopment()).isTrue(); assertThat(workspace2.getResearchPurpose().getAdditionalNotes()).isEqualTo("additional notes"); assertThat(workspace2.getResearchPurpose().getReasonForAllOfUs()).isEqualTo("reason for aou"); assertThat(workspace2.getResearchPurpose().getIntendedStudy()).isEqualTo("intended study"); assertThat(workspace2.getResearchPurpose().getAnticipatedFindings()) .isEqualTo("anticipated findings"); assertThat(workspace2.getNamespace()).isEqualTo(workspace.getNamespace()); assertThat(workspace2.getResearchPurpose().getReviewRequested()).isTrue(); assertThat(workspace2.getResearchPurpose().getTimeRequested()).isEqualTo(NOW_TIME); verify(endUserCloudbillingProvider.get().projects()) .updateBillingInfo( "projects/" + workspace.getNamespace(), new ProjectBillingInfo() .setBillingAccountName(TestMockFactory.WORKSPACE_BILLING_ACCOUNT_NAME)); assertThat(workspace2.getBillingAccountName()) .isEqualTo(TestMockFactory.WORKSPACE_BILLING_ACCOUNT_NAME); }
@Test public void testCreateWorkspace_resetBillingAccountOnFailedSave() throws Exception { doThrow(RuntimeException.class).when(workspaceDao).save(any(DbWorkspace.class)); Workspace workspace = createWorkspace(); try { workspacesController.createWorkspace(workspace).getBody(); } catch (Exception e) { verify(endUserCloudbillingProvider.get().projects()) .updateBillingInfo( any(), eq( new ProjectBillingInfo() .setBillingAccountName(workspace.getBillingAccountName()))); verify(serviceAccountCloudbillingProvider.get().projects()) .updateBillingInfo( any(), eq( new ProjectBillingInfo() .setBillingAccountName( workbenchConfig.billing.freeTierBillingAccountName()))); return; } fail(); }
@Test public void testCreateWorkspace_UpdateBillingAccount() throws IOException { Workspace workspace = createWorkspace(); workspace.setBillingAccountName("new-account"); workspacesController.createWorkspace(workspace); verify(endUserCloudbillingProvider.get().projects()) .updateBillingInfo( any(), eq(new ProjectBillingInfo().setBillingAccountName(workspace.getBillingAccountName()))); }
@Test public void testCreateWorkspace_UpdateBillingAccount_flagFalse() { workbenchConfig.featureFlags.enableBillingUpgrade = false; Workspace workspace = createWorkspace(); workspace.setBillingAccountName("new-account"); workspacesController.createWorkspace(workspace); verifyZeroInteractions(endUserCloudbillingProvider.get()); verifyZeroInteractions(serviceAccountCloudbillingProvider.get()); }
@Test public void testCreateWorkspace_doNotUpdateBillingForFreeTier() { Workspace workspace = createWorkspace(); workspace.setBillingAccountName(workbenchConfig.billing.freeTierBillingAccountName()); workspacesController.createWorkspace(workspace); verifyZeroInteractions(endUserCloudbillingProvider.get()); verifyZeroInteractions(serviceAccountCloudbillingProvider.get()); }
@Test(expected = FailedPreconditionException.class) public void testCreateWorkspace_archivedCdrVersionThrows() { Workspace workspace = createWorkspace(); workspace.setCdrVersionId(archivedCdrVersionId); workspacesController.createWorkspace(workspace).getBody(); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<EmptyResponse> deleteWorkspace( String workspaceNamespace, String workspaceId) { recordOperationTime( () -> { DbWorkspace dbWorkspace = workspaceService.getRequired(workspaceNamespace, workspaceId); workspaceService.deleteWorkspace(dbWorkspace); workspaceAuditor.fireDeleteAction(dbWorkspace); }, "deleteWorkspace"); return ResponseEntity.ok(new EmptyResponse()); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void testDeleteWorkspace() { Workspace workspace = createWorkspace(); workspace = workspacesController.createWorkspace(workspace).getBody(); workspacesController.deleteWorkspace(workspace.getNamespace(), workspace.getName()); verify(mockWorkspaceAuditor).fireDeleteAction(any(DbWorkspace.class)); try { workspacesController.getWorkspace(workspace.getNamespace(), workspace.getName()); fail("NotFoundException expected"); } catch (NotFoundException e) { } } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<Workspace> updateWorkspace( String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request) throws NotFoundException { final Workspace result = recordOperationTime( () -> updateWorkspaceImpl(workspaceNamespace, workspaceId, request), "updateWorkspace"); return ResponseEntity.ok(result); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void testUpdateWorkspace() throws Exception { Workspace ws = createWorkspace(); ws = workspacesController.createWorkspace(ws).getBody(); ws.setName("updated-name"); UpdateWorkspaceRequest request = new UpdateWorkspaceRequest(); ws.setBillingAccountName("update-billing-account"); request.setWorkspace(ws); Workspace updated = workspacesController.updateWorkspace(ws.getNamespace(), ws.getId(), request).getBody(); ws.setEtag(updated.getEtag()); assertThat(updated).isEqualTo(ws); ArgumentCaptor<String> projectCaptor = ArgumentCaptor.forClass(String.class); ArgumentCaptor<ProjectBillingInfo> billingCaptor = ArgumentCaptor.forClass(ProjectBillingInfo.class); verify(endUserCloudbillingProvider.get().projects(), times(2)) .updateBillingInfo(projectCaptor.capture(), billingCaptor.capture()); assertThat("projects/" + ws.getNamespace()).isEqualTo(projectCaptor.getAllValues().get(1)); assertThat(new ProjectBillingInfo().setBillingAccountName("update-billing-account")) .isEqualTo(billingCaptor.getAllValues().get(1)); ws.setName("updated-name2"); updated = workspacesController.updateWorkspace(ws.getNamespace(), ws.getId(), request).getBody(); ws.setEtag(updated.getEtag()); assertThat(updated).isEqualTo(ws); Workspace got = workspacesController.getWorkspace(ws.getNamespace(), ws.getId()).getBody().getWorkspace(); assertThat(got).isEqualTo(ws); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<CloneWorkspaceResponse> cloneWorkspace( String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body) throws BadRequestException, TooManyRequestsException { return recordOperationTime( () -> cloneWorkspaceImpl(fromWorkspaceNamespace, fromWorkspaceId, body), "cloneWorkspace"); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void testCloneWorkspace() throws Exception { stubFcGetGroup(); stubFcGetWorkspaceACL(); Workspace originalWorkspace = createWorkspace(); originalWorkspace = workspacesController.createWorkspace(originalWorkspace).getBody(); final String newBillingAccountName = "cloned-billing-account"; final DbUser writerUser = createAndSaveUser("[email protected]", 124L); final ShareWorkspaceRequest shareWorkspaceRequest = new ShareWorkspaceRequest(); shareWorkspaceRequest.setWorkspaceEtag(originalWorkspace.getEtag()); addUserRoleToShareWorkspaceRequest( shareWorkspaceRequest, writerUser.getUsername(), WorkspaceAccessLevel.WRITER); stubFcUpdateWorkspaceACL(); workspacesController.shareWorkspace( originalWorkspace.getNamespace(), originalWorkspace.getName(), shareWorkspaceRequest); final ResearchPurpose modPurpose = new ResearchPurpose(); modPurpose.setAncestry(true); modPurpose.setPopulationDetails( ImmutableList.of( SpecificPopulationEnum.DISABILITY_STATUS, SpecificPopulationEnum.GEOGRAPHY)); modPurpose.setDisseminateResearchFindingList( ImmutableList.of(DisseminateResearchEnum.PRESENATATION_SCIENTIFIC_CONFERENCES)); modPurpose.setResearchOutcomeList( ImmutableList.of(ResearchOutcomeEnum.DECREASE_ILLNESS_BURDEN)); final Workspace modWorkspace = new Workspace(); modWorkspace.setName("cloned"); modWorkspace.setNamespace("cloned-ns"); modWorkspace.setResearchPurpose(modPurpose); modWorkspace.setBillingAccountName(newBillingAccountName); final CloneWorkspaceRequest req = new CloneWorkspaceRequest(); req.setWorkspace(modWorkspace); final FirecloudWorkspace clonedFirecloudWorkspace = stubCloneWorkspace( modWorkspace.getNamespace(), modWorkspace.getName(), LOGGED_IN_USER_EMAIL); clonedFirecloudWorkspace.setBucketName(TestMockFactory.WORKSPACE_BUCKET_NAME); mockBillingProjectBuffer("cloned-ns"); final Workspace clonedWorkspace = workspacesController .cloneWorkspace(originalWorkspace.getNamespace(), originalWorkspace.getId(), req) .getBody() .getWorkspace(); verify(mockWorkspaceAuditor).fireDuplicateAction(anyLong(), anyLong(), any(Workspace.class)); ArgumentCaptor<String> projectCaptor = ArgumentCaptor.forClass(String.class); ArgumentCaptor<ProjectBillingInfo> billingCaptor = ArgumentCaptor.forClass(ProjectBillingInfo.class); verify(endUserCloudbillingProvider.get().projects(), times(2)) .updateBillingInfo(projectCaptor.capture(), billingCaptor.capture()); assertThat("projects/" + clonedWorkspace.getNamespace()) .isEqualTo(projectCaptor.getAllValues().get(1)); assertThat(new ProjectBillingInfo().setBillingAccountName(newBillingAccountName)) .isEqualTo(billingCaptor.getAllValues().get(1)); stubGetWorkspace(clonedFirecloudWorkspace, WorkspaceAccessLevel.WRITER); final Workspace retrievedWorkspace = workspacesController .getWorkspace(clonedWorkspace.getNamespace(), clonedWorkspace.getId()) .getBody() .getWorkspace(); sortPopulationDetails(clonedWorkspace.getResearchPurpose()); sortPopulationDetails(retrievedWorkspace.getResearchPurpose()); sortPopulationDetails(modPurpose); assertWithMessage("get and clone responses are inconsistent") .that(clonedWorkspace) .isEqualTo(retrievedWorkspace); assertThat(clonedWorkspace.getName()).isEqualTo(modWorkspace.getName()); assertThat(clonedWorkspace.getNamespace()).isEqualTo(modWorkspace.getNamespace()); assertThat(clonedWorkspace.getResearchPurpose()).isEqualTo(modPurpose); assertThat(clonedWorkspace.getBillingAccountName()).isEqualTo(newBillingAccountName); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace( String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request) { if (Strings.isNullOrEmpty(request.getWorkspaceEtag())) { throw new BadRequestException("Missing required update field 'workspaceEtag'"); } DbWorkspace dbWorkspace = workspaceService.getRequired(workspaceNamespace, workspaceId); int version = Etags.toVersion(request.getWorkspaceEtag()); if (dbWorkspace.getVersion() != version) { throw new ConflictException("Attempted to modify user roles with outdated workspace etag"); } ImmutableMap.Builder<String, WorkspaceAccessLevel> shareRolesMapBuilder = new ImmutableMap.Builder<>(); ImmutableMap.Builder<Long, String> aclStringsByUserIdBuilder = new ImmutableMap.Builder<>(); for (UserRole role : request.getItems()) { if (role.getRole() == null || role.getRole().toString().trim().isEmpty()) { throw new BadRequestException("Role required."); } final DbUser invitedUser = userDao.findUserByUsername(role.getEmail()); if (invitedUser == null) { throw new BadRequestException(String.format("User %s doesn't exist", role.getEmail())); } aclStringsByUserIdBuilder.put(invitedUser.getUserId(), role.getRole().toString()); shareRolesMapBuilder.put(role.getEmail(), role.getRole()); } final ImmutableMap<String, WorkspaceAccessLevel> aclsByEmail = shareRolesMapBuilder.build(); dbWorkspace = workspaceService.updateWorkspaceAcls( dbWorkspace, aclsByEmail, getRegisteredUserDomainEmail()); WorkspaceUserRolesResponse resp = new WorkspaceUserRolesResponse(); resp.setWorkspaceEtag(Etags.fromVersion(dbWorkspace.getVersion())); List<UserRole> updatedUserRoles = workspaceService.getFirecloudUserRoles(workspaceNamespace, dbWorkspace.getFirecloudName()); resp.setItems(updatedUserRoles); workspaceAuditor.fireCollaborateAction( dbWorkspace.getWorkspaceId(), aclStringsByUserIdBuilder.build()); return ResponseEntity.ok(resp); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void testShareWorkspace() { stubFcGetGroup(); DbUser writerUser = createAndSaveUser("[email protected]", 124L); DbUser readerUser = createAndSaveUser("[email protected]", 125L); stubFcGetWorkspaceACL(); Workspace workspace = createWorkspace(); workspace = workspacesController.createWorkspace(workspace).getBody(); ShareWorkspaceRequest shareWorkspaceRequest = new ShareWorkspaceRequest(); shareWorkspaceRequest.setWorkspaceEtag(workspace.getEtag()); addUserRoleToShareWorkspaceRequest( shareWorkspaceRequest, LOGGED_IN_USER_EMAIL, WorkspaceAccessLevel.OWNER); addUserRoleToShareWorkspaceRequest( shareWorkspaceRequest, "[email protected]", WorkspaceAccessLevel.READER); addUserRoleToShareWorkspaceRequest( shareWorkspaceRequest, "[email protected]", WorkspaceAccessLevel.WRITER); CLOCK.increment(1000); stubFcUpdateWorkspaceACL(); WorkspaceUserRolesResponse shareResp = workspacesController .shareWorkspace(workspace.getNamespace(), workspace.getName(), shareWorkspaceRequest) .getBody(); verify(mockWorkspaceAuditor).fireCollaborateAction(anyLong(), anyMap()); Workspace workspace2 = workspacesController .getWorkspace(workspace.getNamespace(), workspace.getName()) .getBody() .getWorkspace(); assertThat(shareResp.getWorkspaceEtag()).isEqualTo(workspace2.getEtag()); ArrayList<FirecloudWorkspaceACLUpdate> updateACLRequestList = convertUserRolesToUpdateAclRequestList(shareWorkspaceRequest.getItems()); verify(fireCloudService).updateWorkspaceACL(any(), any(), eq(updateACLRequestList)); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<FileDetail> copyNotebook( String fromWorkspaceNamespace, String fromWorkspaceId, String fromNotebookName, CopyRequest copyRequest) { return ResponseEntity.ok( recordOperationTime( () -> copyNotebookImpl( fromWorkspaceNamespace, fromWorkspaceId, fromNotebookName, copyRequest), "copyNotebook")); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void copyNotebook() { Workspace fromWorkspace = createWorkspace(); fromWorkspace = workspacesController.createWorkspace(fromWorkspace).getBody(); String fromNotebookName = "origin"; Workspace toWorkspace = testMockFactory.createWorkspace("toWorkspaceNs", "toworkspace"); toWorkspace = workspacesController.createWorkspace(toWorkspace).getBody(); String newNotebookName = "new"; String expectedNotebookName = newNotebookName + NotebooksService.NOTEBOOK_EXTENSION; CopyRequest copyNotebookRequest = new CopyRequest() .toWorkspaceName(toWorkspace.getName()) .toWorkspaceNamespace(toWorkspace.getNamespace()) .newName(newNotebookName); workspacesController.copyNotebook( fromWorkspace.getNamespace(), fromWorkspace.getName(), fromNotebookName, copyNotebookRequest); verify(cloudStorageService) .copyBlob( BlobId.of( TestMockFactory.WORKSPACE_BUCKET_NAME, "notebooks/" + NotebooksService.withNotebookExtension(fromNotebookName)), BlobId.of(TestMockFactory.WORKSPACE_BUCKET_NAME, "notebooks/" + expectedNotebookName)); verify(userRecentResourceService) .updateNotebookEntry(2l, 1l, BUCKET_URI + "notebooks/" + expectedNotebookName); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<FileDetail> cloneNotebook( String workspace, String workspaceName, String notebookName) { FileDetail fileDetail; try { fileDetail = notebooksService.cloneNotebook(workspace, workspaceName, notebookName); } catch (BlobAlreadyExistsException e) { throw new BadRequestException("File already exists at copy destination"); } return ResponseEntity.ok(fileDetail); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void testCloneNotebook() { Workspace workspace = createWorkspace(); workspace = workspacesController.createWorkspace(workspace).getBody(); String nb1 = NotebooksService.withNotebookExtension("notebooks/nb1"); String newPath = NotebooksService.withNotebookExtension("notebooks/Duplicate of nb1"); String fullPath = BUCKET_URI + newPath; long workspaceIdInDb = 1; long userIdInDb = 1; workspacesController.cloneNotebook( workspace.getNamespace(), workspace.getId(), NotebooksService.withNotebookExtension("nb1")); verify(cloudStorageService) .copyBlob( BlobId.of(TestMockFactory.WORKSPACE_BUCKET_NAME, nb1), BlobId.of(TestMockFactory.WORKSPACE_BUCKET_NAME, newPath)); verify(userRecentResourceService).updateNotebookEntry(workspaceIdInDb, userIdInDb, fullPath); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<EmptyResponse> deleteNotebook( String workspace, String workspaceName, String notebookName) { recordOperationTime( () -> notebooksService.deleteNotebook(workspace, workspaceName, notebookName), "deleteNotebook"); return ResponseEntity.ok(new EmptyResponse()); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void testDeleteNotebook() { Workspace workspace = createWorkspace(); workspace = workspacesController.createWorkspace(workspace).getBody(); String nb1 = NotebooksService.withNotebookExtension("notebooks/nb1"); String fullPath = BUCKET_URI + nb1; long workspaceIdInDb = 1; long userIdInDb = 1; workspacesController.deleteNotebook( workspace.getNamespace(), workspace.getId(), NotebooksService.withNotebookExtension("nb1")); verify(cloudStorageService).deleteBlob(BlobId.of(TestMockFactory.WORKSPACE_BUCKET_NAME, nb1)); verify(userRecentResourceService).deleteNotebookEntry(workspaceIdInDb, userIdInDb, fullPath); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces() { WorkspaceResponseListResponse response = new WorkspaceResponseListResponse(); response.setItems(workspaceService.getPublishedWorkspaces()); return ResponseEntity.ok(response); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void testGetPublishedWorkspaces() { stubFcGetGroup(); stubFcUpdateWorkspaceACL(); Workspace workspace = createWorkspace(); workspace = workspacesController.createWorkspace(workspace).getBody(); workspacesController.publishWorkspace(workspace.getNamespace(), workspace.getId()); FirecloudWorkspaceResponse fcResponse = new FirecloudWorkspaceResponse(); fcResponse.setWorkspace( testMockFactory.createFirecloudWorkspace( workspace.getNamespace(), workspace.getName(), null)); fcResponse.setAccessLevel(WorkspaceAccessLevel.OWNER.toString()); doReturn(Collections.singletonList(fcResponse)).when(fireCloudService).getWorkspaces(); assertThat(workspacesController.getPublishedWorkspaces().getBody().getItems().size()) .isEqualTo(1); } |
WorkspacesController implements WorkspacesApiDelegate { @VisibleForTesting static String notebookLockingEmailHash(String bucket, String email) { String toHash = String.format("%s:%s", bucket, email); try { MessageDigest sha256 = MessageDigest.getInstance("SHA-256"); byte[] hash = sha256.digest(toHash.getBytes(StandardCharsets.UTF_8)); return BaseEncoding.base16().lowerCase().encode(hash); } catch (final NoSuchAlgorithmException e) { throw new RuntimeException(e); } } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void notebookLockingEmailHashTest() { final String[][] knownTestData = { { "fc-bucket-id-1", "user@aou", "dc5acd54f734a2e2350f2adcb0a25a4d1978b45013b76d6bc0a2d37d035292fe" }, { "fc-bucket-id-1", "another-user@aou", "bc90f9f740702e5e0408f2ea13fed9457a7ee9c01117820f5c541067064468c3" }, { "fc-bucket-id-2", "user@aou", "a759e5aef091fd22bbf40bf8ee7cfde4988c668541c18633bd79ab84b274d622" }, { "fc-5ac6bde3-f225-44ca-ad4d-92eed68df7db", "[email protected]", "060c0b2ef2385804b7b69a4b4477dd9661be35db270c940525c2282d081aef56" } }; for (final String[] test : knownTestData) { final String bucket = test[0]; final String email = test[1]; final String hash = test[2]; assertThat(WorkspacesController.notebookLockingEmailHash(bucket, email)).isEqualTo(hash); } }
@Test public void testNotebookLockingMetadata() { final String lastLockedUser = LOGGED_IN_USER_EMAIL; final Long lockExpirationTime = Instant.now().plus(Duration.ofMinutes(1)).toEpochMilli(); final Map<String, String> gcsMetadata = new ImmutableMap.Builder<String, String>() .put(LOCK_EXPIRE_TIME_KEY, lockExpirationTime.toString()) .put( LAST_LOCKING_USER_KEY, WorkspacesController.notebookLockingEmailHash( TestMockFactory.WORKSPACE_BUCKET_NAME, lastLockedUser)) .put("extraMetadata", "is not a problem") .build(); final NotebookLockingMetadataResponse expectedResponse = new NotebookLockingMetadataResponse() .lockExpirationTime(lockExpirationTime) .lastLockedBy(lastLockedUser); assertNotebookLockingMetadata(gcsMetadata, expectedResponse, fcWorkspaceAcl); }
@Test public void testNotebookLockingMetadataKnownUser() { final String readerOnMyWorkspace = "[email protected]"; FirecloudWorkspaceACL workspaceACL = createWorkspaceACL( new JSONObject() .put( currentUser.getUsername(), new JSONObject() .put("accessLevel", "OWNER") .put("canCompute", true) .put("canShare", true)) .put( readerOnMyWorkspace, new JSONObject() .put("accessLevel", "READER") .put("canCompute", true) .put("canShare", true))); final String lastLockedUser = readerOnMyWorkspace; final Long lockExpirationTime = Instant.now().plus(Duration.ofMinutes(1)).toEpochMilli(); final Map<String, String> gcsMetadata = new ImmutableMap.Builder<String, String>() .put(LOCK_EXPIRE_TIME_KEY, lockExpirationTime.toString()) .put( LAST_LOCKING_USER_KEY, WorkspacesController.notebookLockingEmailHash( TestMockFactory.WORKSPACE_BUCKET_NAME, lastLockedUser)) .put("extraMetadata", "is not a problem") .build(); final NotebookLockingMetadataResponse expectedResponse = new NotebookLockingMetadataResponse() .lockExpirationTime(lockExpirationTime) .lastLockedBy(readerOnMyWorkspace); assertNotebookLockingMetadata(gcsMetadata, expectedResponse, workspaceACL); }
@Test public void testNotebookLockingMetadataUnknownUser() { final String lastLockedUser = "[email protected]"; final Long lockExpirationTime = Instant.now().plus(Duration.ofMinutes(1)).toEpochMilli(); final Map<String, String> gcsMetadata = new ImmutableMap.Builder<String, String>() .put(LOCK_EXPIRE_TIME_KEY, lockExpirationTime.toString()) .put( LAST_LOCKING_USER_KEY, WorkspacesController.notebookLockingEmailHash( TestMockFactory.WORKSPACE_BUCKET_NAME, lastLockedUser)) .put("extraMetadata", "is not a problem") .build(); final NotebookLockingMetadataResponse expectedResponse = new NotebookLockingMetadataResponse() .lockExpirationTime(lockExpirationTime) .lastLockedBy("UNKNOWN"); assertNotebookLockingMetadata(gcsMetadata, expectedResponse, fcWorkspaceAcl); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage( String workspaceNamespace, String workspaceId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); return ResponseEntity.ok( new WorkspaceBillingUsageResponse() .cost( freeTierBillingService.getWorkspaceFreeTierBillingUsage( workspaceService.get(workspaceNamespace, workspaceId)))); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void testGetBillingUsage() { Double cost = 150.50; Workspace ws = createWorkspace(); stubGetWorkspace(ws.getNamespace(), ws.getId(), ws.getCreator(), WorkspaceAccessLevel.OWNER); when(mockFreeTierBillingService.getWorkspaceFreeTierBillingUsage(any())).thenReturn(cost); WorkspaceBillingUsageResponse workspaceBillingUsageResponse = workspacesController.getBillingUsage(ws.getNamespace(), ws.getId()).getBody(); assertThat(workspaceBillingUsageResponse.getCost()).isEqualTo(cost); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces() { List<DbUserRecentWorkspace> userRecentWorkspaces = workspaceService.getRecentWorkspaces(); List<Long> workspaceIds = userRecentWorkspaces.stream() .map(DbUserRecentWorkspace::getWorkspaceId) .collect(Collectors.toList()); List<DbWorkspace> dbWorkspaces = workspaceService.getDao().findAllByWorkspaceIdIn(workspaceIds); Map<Long, DbWorkspace> dbWorkspacesById = dbWorkspaces.stream() .collect(Collectors.toMap(DbWorkspace::getWorkspaceId, Function.identity())); final Map<Long, WorkspaceAccessLevel> workspaceAccessLevelsById; try { workspaceAccessLevelsById = dbWorkspaces.stream() .collect( Collectors.toMap( DbWorkspace::getWorkspaceId, dbWorkspace -> workspaceService.getWorkspaceAccessLevel( dbWorkspace.getWorkspaceNamespace(), dbWorkspace.getFirecloudName()))); } catch (IllegalArgumentException e) { throw new ServerErrorException(e); } RecentWorkspaceResponse recentWorkspaceResponse = new RecentWorkspaceResponse(); List<RecentWorkspace> recentWorkspaces = userRecentWorkspaces.stream() .map( userRecentWorkspace -> workspaceMapper.toApiRecentWorkspace( dbWorkspacesById.get(userRecentWorkspace.getWorkspaceId()), workspaceAccessLevelsById.get(userRecentWorkspace.getWorkspaceId()))) .collect(Collectors.toList()); recentWorkspaceResponse.addAll(recentWorkspaces); return ResponseEntity.ok(recentWorkspaceResponse); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void getUserRecentWorkspaces() { Workspace workspace = createWorkspace(); workspace = workspacesController.createWorkspace(workspace).getBody(); stubGetWorkspace( workspace.getNamespace(), workspace.getName(), LOGGED_IN_USER_EMAIL, WorkspaceAccessLevel.OWNER); DbWorkspace dbWorkspace = workspaceService.get(workspace.getNamespace(), workspace.getId()); workspaceService.updateRecentWorkspaces(dbWorkspace, currentUser.getUserId(), NOW); ResponseEntity<RecentWorkspaceResponse> recentWorkspaceResponseEntity = workspacesController.getUserRecentWorkspaces(); RecentWorkspace recentWorkspace = recentWorkspaceResponseEntity.getBody().get(0); assertThat(recentWorkspace.getWorkspace().getNamespace()) .isEqualTo(dbWorkspace.getWorkspaceNamespace()); assertThat(recentWorkspace.getWorkspace().getName()).isEqualTo(dbWorkspace.getName()); } |
WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources( String workspaceNamespace, String workspaceId, WorkspaceResourcesRequest workspaceResourcesRequest) { WorkspaceAccessLevel workspaceAccessLevel = workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final DbWorkspace dbWorkspace = workspaceService.getRequiredWithCohorts(workspaceNamespace, workspaceId); WorkspaceResourceResponse workspaceResourceResponse = new WorkspaceResourceResponse(); workspaceResourceResponse.addAll( workspaceResourcesService.getWorkspaceResources( dbWorkspace, workspaceAccessLevel, workspaceResourcesRequest.getTypesToFetch())); return ResponseEntity.ok(workspaceResourceResponse); } @Autowired WorkspacesController(
BillingProjectBufferService billingProjectBufferService,
CdrVersionDao cdrVersionDao,
Clock clock,
CloudStorageService cloudStorageService,
FireCloudService fireCloudService,
FreeTierBillingService freeTierBillingService,
LogsBasedMetricService logsBasedMetricService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserDao userDao,
UserService userService,
WorkspaceAuditor workspaceAuditor,
WorkspaceMapper workspaceMapper,
WorkspaceResourcesService workspaceResourcesService,
WorkspaceService workspaceService); @Override ResponseEntity<Workspace> createWorkspace(Workspace workspace); @Override ResponseEntity<EmptyResponse> deleteWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponse> getWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getWorkspaces(); @Override ResponseEntity<Workspace> updateWorkspace(
String workspaceNamespace, String workspaceId, UpdateWorkspaceRequest request); @Override ResponseEntity<CloneWorkspaceResponse> cloneWorkspace(
String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body); @Override ResponseEntity<WorkspaceBillingUsageResponse> getBillingUsage(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceUserRolesResponse> shareWorkspace(
String workspaceNamespace, String workspaceId, ShareWorkspaceRequest request); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<EmptyResponse> reviewWorkspace(
String ns, String id, ResearchPurposeReviewRequest review); @Override @AuthorityRequired({Authority.REVIEW_RESEARCH_PURPOSE}) ResponseEntity<WorkspaceListResponse> getWorkspacesForReview(); @Override ResponseEntity<List<FileDetail>> getNoteBookList(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<EmptyResponse> deleteNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> copyNotebook(
String fromWorkspaceNamespace,
String fromWorkspaceId,
String fromNotebookName,
CopyRequest copyRequest); @Override ResponseEntity<FileDetail> cloneNotebook(
String workspace, String workspaceName, String notebookName); @Override ResponseEntity<FileDetail> renameNotebook(
String workspace, String workspaceName, NotebookRename rename); @Override ResponseEntity<Workspace> markResearchPurposeReviewed(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<ReadOnlyNotebookResponse> readOnlyNotebook(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<NotebookLockingMetadataResponse> getNotebookLockingMetadata(
String workspaceNamespace, String workspaceName, String notebookName); @Override ResponseEntity<WorkspaceUserRolesResponse> getFirecloudWorkspaceUserRoles(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResponseListResponse> getPublishedWorkspaces(); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> publishWorkspace(
String workspaceNamespace, String workspaceId); @Override @AuthorityRequired({Authority.FEATURED_WORKSPACE_ADMIN}) ResponseEntity<EmptyResponse> unpublishWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<RecentWorkspaceResponse> getUserRecentWorkspaces(); @Override ResponseEntity<RecentWorkspaceResponse> updateRecentWorkspaces(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<WorkspaceResourceResponse> getWorkspaceResources(
String workspaceNamespace,
String workspaceId,
WorkspaceResourcesRequest workspaceResourcesRequest); } | @Test public void getWorkspaceResources() { CdrVersionContext.setCdrVersionNoCheckAuthDomain(cdrVersion); Workspace workspace = workspacesController.createWorkspace(createWorkspace()).getBody(); Cohort cohort = cohortsController .createCohort( workspace.getNamespace(), workspace.getId(), createDefaultCohort("cohort")) .getBody(); stubBigQueryCohortCalls(); CohortReview cohortReview = cohortReviewController .createCohortReview( workspace.getNamespace(), workspace.getId(), cohort.getId(), cdrVersion.getCdrVersionId(), new CreateReviewRequest().size(1)) .getBody(); ConceptSet conceptSet = conceptSetsController .createConceptSet( workspace.getNamespace(), workspace.getId(), new CreateConceptSetRequest() .conceptSet( new ConceptSet().name("cs1").description("d1").domain(Domain.CONDITION)) .addAddedIdsItem(CONCEPT_1.getConceptId())) .getBody(); DataSet dataSet = dataSetController .createDataSet( workspace.getNamespace(), workspace.getId(), new DataSetRequest() .prePackagedConceptSet(PrePackagedConceptSetEnum.NONE) .addConceptSetIdsItem(conceptSet.getId()) .addCohortIdsItem(cohort.getId()) .name("dataset") .domainValuePairs( ImmutableList.of( new DomainValuePair().value("VALUE").domain(Domain.CONDITION)))) .getBody(); WorkspaceResourcesRequest workspaceResourcesRequest = new WorkspaceResourcesRequest(); workspaceResourcesRequest.setTypesToFetch( ImmutableList.of( ResourceType.COHORT, ResourceType.COHORT_REVIEW, ResourceType.CONCEPT_SET, ResourceType.DATASET)); WorkspaceResourceResponse workspaceResourceResponse = workspacesController .getWorkspaceResources( workspace.getNamespace(), workspace.getId(), workspaceResourcesRequest) .getBody(); assertThat(workspaceResourceResponse.size()).isEqualTo(4); List<Cohort> cohorts = workspaceResourceResponse.stream() .map(WorkspaceResource::getCohort) .filter(Objects::nonNull) .collect(Collectors.toList()); List<CohortReview> cohortReviews = workspaceResourceResponse.stream() .map(WorkspaceResource::getCohortReview) .filter(Objects::nonNull) .collect(Collectors.toList()); List<ConceptSet> conceptSets = workspaceResourceResponse.stream() .map(WorkspaceResource::getConceptSet) .filter(Objects::nonNull) .collect(Collectors.toList()); List<DataSet> dataSets = workspaceResourceResponse.stream() .map(WorkspaceResource::getDataSet) .filter(Objects::nonNull) .collect(Collectors.toList()); assertThat(cohorts).hasSize(1); assertThat(cohorts.get(0)).isEqualTo(cohort); assertThat(cohortReviews).hasSize(1); compareCohortReviewFields(cohortReviews.get(0), cohortReview); assertThat(conceptSets).hasSize(1); assertThat(conceptSets.get(0)).isEqualTo(conceptSet.concepts(null)); assertThat(dataSets).hasSize(1); compareDatasetMetadata(dataSets.get(0), dataSet); } |
StatusAlertController implements StatusAlertApiDelegate { @Override public ResponseEntity<StatusAlert> getStatusAlert() { Optional<DbStatusAlert> dbStatusAlertOptional = statusAlertDao.findFirstByOrderByStatusAlertIdDesc(); if (dbStatusAlertOptional.isPresent()) { DbStatusAlert dbStatusAlert = dbStatusAlertOptional.get(); return ResponseEntity.ok(StatusAlertConversionUtils.toApiStatusAlert(dbStatusAlert)); } else { return ResponseEntity.ok(new StatusAlert()); } } @Autowired StatusAlertController(StatusAlertDao statusAlertDao); @Override ResponseEntity<StatusAlert> getStatusAlert(); @Override @AuthorityRequired(Authority.COMMUNICATIONS_ADMIN) ResponseEntity<StatusAlert> postStatusAlert(StatusAlert statusAlert); } | @Test public void testGetStatusAlert() { StatusAlert statusAlert = statusAlertController.getStatusAlert().getBody(); assertThat(statusAlert.getTitle()).matches(STATUS_ALERT_INITIAL_TITLE); assertThat(statusAlert.getMessage()).matches(STATUS_ALERT_INITIAL_DESCRIPTION); } |
StatusAlertController implements StatusAlertApiDelegate { @Override @AuthorityRequired(Authority.COMMUNICATIONS_ADMIN) public ResponseEntity<StatusAlert> postStatusAlert(StatusAlert statusAlert) { Iterable<DbStatusAlert> dbStatusAlertList = statusAlertDao.findAll(); dbStatusAlertList.forEach( statusAlert1 -> statusAlertDao.delete(statusAlert1.getStatusAlertId())); DbStatusAlert dbStatusAlert = statusAlertDao.save(StatusAlertConversionUtils.toDbStatusAlert(statusAlert)); return ResponseEntity.ok(StatusAlertConversionUtils.toApiStatusAlert(dbStatusAlert)); } @Autowired StatusAlertController(StatusAlertDao statusAlertDao); @Override ResponseEntity<StatusAlert> getStatusAlert(); @Override @AuthorityRequired(Authority.COMMUNICATIONS_ADMIN) ResponseEntity<StatusAlert> postStatusAlert(StatusAlert statusAlert); } | @Test public void testPostStatusAlert() { String updatedStatusAlertTitle = "Title 2"; String updatedStatusAlertDescription = "Description 2"; String updatedStatusAlertLink = "This has a link"; StatusAlert statusAlert = new StatusAlert() .title(updatedStatusAlertTitle) .message(updatedStatusAlertDescription) .link(updatedStatusAlertLink); statusAlertController.postStatusAlert(statusAlert); StatusAlert updatedStatusAlert = statusAlertController.getStatusAlert().getBody(); assertThat(updatedStatusAlert.getTitle()).matches(updatedStatusAlertTitle); assertThat(updatedStatusAlert.getMessage()).matches(updatedStatusAlertDescription); assertThat(updatedStatusAlert.getLink()).matches(updatedStatusAlertLink); } |
CdrVersionsController implements CdrVersionsApiDelegate { @Override public ResponseEntity<CdrVersionListResponse> getCdrVersions() { DataAccessLevel accessLevel = userProvider.get().getDataAccessLevelEnum(); List<DbCdrVersion> cdrVersions = cdrVersionService.findAuthorizedCdrVersions(accessLevel); if (cdrVersions.isEmpty()) { throw new ForbiddenException("User does not have access to any CDR versions"); } List<Long> defaultVersions = cdrVersions.stream() .filter(v -> v.getIsDefault()) .map(DbCdrVersion::getCdrVersionId) .collect(Collectors.toList()); if (defaultVersions.isEmpty()) { throw new ForbiddenException("User does not have access to a default CDR version"); } if (defaultVersions.size() > 1) { log.severe( String.format( "Found multiple (%d) default CDR versions, picking one", defaultVersions.size())); } return ResponseEntity.ok( new CdrVersionListResponse() .items( cdrVersions.stream() .map(cdrVersionMapper::dbModelToClient) .collect(Collectors.toList())) .defaultCdrVersionId(Long.toString(defaultVersions.get(0)))); } @Autowired CdrVersionsController(
CdrVersionService cdrVersionService,
CdrVersionMapper cdrVersionMapper,
Provider<DbUser> userProvider); @Override ResponseEntity<CdrVersionListResponse> getCdrVersions(); } | @Test public void testGetCdrVersionsRegistered() { assertResponse(cdrVersionsController.getCdrVersions().getBody(), defaultCdrVersion); }
@Test public void testGetCdrVersions_microarray() { user.setDataAccessLevelEnum(DataAccessLevel.PROTECTED); List<CdrVersion> cdrVersions = cdrVersionsController.getCdrVersions().getBody().getItems(); assertThat( cdrVersions.stream() .filter(v -> v.getName().equals("Test Registered CDR")) .findFirst() .get() .getHasMicroarrayData()) .isFalse(); assertThat( cdrVersions.stream() .filter(v -> v.getName().equals("Test Protected CDR")) .findFirst() .get() .getHasMicroarrayData()) .isTrue(); }
@Test public void testGetCdrVersionsProtected() { user.setDataAccessLevelEnum(DataAccessLevel.PROTECTED); assertResponse( cdrVersionsController.getCdrVersions().getBody(), protectedCdrVersion, defaultCdrVersion); }
@Test(expected = ForbiddenException.class) public void testGetCdrVersionsUnregistered() { user.setDataAccessLevelEnum(DataAccessLevel.UNREGISTERED); cdrVersionsController.getCdrVersions(); } |
OfflineAuditController implements OfflineAuditApiDelegate { @VisibleForTesting static String auditTableSuffix(Instant now, int daysAgo) { Instant target = now.minus(daysAgo, ChronoUnit.DAYS); return auditTableNameDateFormatter.withZone(ZoneId.of("UTC")).format(target); } @Autowired OfflineAuditController(
Clock clock,
BigQueryService bigQueryService,
CdrVersionDao cdrVersionDao,
WorkspaceDao workspaceDao); @Override ResponseEntity<AuditBigQueryResponse> auditBigQuery(); } | @Test public void testAuditTableSuffix() { assertThat(OfflineAuditController.auditTableSuffix(Instant.parse("2007-01-03T00:00:00.00Z"), 0)) .isEqualTo("20070103"); assertThat(OfflineAuditController.auditTableSuffix(Instant.parse("2018-01-01T23:59:59.00Z"), 3)) .isEqualTo("20171229"); } |
OfflineAuditController implements OfflineAuditApiDelegate { @Override public ResponseEntity<AuditBigQueryResponse> auditBigQuery() { Set<String> cdrProjects = ImmutableList.copyOf(cdrVersionDao.findAll()).stream() .map(v -> v.getBigqueryProject()) .collect(Collectors.toSet()); Set<String> whitelist = Sets.union(workspaceDao.findAllWorkspaceNamespaces(), cdrProjects); Instant now = clock.instant(); List<String> suffixes = IntStream.range(0, AUDIT_DAY_RANGE) .mapToObj(i -> auditTableSuffix(now, i)) .collect(Collectors.toList()); int numBad = 0; int numQueries = 0; for (String cdrProjectId : cdrProjects) { TableResult result = bigQueryService.executeQuery(QueryJobConfiguration.of(auditSql(cdrProjectId, suffixes))); Map<String, Integer> rm = bigQueryService.getResultMapper(result); for (List<FieldValue> row : result.iterateAll()) { String project_id = bigQueryService.getString(row, rm.get("client_project_id")); String email = bigQueryService.getString(row, rm.get("user_email")); long total = bigQueryService.getLong(row, rm.get("total")); if (bigQueryService.isNull(row, rm.get("client_project_id"))) { log.severe( String.format( "AUDIT: (CDR project '%s') %d queries with missing project ID from user '%s'; " + "indicates an ACL misconfiguration, this user can access the CDR but is not a " + "project jobUser", cdrProjectId, total, email)); numBad += total; } else if (!whitelist.contains(project_id)) { log.severe( String.format( "AUDIT: (CDR project '%s') %d queries in unrecognized project '%s' from user '%s'", cdrProjectId, total, project_id, email)); numBad += total; } numQueries += total; } } log.info( String.format("AUDIT: found audit issues with %d/%d BigQuery queries", numBad, numQueries)); return ResponseEntity.ok(new AuditBigQueryResponse().numQueryIssues(numBad)); } @Autowired OfflineAuditController(
Clock clock,
BigQueryService bigQueryService,
CdrVersionDao cdrVersionDao,
WorkspaceDao workspaceDao); @Override ResponseEntity<AuditBigQueryResponse> auditBigQuery(); } | @Test public void testAuditBigQueryCdrV1Queries() { stubBigQueryCalls(CDR_V1_PROJECT_ID, USER_EMAIL, 5); assertThat(offlineAuditController.auditBigQuery().getBody().getNumQueryIssues()).isEqualTo(0); }
@Test public void testAuditBigQueryCdrV2Queries() { stubBigQueryCalls(CDR_V2_PROJECT_ID, USER_EMAIL, 5); assertThat(offlineAuditController.auditBigQuery().getBody().getNumQueryIssues()).isEqualTo(0); }
@Test public void testAuditBigQueryFirecloudQueries() { stubBigQueryCalls(FC_PROJECT_ID, USER_EMAIL, 5); assertThat(offlineAuditController.auditBigQuery().getBody().getNumQueryIssues()).isEqualTo(0); }
@Test public void testAuditBigQueryUnrecognizedProjectQueries() { stubBigQueryCalls("my-personal-gcp-project", USER_EMAIL, 5); assertThat(offlineAuditController.auditBigQuery().getBody().getNumQueryIssues()).isEqualTo(10); } |
OfflineRuntimeController implements OfflineRuntimeApiDelegate { @Override public ResponseEntity<Void> checkRuntimes() { final Instant now = clock.instant(); final WorkbenchConfig config = configProvider.get(); final Duration maxAge = Duration.ofDays(config.firecloud.notebookRuntimeMaxAgeDays); final Duration idleMaxAge = Duration.ofDays(config.firecloud.notebookRuntimeIdleMaxAgeDays); final RuntimesApi runtimesApi = runtimesApiProvider.get(); final List<LeonardoListRuntimeResponse> listRuntimeResponses; try { listRuntimeResponses = runtimesApi.listRuntimes(null, false); } catch (ApiException e) { throw ExceptionUtils.convertLeonardoException(e); } int errors = 0; int idles = 0; int activeDeletes = 0; int unusedDeletes = 0; for (LeonardoListRuntimeResponse listRuntimeResponse : listRuntimeResponses) { final String runtimeId = listRuntimeResponse.getGoogleProject() + "/" + listRuntimeResponse.getRuntimeName(); final LeonardoGetRuntimeResponse runtime; try { runtime = runtimesApi.getRuntime( listRuntimeResponse.getGoogleProject(), listRuntimeResponse.getRuntimeName()); } catch (ApiException e) { log.log(Level.WARNING, String.format("failed to refetch runtime '%s'", runtimeId), e); errors++; continue; } if (LeonardoRuntimeStatus.UNKNOWN.equals(runtime.getStatus()) || runtime.getStatus() == null) { log.warning(String.format("unknown runtime status for runtime '%s'", runtimeId)); continue; } if (!LeonardoRuntimeStatus.RUNNING.equals(runtime.getStatus()) && !LeonardoRuntimeStatus.STOPPED.equals(runtime.getStatus())) { continue; } final Instant lastUsed = Instant.parse(runtime.getAuditInfo().getDateAccessed()); final boolean isIdle = Duration.between(lastUsed, now).toHours() > IDLE_AFTER_HOURS; if (isIdle) { idles++; } final Instant created = Instant.parse(runtime.getAuditInfo().getCreatedDate()); final Duration age = Duration.between(created, now); if (age.toMillis() > maxAge.toMillis()) { log.info( String.format( "deleting runtime '%s', exceeded max lifetime @ %s (>%s)", runtimeId, formatDuration(age), formatDuration(maxAge))); activeDeletes++; } else if (isIdle && age.toMillis() > idleMaxAge.toMillis()) { log.info( String.format( "deleting runtime '%s', idle with age %s (>%s)", runtimeId, formatDuration(age), formatDuration(idleMaxAge))); unusedDeletes++; } else { continue; } try { runtimesApi.deleteRuntime( runtime.getGoogleProject(), runtime.getRuntimeName(), false); } catch (ApiException e) { log.log(Level.WARNING, String.format("failed to delete runtime '%s'", runtimeId), e); errors++; } } log.info( String.format( "deleted %d old runtimes and %d idle runtimes (with %d errors) " + "of %d total runtimes (%d of which were idle)", activeDeletes, unusedDeletes, errors, listRuntimeResponses.size(), idles)); if (errors > 0) { throw new ServerErrorException(String.format("%d runtime deletion calls failed", errors)); } return ResponseEntity.noContent().build(); } @Autowired OfflineRuntimeController(
@Qualifier(NotebooksConfig.SERVICE_RUNTIMES_API) Provider<RuntimesApi> runtimesApiProvider,
Provider<WorkbenchConfig> configProvider,
Clock clock); @Override ResponseEntity<Void> checkRuntimes(); } | @Test public void testCheckRuntimesNoResults() throws Exception { stubRuntimes(ImmutableList.of()); assertThat(controller.checkRuntimes().getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); verify(mockRuntimesApi, never()).deleteRuntime(any(), any(), any()); }
@Test public void testCheckRuntimesActiveRuntime() throws Exception { stubRuntimes(ImmutableList.of(runtimeWithAge(Duration.ofHours(10)))); assertThat(controller.checkRuntimes().getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); verify(mockRuntimesApi, never()).deleteRuntime(any(), any(), any()); }
@Test public void testCheckRuntimesActiveTooOld() throws Exception { stubRuntimes(ImmutableList.of(runtimeWithAge(MAX_AGE.plusMinutes(5)))); assertThat(controller.checkRuntimes().getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); verify(mockRuntimesApi).deleteRuntime(any(), any(), any()); }
@Test public void testCheckRuntimesIdleYoung() throws Exception { stubRuntimes( ImmutableList.of( runtimeWithAgeAndIdle(IDLE_MAX_AGE.minusMinutes(10), Duration.ofHours(10)))); assertThat(controller.checkRuntimes().getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); verify(mockRuntimesApi, never()).deleteRuntime(any(), any(), any()); }
@Test public void testCheckRuntimesIdleOld() throws Exception { stubRuntimes( ImmutableList.of( runtimeWithAgeAndIdle(IDLE_MAX_AGE.plusMinutes(15), Duration.ofHours(10)))); assertThat(controller.checkRuntimes().getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); verify(mockRuntimesApi).deleteRuntime(any(), any(), any()); }
@Test public void testCheckRuntimesBrieflyIdleOld() throws Exception { stubRuntimes( ImmutableList.of( runtimeWithAgeAndIdle(IDLE_MAX_AGE.plusMinutes(15), Duration.ofMinutes(15)))); assertThat(controller.checkRuntimes().getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); verify(mockRuntimesApi, never()).deleteRuntime(any(), any(), any()); }
@Test public void testCheckRuntimesOtherStatusFiltered() throws Exception { stubRuntimes( ImmutableList.of( runtimeWithAge(MAX_AGE.plusDays(10)).status(LeonardoRuntimeStatus.DELETING))); assertThat(controller.checkRuntimes().getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); verify(mockRuntimesApi, never()).deleteRuntime(any(), any(), any()); } |
UserController implements UserApiDelegate { @Override public ResponseEntity<UserResponse> user( String term, String pageToken, Integer size, String sortOrder) { UserResponse response = new UserResponse(); response.setUsers(Collections.emptyList()); response.setNextPageToken(""); if (null == term || term.isEmpty()) { return ResponseEntity.ok(response); } PaginationToken paginationToken; try { paginationToken = getPaginationTokenFromPageToken(pageToken); } catch (IllegalArgumentException | BadRequestException e) { return ResponseEntity.badRequest().body(response); } WorkbenchConfig config = configProvider.get(); if (!fireCloudService.isUserMemberOfGroup( userProvider.get().getUsername(), config.firecloud.registeredDomainName)) { throw new ForbiddenException("user search requires registered data access"); } Sort.Direction direction = Optional.ofNullable(Sort.Direction.fromStringOrNull(sortOrder)).orElse(Sort.Direction.ASC); Sort sort = new Sort(new Sort.Order(direction, DEFAULT_SORT_FIELD)); List<DbUser> users = userService.findUsersBySearchString(term, sort).stream() .filter(user -> user.getFirstSignInTime() != null) .collect(Collectors.toList()); int pageSize = Optional.ofNullable(size).orElse(DEFAULT_PAGE_SIZE); List<List<DbUser>> pagedUsers = Lists.partition(users, pageSize); int pageOffset = Long.valueOf(paginationToken.getOffset()).intValue(); if (pagedUsers.size() == 0) { return ResponseEntity.ok(response); } if (pageOffset < pagedUsers.size()) { boolean hasNext = pageOffset < pagedUsers.size() - 1; if (hasNext) { response.setNextPageToken(PaginationToken.of(pageOffset + 1).toBase64()); } List<org.pmiops.workbench.model.User> modelUsers = pagedUsers.get(pageOffset).stream() .map(TO_USER_RESPONSE_USER) .collect(Collectors.toList()); response.setUsers(modelUsers); } else { log.warning( String.format( "User attempted autocomplete for a paged result that doesn't exist. Term: %s. Page: %d", term, pageOffset)); return ResponseEntity.badRequest().body(response); } return ResponseEntity.ok(response); } @Autowired UserController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> configProvider,
FireCloudService fireCloudService,
UserService userService,
@Qualifier(END_USER_CLOUD_BILLING) Provider<Cloudbilling> cloudBillingProvider,
FreeTierBillingService freeTierBillingService); @Override ResponseEntity<UserResponse> user(
String term, String pageToken, Integer size, String sortOrder); @Override ResponseEntity<WorkbenchListBillingAccountsResponse> listBillingAccounts(); } | @Test(expected = ForbiddenException.class) public void testUnregistered() { when(fireCloudService.isUserMemberOfGroup(any(), any())).thenReturn(false); userController.user("Robinson", null, null, null).getBody(); }
@Test public void testUserSearch() { when(fireCloudService.isUserMemberOfGroup(any(), any())).thenReturn(true); DbUser john = userDao.findUserByUsername("[email protected]"); UserResponse response = userController.user("John", null, null, null).getBody(); assertThat(response.getUsers()).hasSize(1); assertThat(response.getUsers().get(0).getEmail()).isSameAs(john.getUsername()); assertThat(response.getUsers().get(0).getUserName()).isSameAs(john.getUsername()); }
@Test public void testUserPartialStringSearch() { when(fireCloudService.isUserMemberOfGroup(any(), any())).thenReturn(true); List<DbUser> allUsers = Lists.newArrayList(userDao.findAll()); UserResponse response = userController.user("obin", null, null, null).getBody(); assertThat(response.getUsers()).hasSize(5); }
@Test public void testUserEmptyResponse() { when(fireCloudService.isUserMemberOfGroup(any(), any())).thenReturn(true); UserResponse response = userController.user("", null, null, null).getBody(); assertThat(response.getUsers()).hasSize(0); }
@Test public void testUserNoUsersResponse() { when(fireCloudService.isUserMemberOfGroup(any(), any())).thenReturn(true); UserResponse response = userController.user("Smith", null, null, null).getBody(); assertThat(response.getUsers()).hasSize(0); }
@Test public void testInvalidPageTokenCharacters() { ResponseEntity<UserResponse> response = userController.user("Robinson", "Inv@l!dT0k3n#", null, null); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); assertThat(response.getBody().getUsers()).hasSize(0); }
@Test public void testInvalidPageToken() { ResponseEntity<UserResponse> response = userController.user("Robinson", "eyJvZmZzZXQBhcmFtZF9", null, null); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); assertThat(response.getBody().getUsers()).hasSize(0); }
@Test public void testNegativePageOffset() { ResponseEntity<UserResponse> response = userController.user("Robinson", PaginationToken.of(-1).toBase64(), null, null); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); assertThat(response.getBody().getUsers()).hasSize(0); }
@Test public void testUserPageSize() { when(fireCloudService.isUserMemberOfGroup(any(), any())).thenReturn(true); int size = 1; UserResponse robinsons_0 = userController.user("Robinson", PaginationToken.of(0).toBase64(), size, null).getBody(); UserResponse robinsons_1 = userController.user("Robinson", PaginationToken.of(1).toBase64(), size, null).getBody(); UserResponse robinsons_2 = userController.user("Robinson", PaginationToken.of(2).toBase64(), size, null).getBody(); UserResponse robinsons_3 = userController.user("Robinson", PaginationToken.of(3).toBase64(), size, null).getBody(); UserResponse robinsons_4 = userController.user("Robinson", PaginationToken.of(4).toBase64(), size, null).getBody(); assertThat(robinsons_0.getUsers()).hasSize(size); assertThat(robinsons_0.getNextPageToken()).isEqualTo(PaginationToken.of(1).toBase64()); assertThat(robinsons_1.getUsers()).hasSize(size); assertThat(robinsons_1.getNextPageToken()).isEqualTo(PaginationToken.of(2).toBase64()); assertThat(robinsons_2.getUsers()).hasSize(size); assertThat(robinsons_2.getNextPageToken()).isEqualTo(PaginationToken.of(3).toBase64()); assertThat(robinsons_3.getUsers()).hasSize(size); assertThat(robinsons_3.getNextPageToken()).isEqualTo(PaginationToken.of(4).toBase64()); assertThat(robinsons_4.getUsers()).hasSize(size); assertThat(robinsons_4.getNextPageToken()).isEqualTo(""); }
@Test public void testUserPagedResponses() { when(fireCloudService.isUserMemberOfGroup(any(), any())).thenReturn(true); UserResponse robinsons_0_1 = userController.user("Robinson", PaginationToken.of(0).toBase64(), 2, null).getBody(); UserResponse robinsons_2_3 = userController.user("Robinson", PaginationToken.of(1).toBase64(), 2, null).getBody(); UserResponse robinsons_4 = userController.user("Robinson", PaginationToken.of(3).toBase64(), 1, null).getBody(); assertThat(robinsons_0_1.getUsers()).hasSize(2); assertThat(robinsons_2_3.getUsers()).hasSize(2); assertThat(robinsons_4.getUsers()).hasSize(1); assertThat(robinsons_0_1.getUsers()).containsNoneOf(robinsons_2_3, robinsons_4); assertThat(robinsons_2_3.getUsers()).containsNoneOf(robinsons_0_1, robinsons_4); assertThat(robinsons_4.getUsers()).containsNoneOf(robinsons_0_1, robinsons_2_3); }
@Test public void testUserSort() { when(fireCloudService.isUserMemberOfGroup(any(), any())).thenReturn(true); UserResponse robinsonsAsc = userController.user("Robinson", null, null, "asc").getBody(); UserResponse robinsonsDesc = userController.user("Robinson", null, null, "desc").getBody(); assertThat(robinsonsAsc.getUsers()).containsAllIn(robinsonsDesc.getUsers()); List<User> descendingReversed = Lists.reverse(robinsonsDesc.getUsers()); assertThat(robinsonsAsc.getUsers()).containsAllIn(descendingReversed).inOrder(); List<User> newAscending = Lists.newArrayList(robinsonsAsc.getUsers()); newAscending.sort(Comparator.comparing(User::getUserName)); assertThat(robinsonsAsc.getUsers()).containsAllIn(newAscending).inOrder(); } |
UserController implements UserApiDelegate { @Override public ResponseEntity<WorkbenchListBillingAccountsResponse> listBillingAccounts() { List<BillingAccount> billingAccounts = Stream.concat(maybeFreeTierBillingAccount(), maybeCloudBillingAccounts()) .collect(Collectors.toList()); return ResponseEntity.ok( new WorkbenchListBillingAccountsResponse().billingAccounts(billingAccounts)); } @Autowired UserController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> configProvider,
FireCloudService fireCloudService,
UserService userService,
@Qualifier(END_USER_CLOUD_BILLING) Provider<Cloudbilling> cloudBillingProvider,
FreeTierBillingService freeTierBillingService); @Override ResponseEntity<UserResponse> user(
String term, String pageToken, Integer size, String sortOrder); @Override ResponseEntity<WorkbenchListBillingAccountsResponse> listBillingAccounts(); } | @Test public void listBillingAccounts_upgradeYES_freeYES_cloudYES() throws IOException { config.billing = new BillingConfig(); config.billing.accountId = "free-tier"; config.featureFlags.enableBillingUpgrade = true; when(mockFreeTierBillingService.userHasRemainingFreeTierCredits(any())).thenReturn(true); when(testCloudbilling.billingAccounts().list().execute()) .thenReturn(new ListBillingAccountsResponse().setBillingAccounts(cloudbillingAccounts)); final List<BillingAccount> expectedWorkbenchBillingAccounts = ListUtils.union( Lists.newArrayList(freeTierBillingAccount), cloudbillingAccountsInWorkbench); final WorkbenchListBillingAccountsResponse response = userController.listBillingAccounts().getBody(); assertThat(response.getBillingAccounts()).isEqualTo(expectedWorkbenchBillingAccounts); }
@Test public void listBillingAccounts_upgradeYES_freeYES_cloudNO() throws IOException { config.billing = new BillingConfig(); config.billing.accountId = "free-tier"; config.featureFlags.enableBillingUpgrade = true; when(mockFreeTierBillingService.userHasRemainingFreeTierCredits(any())).thenReturn(true); when(testCloudbilling.billingAccounts().list().execute()) .thenReturn(new ListBillingAccountsResponse().setBillingAccounts(null)); final List<BillingAccount> expectedWorkbenchBillingAccounts = Lists.newArrayList(freeTierBillingAccount); final WorkbenchListBillingAccountsResponse response = userController.listBillingAccounts().getBody(); assertThat(response.getBillingAccounts()).isEqualTo(expectedWorkbenchBillingAccounts); }
@Test public void listBillingAccounts_upgradeYES_freeNO_cloudYES() throws IOException { config.billing = new BillingConfig(); config.billing.accountId = "free-tier"; config.featureFlags.enableBillingUpgrade = true; when(mockFreeTierBillingService.userHasRemainingFreeTierCredits(any())).thenReturn(false); when(testCloudbilling.billingAccounts().list().execute()) .thenReturn(new ListBillingAccountsResponse().setBillingAccounts(cloudbillingAccounts)); final List<BillingAccount> expectedWorkbenchBillingAccounts = cloudbillingAccountsInWorkbench; final WorkbenchListBillingAccountsResponse response = userController.listBillingAccounts().getBody(); assertThat(response.getBillingAccounts()).isEqualTo(expectedWorkbenchBillingAccounts); }
@Test public void listBillingAccounts_upgradeYES_freeNO_cloudNO() throws IOException { config.billing = new BillingConfig(); config.billing.accountId = "free-tier"; config.featureFlags.enableBillingUpgrade = true; when(mockFreeTierBillingService.userHasRemainingFreeTierCredits(any())).thenReturn(false); when(testCloudbilling.billingAccounts().list().execute()) .thenReturn(new ListBillingAccountsResponse().setBillingAccounts(null)); final WorkbenchListBillingAccountsResponse response = userController.listBillingAccounts().getBody(); assertThat(response.getBillingAccounts()).isEmpty(); }
@Test public void listBillingAccounts_upgradeNO_freeYES_cloudYES() throws IOException { config.billing = new BillingConfig(); config.billing.accountId = "free-tier"; config.featureFlags.enableBillingUpgrade = false; when(mockFreeTierBillingService.userHasRemainingFreeTierCredits(any())).thenReturn(true); when(testCloudbilling.billingAccounts().list().execute()) .thenReturn(new ListBillingAccountsResponse().setBillingAccounts(cloudbillingAccounts)); final List<BillingAccount> expectedWorkbenchBillingAccounts = Lists.newArrayList(freeTierBillingAccount); final WorkbenchListBillingAccountsResponse response = userController.listBillingAccounts().getBody(); assertThat(response.getBillingAccounts()).isEqualTo(expectedWorkbenchBillingAccounts); }
@Test public void listBillingAccounts_upgradeNO_freeYES_cloudNO() throws IOException { config.billing = new BillingConfig(); config.billing.accountId = "free-tier"; config.featureFlags.enableBillingUpgrade = false; when(mockFreeTierBillingService.userHasRemainingFreeTierCredits(any())).thenReturn(true); when(testCloudbilling.billingAccounts().list().execute()) .thenReturn(new ListBillingAccountsResponse().setBillingAccounts(null)); final List<BillingAccount> expectedWorkbenchBillingAccounts = Lists.newArrayList(freeTierBillingAccount); final WorkbenchListBillingAccountsResponse response = userController.listBillingAccounts().getBody(); assertThat(response.getBillingAccounts()).isEqualTo(expectedWorkbenchBillingAccounts); }
@Test public void listBillingAccounts_upgradeNO_freeNO_cloudYES() throws IOException { config.billing = new BillingConfig(); config.billing.accountId = "free-tier"; config.featureFlags.enableBillingUpgrade = false; when(mockFreeTierBillingService.userHasRemainingFreeTierCredits(any())).thenReturn(false); when(testCloudbilling.billingAccounts().list().execute()) .thenReturn(new ListBillingAccountsResponse().setBillingAccounts(cloudbillingAccounts)); final List<BillingAccount> expectedWorkbenchBillingAccounts = Lists.newArrayList(freeTierBillingAccount); final WorkbenchListBillingAccountsResponse response = userController.listBillingAccounts().getBody(); assertThat(response.getBillingAccounts()).isEqualTo(expectedWorkbenchBillingAccounts); }
@Test public void listBillingAccounts_upgradeNO_freeNO_cloudNO() throws IOException { config.billing = new BillingConfig(); config.billing.accountId = "free-tier"; config.featureFlags.enableBillingUpgrade = false; when(mockFreeTierBillingService.userHasRemainingFreeTierCredits(any())).thenReturn(false); when(testCloudbilling.billingAccounts().list().execute()) .thenReturn(new ListBillingAccountsResponse().setBillingAccounts(null)); final List<BillingAccount> expectedWorkbenchBillingAccounts = Lists.newArrayList(freeTierBillingAccount); final WorkbenchListBillingAccountsResponse response = userController.listBillingAccounts().getBody(); assertThat(response.getBillingAccounts()).isEqualTo(expectedWorkbenchBillingAccounts); } |
Subsets and Splits
No saved queries yet
Save your SQL queries to embed, download, and access them later. Queries will appear here once saved.