target
stringlengths 20
113k
| src_fm
stringlengths 11
86.3k
| src_fm_fc
stringlengths 21
86.4k
| src_fm_fc_co
stringlengths 30
86.4k
| src_fm_fc_ms
stringlengths 42
86.8k
| src_fm_fc_ms_ff
stringlengths 43
86.8k
|
|---|---|---|---|---|---|
@Test public void testStatus_handleApiException() throws ApiException { when(statusApi.status()).thenThrow(new ApiException(500, null, "{\"ok\": false}")); assertThat(service.getFirecloudStatus()).isFalse(); } | @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; } | 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; } } | 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); } | 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); } | 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(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()); } | @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(); } | 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(); } } | 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); } | 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(); } | 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 testBulkProjectAudit() throws Exception { List<Project> projectList = new ArrayList<>(); doReturn(projectList).when(cloudResourceManagerService).getAllProjectsForUser(any()); offlineUserController.bulkAuditProjectAccess(); verify(cloudResourceManagerService, times(4)).getAllProjectsForUser(any()); } | @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(); } | 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(); } } | 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); } | 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(); } | 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 testCreateAuthDomain() { ResponseEntity<EmptyResponse> response = this.authDomainController.createAuthDomain(""); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK); } | @AuthorityRequired({Authority.DEVELOPER}) @Override public ResponseEntity<EmptyResponse> createAuthDomain(String groupName) { fireCloudService.createGroup(groupName); return ResponseEntity.ok(new EmptyResponse()); } | AuthDomainController implements AuthDomainApiDelegate { @AuthorityRequired({Authority.DEVELOPER}) @Override public ResponseEntity<EmptyResponse> createAuthDomain(String groupName) { fireCloudService.createGroup(groupName); return ResponseEntity.ok(new EmptyResponse()); } } | 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); } | 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); } | 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 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(); } | @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(); } | 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(); } } | 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); } | 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); } | 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 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(); } | @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(); } | 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(); } } | 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); } | 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); } | 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 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()); } } | @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); } | 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); } } | 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); } | 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); } | 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_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()); } } | @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); } | 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); } } | 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); } | 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); } | 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() { 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); } | @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); } | 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); } } | 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); } | 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); } | 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 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); } | @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); } | 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); } } | 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); } | 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); } | 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 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()); } } | @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)); } | 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)); } } | 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); } | 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); } | 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 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()); } | public void bufferBillingProjects() { int creationAttempts = this.workbenchConfigProvider.get().billing.bufferRefillProjectsPerTask; for (int i = 0; i < creationAttempts; i++) { bufferBillingProject(); } } | BillingProjectBufferService implements GaugeDataCollector { public void bufferBillingProjects() { int creationAttempts = this.workbenchConfigProvider.get().billing.bufferRefillProjectsPerTask; for (int i = 0; i < creationAttempts; i++) { bufferBillingProject(); } } } | 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); } | 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(); } | 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 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()); } } | @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)); } | 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)); } } | 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); } | 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); } | 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_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()); } } | @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)); } | 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)); } } | 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); } | 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); } | 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() { 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); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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()); } } | @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()); } | 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()); } } | 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); } | 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); } | 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_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()); } } | @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()); } | 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()); } } | 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); } | 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); } | 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() { setupWorkspaceServiceMock(); EmptyResponse response = cohortAnnotationDefinitionController .deleteCohortAnnotationDefinition( NAMESPACE, NAME, cohort.getCohortId(), dbCohortAnnotationDefinition.getCohortAnnotationDefinitionId()) .getBody(); assertEquals(new EmptyResponse(), response); } | @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()); } | 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()); } } | 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); } | 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); } | 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 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()); } } | @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)); } | 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)); } } | 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); } | 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); } | 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_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()); } } | @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)); } | 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)); } } | 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); } | 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); } | 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() { 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); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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()); } } | @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)); } | 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)); } } | 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); } | 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); } | 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 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); } | 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; } | 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; } } | 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); } | 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(); } | 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 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)); } | @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)); } | 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)); } } | 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); } | 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); } | 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(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); } | @Override @AuthorityRequired({Authority.RESEARCHER_DATA_VIEW}) public ResponseEntity<WorkspaceAdminView> getWorkspaceAdminView(String workspaceNamespace) { return ResponseEntity.ok(workspaceAdminService.getWorkspaceAdminView(workspaceNamespace)); } | WorkspaceAdminController implements WorkspaceAdminApiDelegate { @Override @AuthorityRequired({Authority.RESEARCHER_DATA_VIEW}) public ResponseEntity<WorkspaceAdminView> getWorkspaceAdminView(String workspaceNamespace) { return ResponseEntity.ok(workspaceAdminService.getWorkspaceAdminView(workspaceNamespace)); } } | 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); } | 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); } | 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 public void testSearchConceptsBlankQuery() { assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query(" ") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS))); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 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); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 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))); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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))); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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))); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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))); } | @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)); } | 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)); } } | 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); } | 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); } | 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 testSearchNoConcepts() { assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("a") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS))); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsNameNoMatches() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("x") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS))); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testGetStatus() { final long numberAvailable = billingProjectBufferEntryDao.countByStatus( DbStorageEnums.billingProjectBufferEntryStatusToStorage(BufferEntryStatus.AVAILABLE)); final BillingProjectBufferStatus bufferStatus = billingProjectBufferService.getStatus(); assertThat(bufferStatus.getBufferSize()).isEqualTo(numberAvailable); } | public BillingProjectBufferStatus getStatus() { final long bufferSize = billingProjectBufferEntryDao.countByStatus( DbStorageEnums.billingProjectBufferEntryStatusToStorage(BufferEntryStatus.AVAILABLE)); return new BillingProjectBufferStatus().bufferSize(bufferSize); } | BillingProjectBufferService implements GaugeDataCollector { public BillingProjectBufferStatus getStatus() { final long bufferSize = billingProjectBufferEntryDao.countByStatus( DbStorageEnums.billingProjectBufferEntryStatusToStorage(BufferEntryStatus.AVAILABLE)); return new BillingProjectBufferStatus().bufferSize(bufferSize); } } | 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); } | 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(); } | 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 testSearchConceptsCodeMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptA") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_1); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsConceptIdMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("123") .domain(Domain.OBSERVATION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_4); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsVocabIdMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("V456") .domain(Domain.OBSERVATION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_4); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsMatchOrder() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptD") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS)), CLIENT_CONCEPT_6, CLIENT_CONCEPT_5); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsWithVocabularyStandard() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptD") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_5); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsNonStandard() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .domain(Domain.MEASUREMENT) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS) .query("conceptB")), CLIENT_CONCEPT_2); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsStandardConcept() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .domain(Domain.CONDITION) .query("conceptA") .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_1); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsDomainIdNoMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("zzz") .domain(Domain.OBSERVATION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS))); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsDomainIdMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptA") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS)), CLIENT_CONCEPT_1); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testSearchConceptsMultipleMatch() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("con") .standardConceptFilter(StandardConceptFilter.STANDARD_CONCEPTS) .domain(Domain.CONDITION)), CLIENT_CONCEPT_5, CLIENT_CONCEPT_1); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 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(); } | @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()); } | 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()); } } | 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); } | 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(); } | 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 testSearchConceptsOneResult() { saveConcepts(); assertResults( conceptsController.searchConcepts( "ns", "name", new SearchConceptsRequest() .query("conceptC") .domain(Domain.CONDITION) .standardConceptFilter(StandardConceptFilter.ALL_CONCEPTS) .maxResults(1)), CLIENT_CONCEPT_3); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 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); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 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(); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 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(); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 testGetConceptSetsInWorkspaceEmpty() { assertThat( conceptSetsController .getConceptSetsInWorkspace(workspace.getNamespace(), WORKSPACE_NAME) .getBody() .getItems()) .isEmpty(); } | @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)); } | 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)); } } | 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); } | 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); } | 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(expected = NotFoundException.class) public void testGetConceptSetNotExists() { conceptSetsController.getConceptSet(workspace.getNamespace(), WORKSPACE_NAME, 1L); } | @Override public ResponseEntity<ConceptSet> getConceptSet( String workspaceNamespace, String workspaceId, Long conceptSetId) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); return ResponseEntity.ok(conceptSetService.getConceptSet(conceptSetId)); } | 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)); } } | 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); } | 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); } | 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 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); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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(); } | @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); } | 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); } } | 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); } | 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); } | 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(expected = NotFoundException.class) public void testGetSurveyConceptSetWrongConceptId() { makeSurveyConceptSet1(); conceptSetsController.getConceptSet(workspace2.getNamespace(), WORKSPACE_NAME_2, 99L); } | @Override public ResponseEntity<ConceptSet> getConceptSet( String workspaceNamespace, String workspaceId, Long conceptSetId) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); return ResponseEntity.ok(conceptSetService.getConceptSet(conceptSetId)); } | 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)); } } | 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); } | 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); } | 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 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(); } | @Override public ResponseEntity<ConceptSet> getConceptSet( String workspaceNamespace, String workspaceId, Long conceptSetId) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); return ResponseEntity.ok(conceptSetService.getConceptSet(conceptSetId)); } | 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)); } } | 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); } | 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); } | 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 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); } | 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); } | 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); } } | 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); } | 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(); } | 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(expected = NotFoundException.class) public void testGetConceptSetWrongConceptSetId() { makeConceptSet1(); conceptSetsController.getConceptSet(workspace2.getNamespace(), WORKSPACE_NAME_2, 99L); } | @Override public ResponseEntity<ConceptSet> getConceptSet( String workspaceNamespace, String workspaceId, Long conceptSetId) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); return ResponseEntity.ok(conceptSetService.getConceptSet(conceptSetId)); } | 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)); } } | 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); } | 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); } | 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 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(); } | @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)); } | 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)); } } | 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); } | 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); } | 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 = 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); } | @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)); } | 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)); } } | 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); } | 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); } | 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 = 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); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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); } | @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)); } | 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)); } } | 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); } | 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); } | 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(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(); } | @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)); } | 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)); } } | 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); } | 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); } | 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(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())); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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); } | @Override public ResponseEntity<EmptyResponse> deleteConceptSet( String workspaceNamespace, String workspaceId, Long conceptSetId) { conceptSetService.delete(conceptSetId); return ResponseEntity.ok(new EmptyResponse()); } | ConceptSetsController implements ConceptSetsApiDelegate { @Override public ResponseEntity<EmptyResponse> deleteConceptSet( String workspaceNamespace, String workspaceId, Long conceptSetId) { conceptSetService.delete(conceptSetId); return ResponseEntity.ok(new EmptyResponse()); } } | 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); } | 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); } | 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 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"); } } | @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); } | 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); } } | 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); } | 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); } | 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 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); } | 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); } | 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); } } | 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); } | 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(); } | 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 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"); } } | @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); } | 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); } } | 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); } | 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); } | 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 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()); } } | @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); } | 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); } } | 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); } | 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); } | 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 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); } | @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); } | 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); } } | 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); } | 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); } | 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 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()); } } | @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); } | 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); } } | 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); } | 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); } | 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 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(); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 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(); } | @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()); } | 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()); } } | 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); } | 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); } | 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 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"); } } | @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)); } | 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)); } } | 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); } | 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); } | 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 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())); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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); } | @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()); } | 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()); } } | 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); } | 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); } | 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 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); } } | @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()); } | 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()); } } | 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); } | 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); } | 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 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); } | 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); } | 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); } } | 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); } | 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(); } | 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 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()); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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()); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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); } | @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); } | 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); } } | 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); } | 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); } | 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 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"); } | @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)); } | 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)); } } | 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); } | 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); } | 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 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()); } } | @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)); } | 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)); } } | 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); } | 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); } | 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 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); } | @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()))); } | 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()))); } } | 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); } | 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); } | 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 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); } | @Override public ResponseEntity<WorkspaceResponseListResponse> getWorkspaces() { final WorkspaceResponseListResponse response = new WorkspaceResponseListResponse(); response.setItems(recordOperationTime(workspaceService::getWorkspaces, "getWorkspaces")); return ResponseEntity.ok(response); } | WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<WorkspaceResponseListResponse> getWorkspaces() { final WorkspaceResponseListResponse response = new WorkspaceResponseListResponse(); response.setItems(recordOperationTime(workspaceService::getWorkspaces, "getWorkspaces")); return ResponseEntity.ok(response); } } | 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); } | 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); } | 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 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); } | @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } | WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } } | 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); } | 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); } | 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_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(); } | @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } | WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } } | 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); } | 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); } | 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_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()))); } | @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } | WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } } | 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); } | 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); } | 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 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); } | 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); } | 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); } } | 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); } | 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(); } | 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 testCreateWorkspace_UpdateBillingAccount_flagFalse() { workbenchConfig.featureFlags.enableBillingUpgrade = false; Workspace workspace = createWorkspace(); workspace.setBillingAccountName("new-account"); workspacesController.createWorkspace(workspace); verifyZeroInteractions(endUserCloudbillingProvider.get()); verifyZeroInteractions(serviceAccountCloudbillingProvider.get()); } | @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } | WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } } | 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); } | 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); } | 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_doNotUpdateBillingForFreeTier() { Workspace workspace = createWorkspace(); workspace.setBillingAccountName(workbenchConfig.billing.freeTierBillingAccountName()); workspacesController.createWorkspace(workspace); verifyZeroInteractions(endUserCloudbillingProvider.get()); verifyZeroInteractions(serviceAccountCloudbillingProvider.get()); } | @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } | WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } } | 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); } | 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); } | 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(expected = FailedPreconditionException.class) public void testCreateWorkspace_archivedCdrVersionThrows() { Workspace workspace = createWorkspace(); workspace.setCdrVersionId(archivedCdrVersionId); workspacesController.createWorkspace(workspace).getBody(); } | @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } | WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<Workspace> createWorkspace(Workspace workspace) throws BadRequestException { return ResponseEntity.ok( recordOperationTime(() -> createWorkspaceImpl(workspace), "createWorkspace")); } } | 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); } | 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); } | 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 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) { } } | @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()); } | 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()); } } | 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); } | 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); } | 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 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); } | @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); } | 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); } } | 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); } | 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); } | 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 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); } | @Override public ResponseEntity<CloneWorkspaceResponse> cloneWorkspace( String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body) throws BadRequestException, TooManyRequestsException { return recordOperationTime( () -> cloneWorkspaceImpl(fromWorkspaceNamespace, fromWorkspaceId, body), "cloneWorkspace"); } | WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<CloneWorkspaceResponse> cloneWorkspace( String fromWorkspaceNamespace, String fromWorkspaceId, CloneWorkspaceRequest body) throws BadRequestException, TooManyRequestsException { return recordOperationTime( () -> cloneWorkspaceImpl(fromWorkspaceNamespace, fromWorkspaceId, body), "cloneWorkspace"); } } | 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); } | 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); } | 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 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)); } | @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); } | 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); } } | 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); } | 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); } | 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 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(); } } | @Override public ResponseEntity<WorkspaceResponseListResponse> getWorkspaces() { final WorkspaceResponseListResponse response = new WorkspaceResponseListResponse(); response.setItems(recordOperationTime(workspaceService::getWorkspaces, "getWorkspaces")); return ResponseEntity.ok(response); } | WorkspacesController implements WorkspacesApiDelegate { @Override public ResponseEntity<WorkspaceResponseListResponse> getWorkspaces() { final WorkspaceResponseListResponse response = new WorkspaceResponseListResponse(); response.setItems(recordOperationTime(workspaceService::getWorkspaces, "getWorkspaces")); return ResponseEntity.ok(response); } } | 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); } | 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); } | 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 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); } | @Override public ResponseEntity<FileDetail> copyNotebook( String fromWorkspaceNamespace, String fromWorkspaceId, String fromNotebookName, CopyRequest copyRequest) { return ResponseEntity.ok( recordOperationTime( () -> copyNotebookImpl( fromWorkspaceNamespace, fromWorkspaceId, fromNotebookName, copyRequest), "copyNotebook")); } | 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")); } } | 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); } | 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); } | 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 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); } | @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); } | 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); } } | 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); } | 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); } | 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 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); } | 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); } | 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); } } | 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); } | 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(); } | 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(); } |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.