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(expected = BadRequestException.class) public void testNihCallbackBadRequest() throws Exception { when(nihApi.nihCallback(any())).thenThrow(new ApiException(400, "Bad Request")); service.postNihCallback(new FirecloudJWTWrapper()); } | @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } | FireCloudServiceImpl implements FireCloudService { @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } } | FireCloudServiceImpl implements FireCloudService { @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); } | FireCloudServiceImpl implements FireCloudService { @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); } | FireCloudServiceImpl implements FireCloudService { @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); static final List<String> FIRECLOUD_API_OAUTH_SCOPES; static final List<String> FIRECLOUD_WORKSPACE_REQUIRED_FIELDS; } |
@Test public void findCriteriaByExceptions() { try { controller.findCriteriaBy(1L, null, null, false, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid domain. null is not valid.", bre.getMessage()); } try { controller.findCriteriaBy(1L, "blah", null, false, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid domain. blah is not valid.", bre.getMessage()); } try { controller.findCriteriaBy(1L, DomainType.CONDITION.toString(), "blah", false, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid type. blah is not valid.", bre.getMessage()); } } | @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaByDemo() { DbCriteria demoCriteria = DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.AGE.toString()) .addCount(0L) .addParentId(0L) .build(); cbCriteriaDao.save(demoCriteria); assertEquals( createResponseCriteria(demoCriteria), controller .findCriteriaBy( 1L, DomainType.PERSON.toString(), CriteriaType.AGE.toString(), false, null) .getBody() .getItems() .get(0)); } | @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaBy( Long cdrVersionId, String domain, String type, Boolean standard, Long parentId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findCriteriaBy(domain, type, standard, parentId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaAutoCompleteMatchesSynonyms() { DbCriteria criteria = DbCriteria.builder() .addDomainId(DomainType.MEASUREMENT.toString()) .addType(CriteriaType.LOINC.toString()) .addCount(0L) .addHierarchy(true) .addStandard(true) .addSynonyms("LP12*[MEASUREMENT_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaAutoComplete( 1L, DomainType.MEASUREMENT.toString(), "LP12", CriteriaType.LOINC.toString(), true, null) .getBody() .getItems() .get(0)); } | @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaAutoCompleteMatchesCode() { DbCriteria criteria = DbCriteria.builder() .addDomainId(DomainType.MEASUREMENT.toString()) .addType(CriteriaType.LOINC.toString()) .addCount(0L) .addHierarchy(true) .addStandard(true) .addCode("LP123") .addSynonyms("+[MEASUREMENT_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaAutoComplete( 1L, DomainType.MEASUREMENT.toString(), "LP12", CriteriaType.LOINC.toString(), true, null) .getBody() .getItems() .get(0)); } | @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaAutoCompleteSnomed() { DbCriteria criteria = DbCriteria.builder() .addDomainId(DomainType.CONDITION.toString()) .addType(CriteriaType.SNOMED.toString()) .addCount(0L) .addHierarchy(true) .addStandard(true) .addSynonyms("LP12*[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaAutoComplete( 1L, DomainType.CONDITION.toString(), "LP12", CriteriaType.SNOMED.toString(), true, null) .getBody() .getItems() .get(0)); } | @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaAutoCompleteExceptions() { try { controller.findCriteriaAutoComplete(1L, null, "blah", null, null, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid domain. null is not valid.", bre.getMessage()); } try { controller.findCriteriaAutoComplete(1L, "blah", "blah", "blah", null, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid domain. blah is not valid.", bre.getMessage()); } try { controller.findCriteriaAutoComplete( 1L, DomainType.CONDITION.toString(), "blah", "blah", null, null); fail("Should have thrown a BadRequestException!"); } catch (BadRequestException bre) { assertEquals( "Bad Request: Please provide a valid type. blah is not valid.", bre.getMessage()); } } | @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete( Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateType(type); validateTerm(term); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findCriteriaAutoComplete( domain, term, type, standard, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaByDomainAndSearchTermMatchesSourceCode() { DbCriteria criteria = DbCriteria.builder() .addCode("001") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.CONDITION.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.ICD9CM.toString()) .addAttribute(Boolean.FALSE) .addStandard(false) .addSynonyms("[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.CONDITION.name(), "001", null) .getBody() .getItems() .get(0)); } | @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaByDomainAndSearchTermLikeSourceCode() { DbCriteria criteria = DbCriteria.builder() .addCode("00") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.CONDITION.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.ICD9CM.toString()) .addAttribute(Boolean.FALSE) .addStandard(false) .addSynonyms("+[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); List<Criteria> results = controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.CONDITION.name(), "00", null) .getBody() .getItems(); assertEquals(1, results.size()); assertEquals(createResponseCriteria(criteria), results.get(0)); } | @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaByDomainAndSearchTermDrugMatchesStandardCodeBrand() { DbCriteria criteria1 = DbCriteria.builder() .addCode("672535") .addCount(-1L) .addConceptId("19001487") .addDomainId(DomainType.DRUG.toString()) .addGroup(Boolean.FALSE) .addSelectable(Boolean.TRUE) .addName("4-Way") .addParentId(0) .addType(CriteriaType.BRAND.toString()) .addAttribute(Boolean.FALSE) .addStandard(true) .addSynonyms("[DRUG_rank1]") .build(); cbCriteriaDao.save(criteria1); List<Criteria> results = controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.DRUG.name(), "672535", null) .getBody() .getItems(); assertEquals(1, results.size()); assertEquals(createResponseCriteria(criteria1), results.get(0)); } | @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaByDomainAndSearchTermMatchesStandardCode() { DbCriteria criteria = DbCriteria.builder() .addCode("LP12") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.CONDITION.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.LOINC.toString()) .addAttribute(Boolean.FALSE) .addStandard(true) .addSynonyms("[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.CONDITION.name(), "LP12", null) .getBody() .getItems() .get(0)); } | @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test(expected = ServerErrorException.class) public void testNihCallbackServerError() throws Exception { when(nihApi.nihCallback(any())).thenThrow(new ApiException(500, "Internal Server Error")); service.postNihCallback(new FirecloudJWTWrapper()); } | @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } | FireCloudServiceImpl implements FireCloudService { @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } } | FireCloudServiceImpl implements FireCloudService { @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); } | FireCloudServiceImpl implements FireCloudService { @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); } | FireCloudServiceImpl implements FireCloudService { @Override public void postNihCallback(FirecloudJWTWrapper wrapper) { NihApi nihApi = nihApiProvider.get(); retryHandler.run( (context) -> { return nihApi.nihCallback(wrapper); }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); static final List<String> FIRECLOUD_API_OAUTH_SCOPES; static final List<String> FIRECLOUD_WORKSPACE_REQUIRED_FIELDS; } |
@Test public void findCriteriaByDomainAndSearchTermMatchesSynonyms() { DbCriteria criteria = DbCriteria.builder() .addCode("001") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.CONDITION.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.LOINC.toString()) .addAttribute(Boolean.FALSE) .addStandard(true) .addSynonyms("LP12*[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.CONDITION.name(), "LP12", null) .getBody() .getItems() .get(0)); } | @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaByDomainAndSearchTermDrugMatchesSynonyms() { jdbcTemplate.execute( "create table cb_criteria_relationship(concept_id_1 integer, concept_id_2 integer)"); DbCriteria criteria = DbCriteria.builder() .addCode("001") .addCount(10L) .addConceptId("123") .addDomainId(DomainType.DRUG.toString()) .addGroup(Boolean.TRUE) .addSelectable(Boolean.TRUE) .addName("chol blah") .addParentId(0) .addType(CriteriaType.ATC.toString()) .addAttribute(Boolean.FALSE) .addStandard(true) .addSynonyms("LP12*[DRUG_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findCriteriaByDomainAndSearchTerm(1L, DomainType.DRUG.name(), "LP12", null) .getBody() .getItems() .get(0)); jdbcTemplate.execute("drop table cb_criteria_relationship"); } | @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm( Long cdrVersionId, String domain, String term, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); validateTerm(term); return ResponseEntity.ok( cohortBuilderService.findCriteriaByDomainAndSearchTerm(domain, term, limit)); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findStandardCriteriaByDomainAndConceptId() { jdbcTemplate.execute( "create table cb_criteria_relationship(concept_id_1 integer, concept_id_2 integer)"); jdbcTemplate.execute( "insert into cb_criteria_relationship(concept_id_1, concept_id_2) values (12345, 1)"); DbCriteria criteria = DbCriteria.builder() .addDomainId(DomainType.CONDITION.toString()) .addType(CriteriaType.ICD10CM.toString()) .addStandard(true) .addCount(1L) .addConceptId("1") .addSynonyms("[CONDITION_rank1]") .build(); cbCriteriaDao.save(criteria); assertEquals( createResponseCriteria(criteria), controller .findStandardCriteriaByDomainAndConceptId(1L, DomainType.CONDITION.toString(), 12345L) .getBody() .getItems() .get(0)); jdbcTemplate.execute("drop table cb_criteria_relationship"); } | @Override public ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId( Long cdrVersionId, String domain, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findStandardCriteriaByDomainAndConceptId(domain, conceptId))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId( Long cdrVersionId, String domain, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findStandardCriteriaByDomainAndConceptId(domain, conceptId))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId( Long cdrVersionId, String domain, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findStandardCriteriaByDomainAndConceptId(domain, conceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId( Long cdrVersionId, String domain, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findStandardCriteriaByDomainAndConceptId(domain, conceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId( Long cdrVersionId, String domain, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); validateDomain(domain); return ResponseEntity.ok( new CriteriaListResponse() .items( cohortBuilderService.findStandardCriteriaByDomainAndConceptId(domain, conceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findDrugBrandOrIngredientByName() { DbCriteria drugATCCriteria = DbCriteria.builder() .addDomainId(DomainType.DRUG.toString()) .addType(CriteriaType.ATC.toString()) .addParentId(0L) .addCode("LP12345") .addName("drugName") .addConceptId("12345") .addGroup(true) .addSelectable(true) .addCount(12L) .build(); cbCriteriaDao.save(drugATCCriteria); DbCriteria drugBrandCriteria = DbCriteria.builder() .addDomainId(DomainType.DRUG.toString()) .addType(CriteriaType.BRAND.toString()) .addParentId(0L) .addCode("LP6789") .addName("brandName") .addConceptId("1235") .addGroup(true) .addSelectable(true) .addCount(33L) .build(); cbCriteriaDao.save(drugBrandCriteria); assertEquals( createResponseCriteria(drugATCCriteria), controller.findDrugBrandOrIngredientByValue(1L, "drugN", null).getBody().getItems().get(0)); assertEquals( createResponseCriteria(drugBrandCriteria), controller .findDrugBrandOrIngredientByValue(1L, "brandN", null) .getBody() .getItems() .get(0)); assertEquals( createResponseCriteria(drugBrandCriteria), controller .findDrugBrandOrIngredientByValue(1L, "LP6789", null) .getBody() .getItems() .get(0)); } | @Override public ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue( Long cdrVersionId, String value, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findDrugBrandOrIngredientByValue(value, limit))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue( Long cdrVersionId, String value, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findDrugBrandOrIngredientByValue(value, limit))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue( Long cdrVersionId, String value, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findDrugBrandOrIngredientByValue(value, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue( Long cdrVersionId, String value, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findDrugBrandOrIngredientByValue(value, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue( Long cdrVersionId, String value, Integer limit) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaListResponse() .items(cohortBuilderService.findDrugBrandOrIngredientByValue(value, limit))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findCriteriaAttributeByConceptId() { DbCriteriaAttribute criteriaAttributeMin = cbCriteriaAttributeDao.save( DbCriteriaAttribute.builder() .addConceptId(1L) .addConceptName("MIN") .addEstCount("10") .addType("NUM") .addValueAsConceptId(0L) .build()); DbCriteriaAttribute criteriaAttributeMax = cbCriteriaAttributeDao.save( DbCriteriaAttribute.builder() .addConceptId(1L) .addConceptName("MAX") .addEstCount("100") .addType("NUM") .addValueAsConceptId(0L) .build()); List<CriteriaAttribute> attrs = controller .findCriteriaAttributeByConceptId(1L, criteriaAttributeMin.getConceptId()) .getBody() .getItems(); assertTrue(attrs.contains(createResponseCriteriaAttribute(criteriaAttributeMin))); assertTrue(attrs.contains(createResponseCriteriaAttribute(criteriaAttributeMax))); } | @Override public ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId( Long cdrVersionId, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaAttributeListResponse() .items(cohortBuilderService.findCriteriaAttributeByConceptId(conceptId))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId( Long cdrVersionId, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaAttributeListResponse() .items(cohortBuilderService.findCriteriaAttributeByConceptId(conceptId))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId( Long cdrVersionId, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaAttributeListResponse() .items(cohortBuilderService.findCriteriaAttributeByConceptId(conceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId( Long cdrVersionId, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaAttributeListResponse() .items(cohortBuilderService.findCriteriaAttributeByConceptId(conceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId( Long cdrVersionId, Long conceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new CriteriaAttributeListResponse() .items(cohortBuilderService.findCriteriaAttributeByConceptId(conceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findParticipantDemographics() { cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.GENDER.toString()) .addName("Male") .addStandard(true) .addConceptId("1") .addParentId(1) .build()); cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.RACE.toString()) .addName("African American") .addStandard(true) .addConceptId("2") .addParentId(1) .build()); cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.ETHNICITY.toString()) .addName("Not Hispanic or Latino") .addStandard(true) .addConceptId("3") .addParentId(1) .build()); cbCriteriaDao.save( DbCriteria.builder() .addDomainId(DomainType.PERSON.toString()) .addType(CriteriaType.SEX.toString()) .addName("Male") .addStandard(true) .addConceptId("4") .addParentId(1) .build()); ParticipantDemographics demos = controller.findParticipantDemographics(1L).getBody(); assertEquals( new ConceptIdName().conceptId(1L).conceptName("Male"), demos.getGenderList().get(0)); assertEquals( new ConceptIdName().conceptId(2L).conceptName("African American"), demos.getRaceList().get(0)); assertEquals( new ConceptIdName().conceptId(3L).conceptName("Not Hispanic or Latino"), demos.getEthnicityList().get(0)); assertEquals( new ConceptIdName().conceptId(4L).conceptName("Male"), demos.getSexAtBirthList().get(0)); } | @Override public ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok(cohortBuilderService.findParticipantDemographics()); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok(cohortBuilderService.findParticipantDemographics()); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok(cohortBuilderService.findParticipantDemographics()); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok(cohortBuilderService.findParticipantDemographics()); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok(cohortBuilderService.findParticipantDemographics()); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void findSurveyVersionByQuestionConceptId() { jdbcTemplate.execute( "create table cb_survey_version(survey_id integer, concept_id integer, version varchar(50), display_order integer)"); jdbcTemplate.execute( "create table cb_survey_attribute(id integer, question_concept_id integer, answer_concept_id integer, survey_id integer, item_count integer)"); jdbcTemplate.execute( "insert into cb_survey_version(survey_id, concept_id, version, display_order) values (100, 1333342, 'May 2020', 1)"); jdbcTemplate.execute( "insert into cb_survey_version(survey_id, concept_id, version, display_order) values (101, 1333342, 'June 2020', 2)"); jdbcTemplate.execute( "insert into cb_survey_version(survey_id, concept_id, version, display_order) values (102, 1333342, 'July 2020', 3)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (1, 715713, 0, 100, 291)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (2, 715713, 0, 101, 148)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (3, 715713, 0, 102, 150)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (4, 715713, 903096, 100, 154)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (5, 715713, 903096, 101, 82)"); jdbcTemplate.execute( "insert into cb_survey_attribute(id, question_concept_id, answer_concept_id, survey_id, item_count) values (6, 715713, 903096, 102, 31)"); SurveyVersionListResponse response = controller.findSurveyVersionByQuestionConceptId(1L, 1333342L, 715713L).getBody(); assertEquals(response.getItems().get(0).getSurveyId(), new Long("100")); assertEquals(response.getItems().get(0).getVersion(), "May 2020"); assertEquals(response.getItems().get(0).getItemCount(), new Long("291")); assertEquals(response.getItems().get(1).getSurveyId(), new Long("101")); assertEquals(response.getItems().get(1).getVersion(), "June 2020"); assertEquals(response.getItems().get(1).getItemCount(), new Long("148")); assertEquals(response.getItems().get(2).getSurveyId(), new Long("102")); assertEquals(response.getItems().get(2).getVersion(), "July 2020"); assertEquals(response.getItems().get(2).getItemCount(), new Long("150")); jdbcTemplate.execute("drop table cb_survey_version"); jdbcTemplate.execute("drop table cb_survey_attribute"); } | @Override public ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId( Long cdrVersionId, Long surveyConceptId, Long questionConceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new SurveyVersionListResponse() .items( cohortBuilderService.findSurveyVersionByQuestionConceptId( surveyConceptId, questionConceptId))); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId( Long cdrVersionId, Long surveyConceptId, Long questionConceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new SurveyVersionListResponse() .items( cohortBuilderService.findSurveyVersionByQuestionConceptId( surveyConceptId, questionConceptId))); } } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId( Long cdrVersionId, Long surveyConceptId, Long questionConceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new SurveyVersionListResponse() .items( cohortBuilderService.findSurveyVersionByQuestionConceptId( surveyConceptId, questionConceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId( Long cdrVersionId, Long surveyConceptId, Long questionConceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new SurveyVersionListResponse() .items( cohortBuilderService.findSurveyVersionByQuestionConceptId( surveyConceptId, questionConceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { @Override public ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId( Long cdrVersionId, Long surveyConceptId, Long questionConceptId) { cdrVersionService.setCdrVersion(cdrVersionId); return ResponseEntity.ok( new SurveyVersionListResponse() .items( cohortBuilderService.findSurveyVersionByQuestionConceptId( surveyConceptId, questionConceptId))); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void isApproximate() { SearchParameter inSearchParameter = new SearchParameter(); SearchParameter exSearchParameter = new SearchParameter(); SearchGroupItem inSearchGroupItem = new SearchGroupItem().addSearchParametersItem(inSearchParameter); SearchGroupItem exSearchGroupItem = new SearchGroupItem().addSearchParametersItem(exSearchParameter); SearchGroup inSearchGroup = new SearchGroup().addItemsItem(inSearchGroupItem); SearchGroup exSearchGroup = new SearchGroup().addItemsItem(exSearchGroupItem); SearchRequest searchRequest = new SearchRequest().addIncludesItem(inSearchGroup).addExcludesItem(exSearchGroup); inSearchGroup.temporal(true); assertTrue(controller.isApproximate(searchRequest)); inSearchGroup.temporal(false); inSearchParameter.subtype(CriteriaSubType.BP.toString()); assertTrue(controller.isApproximate(searchRequest)); inSearchParameter.type(CriteriaType.DECEASED.toString()); assertTrue(controller.isApproximate(searchRequest)); inSearchGroup.temporal(true); inSearchParameter.subtype(CriteriaSubType.BP.toString()); assertTrue(controller.isApproximate(searchRequest)); inSearchGroup.temporal(false); inSearchParameter.type(CriteriaType.ETHNICITY.toString()).subtype(null); assertFalse(controller.isApproximate(searchRequest)); exSearchGroup.temporal(true); assertTrue(controller.isApproximate(searchRequest)); exSearchGroup.temporal(false); exSearchParameter.subtype(CriteriaSubType.BP.toString()); assertTrue(controller.isApproximate(searchRequest)); exSearchParameter.type(CriteriaType.DECEASED.toString()); assertTrue(controller.isApproximate(searchRequest)); exSearchGroup.temporal(true); exSearchParameter.subtype(CriteriaSubType.BP.toString()); assertTrue(controller.isApproximate(searchRequest)); } | protected boolean isApproximate(SearchRequest request) { List<SearchGroup> allGroups = ImmutableList.copyOf(Iterables.concat(request.getIncludes(), request.getExcludes())); List<SearchParameter> allParams = allGroups.stream() .flatMap(sg -> sg.getItems().stream()) .flatMap(sgi -> sgi.getSearchParameters().stream()) .collect(Collectors.toList()); return allGroups.stream().anyMatch(SearchGroup::getTemporal) || allParams.stream().anyMatch(sp -> CriteriaSubType.BP.toString().equals(sp.getSubtype())); } | CohortBuilderController implements CohortBuilderApiDelegate { protected boolean isApproximate(SearchRequest request) { List<SearchGroup> allGroups = ImmutableList.copyOf(Iterables.concat(request.getIncludes(), request.getExcludes())); List<SearchParameter> allParams = allGroups.stream() .flatMap(sg -> sg.getItems().stream()) .flatMap(sgi -> sgi.getSearchParameters().stream()) .collect(Collectors.toList()); return allGroups.stream().anyMatch(SearchGroup::getTemporal) || allParams.stream().anyMatch(sp -> CriteriaSubType.BP.toString().equals(sp.getSubtype())); } } | CohortBuilderController implements CohortBuilderApiDelegate { protected boolean isApproximate(SearchRequest request) { List<SearchGroup> allGroups = ImmutableList.copyOf(Iterables.concat(request.getIncludes(), request.getExcludes())); List<SearchParameter> allParams = allGroups.stream() .flatMap(sg -> sg.getItems().stream()) .flatMap(sgi -> sgi.getSearchParameters().stream()) .collect(Collectors.toList()); return allGroups.stream().anyMatch(SearchGroup::getTemporal) || allParams.stream().anyMatch(sp -> CriteriaSubType.BP.toString().equals(sp.getSubtype())); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); } | CohortBuilderController implements CohortBuilderApiDelegate { protected boolean isApproximate(SearchRequest request) { List<SearchGroup> allGroups = ImmutableList.copyOf(Iterables.concat(request.getIncludes(), request.getExcludes())); List<SearchParameter> allParams = allGroups.stream() .flatMap(sg -> sg.getItems().stream()) .flatMap(sgi -> sgi.getSearchParameters().stream()) .collect(Collectors.toList()); return allGroups.stream().anyMatch(SearchGroup::getTemporal) || allParams.stream().anyMatch(sp -> CriteriaSubType.BP.toString().equals(sp.getSubtype())); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } | CohortBuilderController implements CohortBuilderApiDelegate { protected boolean isApproximate(SearchRequest request) { List<SearchGroup> allGroups = ImmutableList.copyOf(Iterables.concat(request.getIncludes(), request.getExcludes())); List<SearchParameter> allParams = allGroups.stream() .flatMap(sg -> sg.getItems().stream()) .flatMap(sgi -> sgi.getSearchParameters().stream()) .collect(Collectors.toList()); return allGroups.stream().anyMatch(SearchGroup::getTemporal) || allParams.stream().anyMatch(sp -> CriteriaSubType.BP.toString().equals(sp.getSubtype())); } @Autowired CohortBuilderController(
CdrVersionService cdrVersionService,
ElasticSearchService elasticSearchService,
Provider<WorkbenchConfig> configProvider,
CohortBuilderService cohortBuilderService); @Override ResponseEntity<CriteriaListResponse> findCriteriaAutoComplete(
Long cdrVersionId, String domain, String term, String type, Boolean standard, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugBrandOrIngredientByValue(
Long cdrVersionId, String value, Integer limit); @Override ResponseEntity<CriteriaListResponse> findDrugIngredientByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<AgeTypeCountListResponse> findAgeTypeCounts(Long cdrVersionId); @Override ResponseEntity<Long> countParticipants(Long cdrVersionId, SearchRequest request); @Override ResponseEntity<CriteriaListWithCountResponse> findCriteriaByDomainAndSearchTerm(
Long cdrVersionId, String domain, String term, Integer limit); @Override ResponseEntity<CriteriaMenuOptionsListResponse> findCriteriaMenuOptions(
Long cdrVersionId); @Override ResponseEntity<DataFiltersResponse> findDataFilters(Long cdrVersionId); @Override ResponseEntity<CriteriaListResponse> findStandardCriteriaByDomainAndConceptId(
Long cdrVersionId, String domain, Long conceptId); @Override ResponseEntity<DemoChartInfoListResponse> findDemoChartInfo(
Long cdrVersionId, String genderOrSex, String age, SearchRequest request); @Override ResponseEntity<DomainInfoResponse> findDomainInfos(Long cdrVersionId, String term); @Override ResponseEntity<CriteriaAttributeListResponse> findCriteriaAttributeByConceptId(
Long cdrVersionId, Long conceptId); @Override ResponseEntity<CriteriaListResponse> findCriteriaBy(
Long cdrVersionId, String domain, String type, Boolean standard, Long parentId); @Override ResponseEntity<ParticipantDemographics> findParticipantDemographics(Long cdrVersionId); @Override ResponseEntity<SurveysResponse> findSurveyModules(Long cdrVersionId, String term); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId); @Override ResponseEntity<SurveyVersionListResponse> findSurveyVersionByQuestionConceptIdAndAnswerConceptId(
Long cdrVersionId, Long surveyConceptId, Long questionConceptId, Long answerConceptId); } |
@Test public void testGetUserRecentResourceFromRawBucket() { dbUserRecentResource1.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), "notebook.ipynb"); } | @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testGetUserRecentResourceWithDuplicatedNameInPath() { dbUserRecentResource1.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals( recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), "nb.ipynb"); } | @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testCreateAllOfUsBillingProject() throws Exception { workbenchConfig.featureFlags.enableVpcFlowLogs = false; workbenchConfig.featureFlags.enableVpcServicePerimeter = false; workbenchConfig.firecloud.vpcServicePerimeterName = "this will be ignored"; service.createAllOfUsBillingProject("project-name"); ArgumentCaptor<FirecloudCreateRawlsBillingProjectFullRequest> captor = ArgumentCaptor.forClass(FirecloudCreateRawlsBillingProjectFullRequest.class); verify(billingApi).createBillingProjectFull(captor.capture()); FirecloudCreateRawlsBillingProjectFullRequest request = captor.getValue(); assertThat(request.getProjectName()).isEqualTo("project-name"); assertThat(request.getBillingAccount()).isEqualTo("billingAccounts/test-billing-account"); assertThat(request.getEnableFlowLogs()).isFalse(); assertThat(request.getHighSecurityNetwork()).isFalse(); assertThat(request.getServicePerimeter()).isNull(); } | @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); static final List<String> FIRECLOUD_API_OAUTH_SCOPES; static final List<String> FIRECLOUD_WORKSPACE_REQUIRED_FIELDS; } |
@Test public void testGetUserRecentResourceWithSpacesInPath() { dbUserRecentResource1.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), "My favorite notebook.ipynb"); } | @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testGetUserRecentResourceInvalidURINotebookPath() { dbUserRecentResource1.setNotebookName("my local notebook directory: notebook.ipynb"); when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(recentResources.size(), 0); } | @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testGetUserRecentResourceNotebookPathEndsWithSlash() { dbUserRecentResource1.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(Collections.singletonList(dbUserRecentResource1)); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertNotNull(recentResources.get(0).getNotebook()); assertEquals( recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), ""); } | @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testGetUserRecentResourceNonexistentNotebook() { dbUserRecentResource1.setNotebookName("gs: dbUserRecentResource2.setCohort(null); dbUserRecentResource2.setNotebookName("gs: when(mockUserRecentResourceService.findAllResourcesByUser(dbUser.getUserId())) .thenReturn(ImmutableList.of(dbUserRecentResource1, dbUserRecentResource2)); when(mockCloudStorageService.getExistingBlobIdsIn(anyList())) .thenReturn(ImmutableSet.of(BlobId.of("bkt", "notebooks/notebook.ipynb"))); WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(recentResources.size(), 1); assertNotNull(recentResources.get(0).getNotebook()); assertEquals(recentResources.get(0).getNotebook().getName(), "notebook.ipynb"); } | @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testGetUserRecentResource() { WorkspaceResourceResponse recentResources = userMetricsController.getUserRecentResources().getBody(); assertNotNull(recentResources); assertEquals(3, recentResources.size()); assertNull(recentResources.get(0).getCohort()); assertEquals(recentResources.get(0).getNotebook().getPath(), "gs: assertEquals(recentResources.get(0).getNotebook().getName(), "notebook1.ipynb"); assertNotNull(recentResources.get(1).getCohort()); assertEquals(recentResources.get(1).getCohort().getName(), "Cohort Name"); } | @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResourceResponse> getUserRecentResources() { long userId = userProvider.get().getUserId(); List<DbUserRecentResource> userRecentResourceList = userRecentResourceService.findAllResourcesByUser(userId); List<Long> workspaceIdList = userRecentResourceList.stream() .map(DbUserRecentResource::getWorkspaceId) .distinct() .limit(distinctWorkspacelimit) .collect(Collectors.toList()); final Map<Long, DbWorkspace> idToDbWorkspace = workspaceIdList.stream() .map( id -> workspaceService .findActiveByWorkspaceId(id) .map( dbWorkspace -> new AbstractMap.SimpleImmutableEntry<>( dbWorkspace.getWorkspaceId(), dbWorkspace))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final Map<Long, FirecloudWorkspaceResponse> idToFirecloudWorkspace = idToDbWorkspace.entrySet().stream() .map( entry -> fireCloudService .getWorkspace(entry.getValue()) .map( workspaceResponse -> new AbstractMap.SimpleImmutableEntry<>( entry.getKey(), workspaceResponse))) .flatMap(Streams::stream) .collect( ImmutableMap.toImmutableMap( SimpleImmutableEntry::getKey, SimpleImmutableEntry::getValue)); final ImmutableList<DbUserRecentResource> workspaceFilteredResources = userRecentResourceList.stream() .filter(r -> idToFirecloudWorkspace.containsKey(r.getWorkspaceId())) .filter(this::hasValidBlobIdIfNotebookNamePresent) .collect(ImmutableList.toImmutableList()); final Set<BlobId> foundBlobIds = cloudStorageService.getExistingBlobIdsIn( workspaceFilteredResources.stream() .map(DbUserRecentResource::getNotebookName) .map(this::uriToBlobId) .flatMap(Streams::stream) .limit(MAX_RECENT_NOTEBOOKS) .collect(Collectors.toList())); final ImmutableList<WorkspaceResource> userVisibleRecentResources = workspaceFilteredResources.stream() .filter(urr -> foundBlobIdsContainsUserRecentResource(foundBlobIds, urr)) .map(urr -> buildRecentResource(idToDbWorkspace, idToFirecloudWorkspace, urr)) .collect(ImmutableList.toImmutableList()); final WorkspaceResourceResponse recentResponse = new WorkspaceResourceResponse(); recentResponse.addAll(userVisibleRecentResources); return ResponseEntity.ok(recentResponse); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testUpdateRecentResource() { Timestamp now = new Timestamp(fakeClock.instant().toEpochMilli()); DbUserRecentResource mockUserRecentResource = new DbUserRecentResource(); mockUserRecentResource.setCohort(null); mockUserRecentResource.setWorkspaceId(dbWorkspace2.getWorkspaceId()); mockUserRecentResource.setUserId(dbUser.getUserId()); mockUserRecentResource.setNotebookName("gs: mockUserRecentResource.setLastAccessDate(now); when(mockUserRecentResourceService.updateNotebookEntry( dbWorkspace2.getWorkspaceId(), dbUser.getUserId(), "gs: .thenReturn(mockUserRecentResource); RecentResourceRequest request = new RecentResourceRequest(); request.setNotebookName("gs: WorkspaceResource addedEntry = userMetricsController .updateRecentResource( dbWorkspace2.getWorkspaceNamespace(), dbWorkspace2.getFirecloudName(), request) .getBody(); assertNotNull(addedEntry); assertEquals((long) addedEntry.getWorkspaceId(), dbWorkspace2.getWorkspaceId()); assertNull(addedEntry.getCohort()); assertNotNull(addedEntry.getNotebook()); assertEquals(addedEntry.getNotebook().getName(), "notebook.ipynb"); assertEquals(addedEntry.getNotebook().getPath(), "gs: } | @Override public ResponseEntity<WorkspaceResource> updateRecentResource( String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest) { long wId = getWorkspaceId(workspaceNamespace, workspaceId); String notebookPath; if (recentResourceRequest.getNotebookName().startsWith("gs: notebookPath = recentResourceRequest.getNotebookName(); } else { String bucket = fireCloudService .getWorkspace(workspaceNamespace, workspaceId) .getWorkspace() .getBucketName(); notebookPath = "gs: } DbUserRecentResource recentResource = userRecentResourceService.updateNotebookEntry( wId, userProvider.get().getUserId(), notebookPath); return ResponseEntity.ok(TO_CLIENT.apply(recentResource)); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResource> updateRecentResource( String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest) { long wId = getWorkspaceId(workspaceNamespace, workspaceId); String notebookPath; if (recentResourceRequest.getNotebookName().startsWith("gs: notebookPath = recentResourceRequest.getNotebookName(); } else { String bucket = fireCloudService .getWorkspace(workspaceNamespace, workspaceId) .getWorkspace() .getBucketName(); notebookPath = "gs: } DbUserRecentResource recentResource = userRecentResourceService.updateNotebookEntry( wId, userProvider.get().getUserId(), notebookPath); return ResponseEntity.ok(TO_CLIENT.apply(recentResource)); } } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResource> updateRecentResource( String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest) { long wId = getWorkspaceId(workspaceNamespace, workspaceId); String notebookPath; if (recentResourceRequest.getNotebookName().startsWith("gs: notebookPath = recentResourceRequest.getNotebookName(); } else { String bucket = fireCloudService .getWorkspace(workspaceNamespace, workspaceId) .getWorkspace() .getBucketName(); notebookPath = "gs: } DbUserRecentResource recentResource = userRecentResourceService.updateNotebookEntry( wId, userProvider.get().getUserId(), notebookPath); return ResponseEntity.ok(TO_CLIENT.apply(recentResource)); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResource> updateRecentResource( String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest) { long wId = getWorkspaceId(workspaceNamespace, workspaceId); String notebookPath; if (recentResourceRequest.getNotebookName().startsWith("gs: notebookPath = recentResourceRequest.getNotebookName(); } else { String bucket = fireCloudService .getWorkspace(workspaceNamespace, workspaceId) .getWorkspace() .getBucketName(); notebookPath = "gs: } DbUserRecentResource recentResource = userRecentResourceService.updateNotebookEntry( wId, userProvider.get().getUserId(), notebookPath); return ResponseEntity.ok(TO_CLIENT.apply(recentResource)); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @Override public ResponseEntity<WorkspaceResource> updateRecentResource( String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest) { long wId = getWorkspaceId(workspaceNamespace, workspaceId); String notebookPath; if (recentResourceRequest.getNotebookName().startsWith("gs: notebookPath = recentResourceRequest.getNotebookName(); } else { String bucket = fireCloudService .getWorkspace(workspaceNamespace, workspaceId) .getWorkspace() .getBucketName(); notebookPath = "gs: } DbUserRecentResource recentResource = userRecentResourceService.updateNotebookEntry( wId, userProvider.get().getUserId(), notebookPath); return ResponseEntity.ok(TO_CLIENT.apply(recentResource)); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testHasValidBlobIdIfNotebookNamePresent_nullNotebookName_passes() { dbUserRecentResource1.setNotebookName(null); assertTrue(userMetricsController.hasValidBlobIdIfNotebookNamePresent(dbUserRecentResource1)); } | @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testHasValidBlobIdIfNotebookNamePresent_validNotebookName_passes() { assertTrue(userMetricsController.hasValidBlobIdIfNotebookNamePresent(dbUserRecentResource1)); } | @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test public void testHasValidBlobIdIfNotebookNamePresent_invalidNotebookName_fails() { dbUserRecentResource1.setNotebookName("invalid-notebook@name"); assertFalse(userMetricsController.hasValidBlobIdIfNotebookNamePresent(dbUserRecentResource1)); } | @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } | UserMetricsController implements UserMetricsApiDelegate { @VisibleForTesting public boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource) { return Optional.ofNullable(dbUserRecentResource.getNotebookName()) .map(name -> uriToBlobId(name).isPresent()) .orElse(true); } @Autowired UserMetricsController(
Provider<DbUser> userProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
UserRecentResourceService userRecentResourceService,
WorkspaceService workspaceService,
FireCloudService fireCloudService,
CloudStorageService cloudStorageService,
CommonMappers commonMappers,
FirecloudMapper firecloudMapper); @VisibleForTesting void setDistinctWorkspaceLimit(int limit); @Override ResponseEntity<WorkspaceResource> updateRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<EmptyResponse> deleteRecentResource(
String workspaceNamespace, String workspaceId, RecentResourceRequest recentResourceRequest); @Override ResponseEntity<WorkspaceResourceResponse> getUserRecentResources(); @VisibleForTesting boolean hasValidBlobIdIfNotebookNamePresent(DbUserRecentResource dbUserRecentResource); } |
@Test(expected = BadRequestException.class) public void testCreateAccount_invitationKeyMismatch() { createAccountAndDbUserWithAffiliation(); config.access.requireInvitationKey = true; when(mockCloudStorageService.readInvitationKey()).thenReturn("BLAH"); profileController.createAccount(createAccountRequest); } | @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testVpcFlowLogsParams() throws Exception { workbenchConfig.featureFlags.enableVpcFlowLogs = true; service.createAllOfUsBillingProject("project-name"); ArgumentCaptor<FirecloudCreateRawlsBillingProjectFullRequest> captor = ArgumentCaptor.forClass(FirecloudCreateRawlsBillingProjectFullRequest.class); verify(billingApi).createBillingProjectFull(captor.capture()); FirecloudCreateRawlsBillingProjectFullRequest request = captor.getValue(); assertThat(request.getEnableFlowLogs()).isTrue(); assertThat(request.getHighSecurityNetwork()).isTrue(); } | @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); static final List<String> FIRECLOUD_API_OAUTH_SCOPES; static final List<String> FIRECLOUD_WORKSPACE_REQUIRED_FIELDS; } |
@Test(expected = BadRequestException.class) public void testCreateAccount_invalidCaptchaToken() { createAccountAndDbUserWithAffiliation(); createAccountRequest.setCaptchaVerificationToken(WRONG_CAPTCHA_TOKEN); profileController.createAccount(createAccountRequest); } | @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testCreateAccount_noRequireInvitationKey() { createAccountAndDbUserWithAffiliation(); config.access.requireInvitationKey = false; when(mockCloudStorageService.readInvitationKey()).thenReturn("BLAH"); profileController.createAccount(createAccountRequest); } | @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> createAccount(CreateAccountRequest request) { if (workbenchConfigProvider.get().captcha.enableCaptcha) { verifyCaptcha(request.getCaptchaVerificationToken()); } if (workbenchConfigProvider.get().access.requireInvitationKey) { verifyInvitationKey(request.getInvitationKey()); } profileService.validateAffiliation(request.getProfile()); final Profile profile = request.getProfile(); profileService.cleanProfile(profile); profileService.validateNewProfile(profile); String gSuiteUsername = profile.getUsername() + "@" + workbenchConfigProvider.get().googleDirectoryService.gSuiteDomain; com.google.api.services.directory.model.User googleUser = directoryService.createUser( profile.getGivenName(), profile.getFamilyName(), gSuiteUsername, profile.getContactEmail()); DbUser user; try { user = userService.createUser( profile.getGivenName(), profile.getFamilyName(), googleUser.getPrimaryEmail(), profile.getContactEmail(), profile.getCurrentPosition(), profile.getOrganization(), profile.getAreaOfResearch(), profile.getProfessionalUrl(), profile.getDegrees(), FROM_CLIENT_ADDRESS.apply(profile.getAddress()), demographicSurveyMapper.demographicSurveyToDbDemographicSurvey( profile.getDemographicSurvey()), verifiedInstitutionalAffiliationMapper.modelToDbWithoutUser( profile.getVerifiedInstitutionalAffiliation(), institutionService)); } catch (Exception e) { log.severe( String.format( "An error occurred when creating DbUser for %s. Attempting to delete " + "orphaned G Suite account", gSuiteUsername)); try { directoryService.deleteUser(gSuiteUsername); log.severe("Orphaned G Suite account has been deleted."); } catch (Exception e2) { log.severe( String.format( "Orphaned G Suite account %s could not be deleted. " + "Manual intervention may be required", gSuiteUsername)); log.log(Level.SEVERE, e2.getMessage(), e2); throw e; } throw e; } if (request.getTermsOfServiceVersion() != null) { userService.submitTermsOfService(user, request.getTermsOfServiceVersion()); } final MailService mail = mailServiceProvider.get(); try { mail.sendWelcomeEmail(profile.getContactEmail(), googleUser.getPassword(), googleUser); } catch (MessagingException e) { throw new WorkbenchException(e); } institutionService .getInstitutionUserInstructions( profile.getVerifiedInstitutionalAffiliation().getInstitutionShortName()) .ifPresent( instructions -> { try { mail.sendInstitutionUserInstructions(profile.getContactEmail(), instructions); } catch (MessagingException e) { throw new WorkbenchException(e); } }); final Profile createdProfile = profileService.getProfile(user); profileAuditor.fireCreateAction(createdProfile); return ResponseEntity.ok(createdProfile); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = BadRequestException.class) public void testInvitationKeyVerification_invitationKeyMismatch() { invitationVerificationRequest.setInvitationKey("wrong key"); profileController.invitationKeyVerification(invitationVerificationRequest); } | @Override public ResponseEntity<Void> invitationKeyVerification( InvitationVerificationRequest invitationVerificationRequest) { verifyInvitationKey(invitationVerificationRequest.getInvitationKey()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> invitationKeyVerification( InvitationVerificationRequest invitationVerificationRequest) { verifyInvitationKey(invitationVerificationRequest.getInvitationKey()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> invitationKeyVerification( InvitationVerificationRequest invitationVerificationRequest) { verifyInvitationKey(invitationVerificationRequest.getInvitationKey()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> invitationKeyVerification( InvitationVerificationRequest invitationVerificationRequest) { verifyInvitationKey(invitationVerificationRequest.getInvitationKey()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> invitationKeyVerification( InvitationVerificationRequest invitationVerificationRequest) { verifyInvitationKey(invitationVerificationRequest.getInvitationKey()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testSubmitDataUseAgreement_success() { createAccountAndDbUserWithAffiliation(); String duaInitials = "NIH"; assertThat(profileController.submitDataUseAgreement(DUA_VERSION, duaInitials).getStatusCode()) .isEqualTo(HttpStatus.OK); List<DbUserDataUseAgreement> dbUserDataUseAgreementList = userDataUseAgreementDao.findByUserIdOrderByCompletionTimeDesc(dbUser.getUserId()); assertThat(dbUserDataUseAgreementList.size()).isEqualTo(1); DbUserDataUseAgreement dbUserDataUseAgreement = dbUserDataUseAgreementList.get(0); assertThat(dbUserDataUseAgreement.getUserFamilyName()).isEqualTo(dbUser.getFamilyName()); assertThat(dbUserDataUseAgreement.getUserGivenName()).isEqualTo(dbUser.getGivenName()); assertThat(dbUserDataUseAgreement.getUserInitials()).isEqualTo(duaInitials); assertThat(dbUserDataUseAgreement.getDataUseAgreementSignedVersion()).isEqualTo(DUA_VERSION); } | @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = BadRequestException.class) public void testSubmitDataUseAgreement_wrongVersion() { createAccountAndDbUserWithAffiliation(); String duaInitials = "NIH"; profileController.submitDataUseAgreement(DUA_VERSION - 1, duaInitials); } | @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> submitDataUseAgreement( Integer dataUseAgreementSignedVersion, String initials) { DbUser user = userService.submitDataUseAgreement( userProvider.get(), dataUseAgreementSignedVersion, initials); return getProfileResponse(saveUserWithConflictHandling(user)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testMe_success() { createAccountAndDbUserWithAffiliation(); Profile profile = profileController.getMe().getBody(); assertProfile( profile, PRIMARY_EMAIL, CONTACT_EMAIL, FAMILY_NAME, GIVEN_NAME, DataAccessLevel.UNREGISTERED, TIMESTAMP, false); verify(mockFireCloudService).registerUser(CONTACT_EMAIL, GIVEN_NAME, FAMILY_NAME); verify(mockProfileAuditor).fireLoginAction(dbUser); } | @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testMe_userBeforeNotLoggedInSuccess() { createAccountAndDbUserWithAffiliation(); Profile profile = profileController.getMe().getBody(); assertProfile( profile, PRIMARY_EMAIL, CONTACT_EMAIL, FAMILY_NAME, GIVEN_NAME, DataAccessLevel.UNREGISTERED, TIMESTAMP, false); verify(mockFireCloudService).registerUser(CONTACT_EMAIL, GIVEN_NAME, FAMILY_NAME); fakeClock.increment(1); profile = profileController.getMe().getBody(); assertProfile( profile, PRIMARY_EMAIL, CONTACT_EMAIL, FAMILY_NAME, GIVEN_NAME, DataAccessLevel.UNREGISTERED, TIMESTAMP, false); } | @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> getMe() { DbUser dbUser = initializeUserIfNeeded(); profileAuditor.fireLoginAction(dbUser); return getProfileResponse(dbUser); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = NotFoundException.class) public void updateVerifiedInstitutionalAffiliation_noSuchInstitution() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation original = createVerifiedInstitutionalAffiliation(); createAccountAndDbUserWithAffiliation(original, grantAdminAuthority); final VerifiedInstitutionalAffiliation newAffil = new VerifiedInstitutionalAffiliation() .institutionShortName("NotTheBroad") .institutionDisplayName("The Narrow Institute?") .institutionalRoleEnum(InstitutionalRole.PRE_DOCTORAL); profileController.updateVerifiedInstitutionalAffiliation(dbUser.getUserId(), newAffil); } | @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void updateVerifiedInstitutionalAffiliation_update() { boolean grantAdminAuthority = true; VerifiedInstitutionalAffiliation verifiedInstitutionalAffiliation = createVerifiedInstitutionalAffiliation(); createAccountAndDbUserWithAffiliation(verifiedInstitutionalAffiliation, grantAdminAuthority); verifiedInstitutionalAffiliation.setInstitutionalRoleEnum(InstitutionalRole.ADMIN); profileController.updateVerifiedInstitutionalAffiliation( dbUser.getUserId(), verifiedInstitutionalAffiliation); Profile updatedProfile = profileService.getProfile(dbUser); assertThat(updatedProfile.getVerifiedInstitutionalAffiliation()) .isEqualTo(verifiedInstitutionalAffiliation); } | @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = BadRequestException.class) public void updateVerifiedInstitutionalAffiliation_removeForbidden() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation original = createVerifiedInstitutionalAffiliation(); createAccountAndDbUserWithAffiliation(original, grantAdminAuthority); profileController.updateVerifiedInstitutionalAffiliation(dbUser.getUserId(), null); } | @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated public ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation( Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation) { DbUser dbUser = userDao.findUserByUserId(userId); Profile updatedProfile = profileService.getProfile(dbUser); if (verifiedAffiliation == null) { throw new BadRequestException("Cannot delete Verified Institutional Affiliation."); } Optional<Institution> institution = institutionService.getInstitution(verifiedAffiliation.getInstitutionShortName()); institution.ifPresent(i -> verifiedAffiliation.setInstitutionDisplayName(i.getDisplayName())); updatedProfile.setVerifiedInstitutionalAffiliation(verifiedAffiliation); Profile oldProfile = profileService.getProfile(dbUser); profileService.updateProfile(dbUser, updatedProfile, oldProfile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testVpcServicePerimeterParams() throws Exception { String servicePerimeter = "a-cloud-with-a-fence-around-it"; workbenchConfig.featureFlags.enableVpcServicePerimeter = true; workbenchConfig.firecloud.vpcServicePerimeterName = servicePerimeter; service.createAllOfUsBillingProject("project-name"); ArgumentCaptor<FirecloudCreateRawlsBillingProjectFullRequest> captor = ArgumentCaptor.forClass(FirecloudCreateRawlsBillingProjectFullRequest.class); verify(billingApi).createBillingProjectFull(captor.capture()); FirecloudCreateRawlsBillingProjectFullRequest request = captor.getValue(); assertThat(request.getServicePerimeter()).isEqualTo(servicePerimeter); } | @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); } | FireCloudServiceImpl implements FireCloudService { @Override public void createAllOfUsBillingProject(String projectName) { if (projectName.contains(WORKSPACE_DELIMITER)) { throw new IllegalArgumentException( String.format( "Attempting to create billing project with name (%s) that contains workspace delimiter (%s)", projectName, WORKSPACE_DELIMITER)); } boolean enableVpcFlowLogs = configProvider.get().featureFlags.enableVpcFlowLogs; FirecloudCreateRawlsBillingProjectFullRequest request = new FirecloudCreateRawlsBillingProjectFullRequest() .billingAccount(configProvider.get().billing.freeTierBillingAccountName()) .projectName(projectName) .highSecurityNetwork(enableVpcFlowLogs) .enableFlowLogs(enableVpcFlowLogs) .privateIpGoogleAccess(true); boolean enableVpcServicePerimeter = configProvider.get().featureFlags.enableVpcServicePerimeter; if (enableVpcServicePerimeter) { request.servicePerimeter(configProvider.get().firecloud.vpcServicePerimeterName); } BillingApi billingApi = billingApiProvider.get(); retryHandler.run( (context) -> { billingApi.createBillingProjectFull(request); return null; }); } @Autowired FireCloudServiceImpl(
Provider<WorkbenchConfig> configProvider,
Provider<ProfileApi> profileApiProvider,
Provider<BillingApi> billingApiProvider,
Provider<GroupsApi> groupsApiProvider,
Provider<NihApi> nihApiProvider,
@Qualifier(FireCloudConfig.END_USER_WORKSPACE_API)
Provider<WorkspacesApi> endUserWorkspacesApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_WORKSPACE_API)
Provider<WorkspacesApi> serviceAccountWorkspaceApiProvider,
Provider<StatusApi> statusApiProvider,
@Qualifier(FireCloudConfig.END_USER_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> endUserStaticNotebooksApiProvider,
@Qualifier(FireCloudConfig.SERVICE_ACCOUNT_STATIC_NOTEBOOKS_API)
Provider<StaticNotebooksApi> serviceAccountStaticNotebooksApiProvider,
FirecloudRetryHandler retryHandler,
@Qualifier(Constants.FIRECLOUD_ADMIN_CREDS)
Provider<ServiceAccountCredentials> fcAdminCredsProvider,
IamCredentialsClient iamCredentialsClient,
HttpTransport httpTransport); ApiClient getApiClientWithImpersonation(String userEmail); @Override @VisibleForTesting String getApiBasePath(); @Override boolean getFirecloudStatus(); @Override FirecloudMe getMe(); @Override void registerUser(String contactEmail, String firstName, String lastName); @Override void createAllOfUsBillingProject(String projectName); @Override void deleteBillingProject(String billingProject); @Override FirecloudBillingProjectStatus getBillingProjectStatus(String projectName); @Override void addOwnerToBillingProject(String ownerEmail, String projectName); @Override void removeOwnerFromBillingProject(
String ownerEmailToRemove, String projectName, Optional<String> callerAccessToken); @Override FirecloudWorkspace createWorkspace(String projectName, String workspaceName); @Override FirecloudWorkspace cloneWorkspace(
String fromProject, String fromName, String toProject, String toName); @Override List<FirecloudBillingProjectMembership> getBillingProjectMemberships(); @Override FirecloudWorkspaceACLUpdateResponseList updateWorkspaceACL(
String projectName, String workspaceName, List<FirecloudWorkspaceACLUpdate> aclUpdates); @Override FirecloudWorkspaceACL getWorkspaceAclAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspaceAsService(String projectName, String workspaceName); @Override FirecloudWorkspaceResponse getWorkspace(String projectName, String workspaceName); @Override Optional<FirecloudWorkspaceResponse> getWorkspace(DbWorkspace dbWorkspace); @Override List<FirecloudWorkspaceResponse> getWorkspaces(); @Override void deleteWorkspace(String projectName, String workspaceName); @Override FirecloudManagedGroupWithMembers getGroup(String groupName); @Override FirecloudManagedGroupWithMembers createGroup(String groupName); @Override void addUserToGroup(String email, String groupName); @Override void removeUserFromGroup(String email, String groupName); @Override boolean isUserMemberOfGroup(String email, String groupName); @Override String staticNotebooksConvert(byte[] notebook); @Override String staticNotebooksConvertAsService(byte[] notebook); @Override FirecloudNihStatus getNihStatus(); @Override void postNihCallback(FirecloudJWTWrapper wrapper); static final List<String> FIRECLOUD_API_OAUTH_SCOPES; static final List<String> FIRECLOUD_WORKSPACE_REQUIRED_FIELDS; } |
@Test public void updateContactEmail_forbidden() { createAccountAndDbUserWithAffiliation(); dbUser.setFirstSignInTime(TIMESTAMP); String originalEmail = dbUser.getContactEmail(); ResponseEntity<Void> response = profileController.updateContactEmail( new UpdateContactEmailRequest() .contactEmail("[email protected]") .username(dbUser.getUsername()) .creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN); assertThat(dbUser.getContactEmail()).isEqualTo(originalEmail); } | @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void updateContactEmail_badRequest() { createAccountAndDbUserWithAffiliation(); when(mockDirectoryService.resetUserPassword(anyString())).thenReturn(googleUser); dbUser.setFirstSignInTime(null); String originalEmail = dbUser.getContactEmail(); ResponseEntity<Void> response = profileController.updateContactEmail( new UpdateContactEmailRequest() .contactEmail("bad email address *(SD&(*D&F&*(DS ") .username(dbUser.getUsername()) .creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST); assertThat(dbUser.getContactEmail()).isEqualTo(originalEmail); } | @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void updateContactEmail_OK() { createAccountAndDbUserWithAffiliation(); dbUser.setFirstSignInTime(null); when(mockDirectoryService.resetUserPassword(anyString())).thenReturn(googleUser); ResponseEntity<Void> response = profileController.updateContactEmail( new UpdateContactEmailRequest() .contactEmail("[email protected]") .username(dbUser.getUsername()) .creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); assertThat(dbUser.getContactEmail()).isEqualTo("[email protected]"); } | @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> updateContactEmail( UpdateContactEmailRequest updateContactEmailRequest) { String username = updateContactEmailRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, updateContactEmailRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } String newEmail = updateContactEmailRequest.getContactEmail(); try { new InternetAddress(newEmail).validate(); } catch (AddressException e) { log.log(Level.INFO, "Invalid email entered."); return ResponseEntity.badRequest().build(); } user.setContactEmail(newEmail); return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void resendWelcomeEmail_messagingException() throws MessagingException { createAccountAndDbUserWithAffiliation(); dbUser.setFirstSignInTime(null); when(mockDirectoryService.resetUserPassword(anyString())).thenReturn(googleUser); doThrow(new MessagingException("exception")) .when(mockMailService) .sendWelcomeEmail(any(), any(), any()); ResponseEntity<Void> response = profileController.resendWelcomeEmail( new ResendWelcomeEmailRequest().username(dbUser.getUsername()).creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR); verify(mockMailService, times(2)).sendWelcomeEmail(any(), any(), any()); verify(mockDirectoryService, times(1)).resetUserPassword(anyString()); } | @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void resendWelcomeEmail_OK() throws MessagingException { createAccountAndDbUserWithAffiliation(); when(mockDirectoryService.resetUserPassword(anyString())).thenReturn(googleUser); doNothing().when(mockMailService).sendWelcomeEmail(any(), any(), any()); ResponseEntity<Void> response = profileController.resendWelcomeEmail( new ResendWelcomeEmailRequest().username(dbUser.getUsername()).creationNonce(NONCE)); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); verify(mockMailService, times(2)).sendWelcomeEmail(any(), any(), any()); verify(mockDirectoryService, times(1)).resetUserPassword(anyString()); } | @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest) { String username = resendRequest.getUsername().toLowerCase(); com.google.api.services.directory.model.User googleUser = directoryService.getUser(username); DbUser user = userService.getByUsernameOrThrow(username); checkUserCreationNonce(user, resendRequest.getCreationNonce()); if (userHasEverLoggedIn(googleUser, user)) { return ResponseEntity.status(HttpStatus.FORBIDDEN).build(); } return resetPasswordAndSendWelcomeEmail(username, user); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testUpdateNihToken() { config.featureFlags.useNewShibbolethService = false; NihToken nihToken = new NihToken().jwt("test"); FirecloudJWTWrapper firecloudJwt = new FirecloudJWTWrapper().jwt("test"); createAccountAndDbUserWithAffiliation(); profileController.updateNihToken(nihToken); verify(mockFireCloudService).postNihCallback(eq(firecloudJwt)); } | @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = ServerErrorException.class) public void testUpdateNihToken_serverError() { config.featureFlags.useNewShibbolethService = false; doThrow(new ServerErrorException()).when(mockFireCloudService).postNihCallback(any()); profileController.updateNihToken(new NihToken().jwt("test")); } | @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testUpdateNihToken_newShibbolethService() { config.featureFlags.useNewShibbolethService = true; NihToken nihToken = new NihToken().jwt("test"); String jwt = "test"; createAccountAndDbUserWithAffiliation(); profileController.updateNihToken(nihToken); verify(shibbolethService).updateShibbolethToken(eq(jwt)); } | @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = BadRequestException.class) public void testUpdateNihToken_badRequest_1() { profileController.updateNihToken(null); } | @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = BadRequestException.class) public void testUpdateNihToken_badRequest_noJwt() { profileController.updateNihToken(new NihToken()); } | @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> updateNihToken(NihToken token) { if (token == null || token.getJwt() == null) { throw new BadRequestException("Token is required."); } if (workbenchConfigProvider.get().featureFlags.useNewShibbolethService) { shibbolethService.updateShibbolethToken(token.getJwt()); } else { fireCloudService.postNihCallback(new FirecloudJWTWrapper().jwt(token.getJwt())); } userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void canBufferMultipleProjectsPerTask() { workbenchConfig.billing.bufferRefillProjectsPerTask = 2; billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times(2)).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 testSyncEraCommons() { FirecloudNihStatus nihStatus = new FirecloudNihStatus(); String linkedUsername = "linked"; nihStatus.setLinkedNihUsername(linkedUsername); nihStatus.setLinkExpireTime(TIMESTAMP.getTime()); when(mockFireCloudService.getNihStatus()).thenReturn(nihStatus); createAccountAndDbUserWithAffiliation(); profileController.syncEraCommonsStatus(); assertThat(userDao.findUserByUsername(PRIMARY_EMAIL).getEraCommonsLinkedNihUsername()) .isEqualTo(linkedUsername); assertThat(userDao.findUserByUsername(PRIMARY_EMAIL).getEraCommonsLinkExpireTime()).isNotNull(); assertThat(userDao.findUserByUsername(PRIMARY_EMAIL).getEraCommonsCompletionTime()).isNotNull(); } | @Override public ResponseEntity<Profile> syncEraCommonsStatus() { userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> syncEraCommonsStatus() { userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> syncEraCommonsStatus() { userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> syncEraCommonsStatus() { userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Profile> syncEraCommonsStatus() { userService.syncEraCommonsStatus(); return getProfileResponse(userProvider.get()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testDeleteProfile() { createAccountAndDbUserWithAffiliation(); profileController.deleteProfile(); verify(mockProfileAuditor).fireDeleteAction(dbUser.getUserId(), dbUser.getUsername()); } | @Override public ResponseEntity<Void> deleteProfile() { if (!workbenchConfigProvider.get().featureFlags.unsafeAllowDeleteUser) { throw new ForbiddenException("Self account deletion is disallowed in this environment."); } DbUser user = userProvider.get(); log.log(Level.WARNING, "Deleting profile: user email: " + user.getUsername()); directoryService.deleteUser(user.getUsername()); userDao.delete(user.getUserId()); profileAuditor.fireDeleteAction(user.getUserId(), user.getUsername()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> deleteProfile() { if (!workbenchConfigProvider.get().featureFlags.unsafeAllowDeleteUser) { throw new ForbiddenException("Self account deletion is disallowed in this environment."); } DbUser user = userProvider.get(); log.log(Level.WARNING, "Deleting profile: user email: " + user.getUsername()); directoryService.deleteUser(user.getUsername()); userDao.delete(user.getUserId()); profileAuditor.fireDeleteAction(user.getUserId(), user.getUsername()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> deleteProfile() { if (!workbenchConfigProvider.get().featureFlags.unsafeAllowDeleteUser) { throw new ForbiddenException("Self account deletion is disallowed in this environment."); } DbUser user = userProvider.get(); log.log(Level.WARNING, "Deleting profile: user email: " + user.getUsername()); directoryService.deleteUser(user.getUsername()); userDao.delete(user.getUserId()); profileAuditor.fireDeleteAction(user.getUserId(), user.getUsername()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> deleteProfile() { if (!workbenchConfigProvider.get().featureFlags.unsafeAllowDeleteUser) { throw new ForbiddenException("Self account deletion is disallowed in this environment."); } DbUser user = userProvider.get(); log.log(Level.WARNING, "Deleting profile: user email: " + user.getUsername()); directoryService.deleteUser(user.getUsername()); userDao.delete(user.getUserId()); profileAuditor.fireDeleteAction(user.getUserId(), user.getUsername()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override public ResponseEntity<Void> deleteProfile() { if (!workbenchConfigProvider.get().featureFlags.unsafeAllowDeleteUser) { throw new ForbiddenException("Self account deletion is disallowed in this environment."); } DbUser user = userProvider.get(); log.log(Level.WARNING, "Deleting profile: user email: " + user.getUsername()); directoryService.deleteUser(user.getUsername()); userDao.delete(user.getUserId()); profileAuditor.fireDeleteAction(user.getUserId(), user.getUsername()); return ResponseEntity.status(HttpStatus.NO_CONTENT).build(); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testBypassAccessModule() { Profile profile = createAccountAndDbUserWithAffiliation(); profileController.bypassAccessRequirement( profile.getUserId(), new AccessBypassRequest().isBypassed(true).moduleName(AccessModule.DATA_USE_AGREEMENT)); DbUser dbUser = userDao.findUserByUsername(PRIMARY_EMAIL); assertThat(dbUser.getDataUseAgreementBypassTime()).isNotNull(); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<EmptyResponse> bypassAccessRequirement( Long userId, AccessBypassRequest request) { userService.updateBypassTime(userId, request); return ResponseEntity.ok(new EmptyResponse()); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<EmptyResponse> bypassAccessRequirement( Long userId, AccessBypassRequest request) { userService.updateBypassTime(userId, request); return ResponseEntity.ok(new EmptyResponse()); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<EmptyResponse> bypassAccessRequirement( Long userId, AccessBypassRequest request) { userService.updateBypassTime(userId, request); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<EmptyResponse> bypassAccessRequirement( Long userId, AccessBypassRequest request) { userService.updateBypassTime(userId, request); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<EmptyResponse> bypassAccessRequirement( Long userId, AccessBypassRequest request) { userService.updateBypassTime(userId, request); return ResponseEntity.ok(new EmptyResponse()); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = NotFoundException.class) public void test_updateAccountProperties_null_user() { profileService.updateAccountProperties(new AccountPropertyUpdate()); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = NotFoundException.class) public void test_updateAccountProperties_user_not_found() { final AccountPropertyUpdate request = new AccountPropertyUpdate().username("not found"); profileService.updateAccountProperties(request); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void test_updateAccountProperties_no_change() { final Profile original = createAccountAndDbUserWithAffiliation(); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL); final Profile retrieved = profileService.updateAccountProperties(request); retrieved.setDemographicSurveyCompletionTime(null); assertThat(retrieved).isEqualTo(original); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void test_updateAccountProperties_contactEmail() { boolean grantAdminAuthority = true; final String newContactEmail = "[email protected]"; final Institution broadPlus = new Institution() .shortName("Broad") .displayName("The Broad Institute") .emailAddresses(ImmutableList.of(CONTACT_EMAIL, newContactEmail)) .duaTypeEnum(DuaType.RESTRICTED) .organizationTypeEnum(OrganizationType.ACADEMIC_RESEARCH_INSTITUTION); institutionService.createInstitution(broadPlus); final VerifiedInstitutionalAffiliation affiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(broadPlus.getShortName()) .institutionDisplayName(broadPlus.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(affiliation, grantAdminAuthority); assertThat(original.getContactEmail()).isEqualTo(CONTACT_EMAIL); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).contactEmail(newContactEmail); final Profile retrieved = profileService.updateAccountProperties(request); assertThat(retrieved.getContactEmail()).isEqualTo(newContactEmail); verify(mockProfileAuditor).fireUpdateAction(original, retrieved); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = BadRequestException.class) public void test_updateAccountProperties_contactEmail_user() { boolean grantAdminAuthority = false; final String newContactEmail = "[email protected]"; final Institution broadPlus = new Institution() .shortName("Broad") .displayName("The Broad Institute") .emailAddresses(ImmutableList.of(CONTACT_EMAIL, newContactEmail)) .duaTypeEnum(DuaType.RESTRICTED) .organizationTypeEnum(OrganizationType.ACADEMIC_RESEARCH_INSTITUTION); institutionService.createInstitution(broadPlus); final VerifiedInstitutionalAffiliation affiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(broadPlus.getShortName()) .institutionDisplayName(broadPlus.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(affiliation, grantAdminAuthority); assertThat(original.getContactEmail()).isEqualTo(CONTACT_EMAIL); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).contactEmail(newContactEmail); profileService.updateAccountProperties(request); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = BadRequestException.class) public void test_updateAccountProperties_contactEmail_no_match() { boolean grantAdminAuthority = true; createAccountAndDbUserWithAffiliation(grantAdminAuthority); final String newContactEmail = "[email protected]"; final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).contactEmail(newContactEmail); profileService.updateAccountProperties(request); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void test_updateAccountProperties_newAffiliation() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation expectedOriginalAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName("Broad") .institutionDisplayName("The Broad Institute") .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(grantAdminAuthority); assertThat(original.getVerifiedInstitutionalAffiliation()) .isEqualTo(expectedOriginalAffiliation); final Institution massGeneral = new Institution() .shortName("MGH123") .displayName("Massachusetts General Hospital") .emailAddresses(ImmutableList.of(CONTACT_EMAIL)) .duaTypeEnum(DuaType.RESTRICTED) .organizationTypeEnum(OrganizationType.HEALTH_CENTER_NON_PROFIT); institutionService.createInstitution(massGeneral); final VerifiedInstitutionalAffiliation newAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(massGeneral.getShortName()) .institutionDisplayName(massGeneral.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.POST_DOCTORAL); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).affiliation(newAffiliation); final Profile retrieved = profileService.updateAccountProperties(request); assertThat(retrieved.getVerifiedInstitutionalAffiliation()).isEqualTo(newAffiliation); verify(mockProfileAuditor).fireUpdateAction(original, retrieved); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void fillBuffer() { billingProjectBufferService.bufferBillingProjects(); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); verify(mockFireCloudService).createAllOfUsBillingProject(captor.capture()); String billingProjectName = captor.getValue(); assertThat(billingProjectName).startsWith(workbenchConfig.billing.projectNamePrefix); assertThat( billingProjectBufferEntryDao .findByFireCloudProjectName(billingProjectName) .getStatusEnum()) .isEqualTo(BufferEntryStatus.CREATING); } | 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(expected = BadRequestException.class) public void test_updateAccountProperties_newAffiliation_no_match() { boolean grantAdminAuthority = true; createAccountAndDbUserWithAffiliation(grantAdminAuthority); final Institution massGeneral = new Institution() .shortName("MGH123") .displayName("Massachusetts General Hospital") .duaTypeEnum(DuaType.MASTER) .emailDomains(ImmutableList.of("mgh.org", "massgeneral.hospital")) .organizationTypeEnum(OrganizationType.HEALTH_CENTER_NON_PROFIT); institutionService.createInstitution(massGeneral); final VerifiedInstitutionalAffiliation newAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(massGeneral.getShortName()) .institutionDisplayName(massGeneral.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.POST_DOCTORAL); final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).affiliation(newAffiliation); profileService.updateAccountProperties(request); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void test_updateAccountProperties_contactEmail_newAffiliation_self_match() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation expectedOriginalAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName("Broad") .institutionDisplayName("The Broad Institute") .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(grantAdminAuthority); assertThat(original.getContactEmail()).isEqualTo(CONTACT_EMAIL); assertThat(original.getVerifiedInstitutionalAffiliation()) .isEqualTo(expectedOriginalAffiliation); final String newContactEmail = "[email protected]"; final Institution massGeneral = new Institution() .shortName("MGH123") .displayName("Massachusetts General Hospital") .duaTypeEnum(DuaType.MASTER) .emailDomains(ImmutableList.of("mgh.org", "massgeneral.hospital")) .organizationTypeEnum(OrganizationType.HEALTH_CENTER_NON_PROFIT); institutionService.createInstitution(massGeneral); final VerifiedInstitutionalAffiliation newAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(massGeneral.getShortName()) .institutionDisplayName(massGeneral.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.POST_DOCTORAL); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .contactEmail(newContactEmail) .affiliation(newAffiliation); final Profile retrieved = profileService.updateAccountProperties(request); assertThat(retrieved.getContactEmail()).isEqualTo(newContactEmail); assertThat(retrieved.getVerifiedInstitutionalAffiliation()).isEqualTo(newAffiliation); verify(mockProfileAuditor).fireUpdateAction(original, retrieved); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test(expected = BadRequestException.class) public void test_updateAccountProperties_contactEmail_newAffiliation_no_match() { boolean grantAdminAuthority = true; final VerifiedInstitutionalAffiliation expectedOriginalAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName("Broad") .institutionDisplayName("The Broad Institute") .institutionalRoleEnum(InstitutionalRole.PROJECT_PERSONNEL); final Profile original = createAccountAndDbUserWithAffiliation(grantAdminAuthority); assertThat(original.getContactEmail()).isEqualTo(CONTACT_EMAIL); assertThat(original.getVerifiedInstitutionalAffiliation()) .isEqualTo(expectedOriginalAffiliation); final String newContactEmail = "[email protected]"; final Institution massGeneral = new Institution() .shortName("MGH123") .displayName("Massachusetts General Hospital") .duaTypeEnum(DuaType.MASTER) .emailDomains(ImmutableList.of("mgh.org", "massgeneral.hospital")) .organizationTypeEnum(OrganizationType.HEALTH_CENTER_NON_PROFIT); institutionService.createInstitution(massGeneral); final VerifiedInstitutionalAffiliation newAffiliation = new VerifiedInstitutionalAffiliation() .institutionShortName(massGeneral.getShortName()) .institutionDisplayName(massGeneral.getDisplayName()) .institutionalRoleEnum(InstitutionalRole.POST_DOCTORAL); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .contactEmail(newContactEmail) .affiliation(newAffiliation); profileService.updateAccountProperties(request); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void test_updateAccountProperties_no_bypass_requests() { final Profile original = createAccountAndDbUserWithAffiliation(); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .accessBypassRequests(Collections.emptyList()); final Profile retrieved = profileService.updateAccountProperties(request); retrieved.setDemographicSurveyCompletionTime(null); assertThat(retrieved).isEqualTo(original); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void test_updateAccountProperties_bypass_requests() { final Profile original = createAccountAndDbUserWithAffiliation(); assertThat(original.getDataUseAgreementBypassTime()).isNull(); assertThat(original.getComplianceTrainingBypassTime()).isNull(); assertThat(original.getBetaAccessBypassTime()).isNull(); assertThat(original.getEraCommonsBypassTime()).isNull(); assertThat(original.getTwoFactorAuthBypassTime()).isNull(); final List<AccessBypassRequest> bypasses1 = ImmutableList.of( new AccessBypassRequest().moduleName(AccessModule.DATA_USE_AGREEMENT).isBypassed(true), new AccessBypassRequest().moduleName(AccessModule.COMPLIANCE_TRAINING).isBypassed(true), new AccessBypassRequest().moduleName(AccessModule.BETA_ACCESS).isBypassed(false)); final AccountPropertyUpdate request1 = new AccountPropertyUpdate().username(PRIMARY_EMAIL).accessBypassRequests(bypasses1); final Profile retrieved1 = profileService.updateAccountProperties(request1); assertThat(retrieved1.getDataUseAgreementBypassTime()).isNotNull(); assertThat(retrieved1.getComplianceTrainingBypassTime()).isNotNull(); assertThat(retrieved1.getBetaAccessBypassTime()).isNull(); assertThat(retrieved1.getEraCommonsBypassTime()).isNull(); assertThat(retrieved1.getTwoFactorAuthBypassTime()).isNull(); final List<AccessBypassRequest> bypasses2 = ImmutableList.of( new AccessBypassRequest().moduleName(AccessModule.DATA_USE_AGREEMENT).isBypassed(false), new AccessBypassRequest() .moduleName(AccessModule.COMPLIANCE_TRAINING) .isBypassed(false), new AccessBypassRequest().moduleName(AccessModule.ERA_COMMONS).isBypassed(true), new AccessBypassRequest().moduleName(AccessModule.TWO_FACTOR_AUTH).isBypassed(true)); final AccountPropertyUpdate request2 = request1.accessBypassRequests(bypasses2); final Profile retrieved2 = profileService.updateAccountProperties(request2); assertThat(retrieved2.getDataUseAgreementBypassTime()).isNull(); assertThat(retrieved2.getComplianceTrainingBypassTime()).isNull(); assertThat(retrieved2.getBetaAccessBypassTime()).isNull(); assertThat(retrieved2.getEraCommonsBypassTime()).isNotNull(); assertThat(retrieved2.getTwoFactorAuthBypassTime()).isNotNull(); verify(mockProfileAuditor).fireUpdateAction(original, retrieved1); verify(mockProfileAuditor).fireUpdateAction(retrieved1, retrieved2); verify(mockUserServiceAuditor, times(2)) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.DATA_USE_AGREEMENT_BYPASS_TIME), any(), any()); verify(mockUserServiceAuditor, times(2)) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.COMPLIANCE_TRAINING_BYPASS_TIME), any(), any()); verify(mockUserServiceAuditor) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.BETA_ACCESS_BYPASS_TIME), any(), any()); verify(mockUserServiceAuditor) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.ERA_COMMONS_BYPASS_TIME), any(), any()); verify(mockUserServiceAuditor) .fireAdministrativeBypassTime( eq(dbUser.getUserId()), eq(BypassTimeTargetProperty.TWO_FACTOR_AUTH_BYPASS_TIME), any(), any()); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void test_updateAccountProperties_free_tier_quota() { createAccountAndDbUserWithAffiliation(); final Double originalQuota = dbUser.getFreeTierCreditsLimitDollarsOverride(); final Double newQuota = 123.4; final AccountPropertyUpdate request = new AccountPropertyUpdate().username(PRIMARY_EMAIL).freeCreditsLimit(newQuota); final Profile retrieved = profileService.updateAccountProperties(request); assertThat(retrieved.getFreeTierDollarQuota()).isWithin(0.01).of(newQuota); verify(mockUserServiceAuditor) .fireSetFreeTierDollarLimitOverride(dbUser.getUserId(), originalQuota, newQuota); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void test_updateAccountProperties_free_tier_quota_no_change() { final Profile original = createAccountAndDbUserWithAffiliation(); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .freeCreditsLimit(original.getFreeTierDollarQuota()); profileService.updateAccountProperties(request); verify(mockUserServiceAuditor, never()) .fireSetFreeTierDollarLimitOverride(anyLong(), anyDouble(), anyDouble()); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void test_updateAccountProperties_free_tier_quota_no_override() { config.billing.defaultFreeCreditsDollarLimit = 123.45; final Profile original = createAccountAndDbUserWithAffiliation(); assertThat(original.getFreeTierDollarQuota()).isWithin(0.01).of(123.45); config.billing.defaultFreeCreditsDollarLimit = 234.56; assertThat(profileService.getProfile(dbUser).getFreeTierDollarQuota()) .isWithin(0.01) .of(234.56); final AccountPropertyUpdate request = new AccountPropertyUpdate() .username(PRIMARY_EMAIL) .freeCreditsLimit(config.billing.defaultFreeCreditsDollarLimit); profileService.updateAccountProperties(request); verify(mockUserServiceAuditor, never()) .fireSetFreeTierDollarLimitOverride(anyLong(), anyDouble(), anyDouble()); config.billing.defaultFreeCreditsDollarLimit = 345.67; assertThat(profileService.getProfile(dbUser).getFreeTierDollarQuota()) .isWithin(0.01) .of(345.67); } | @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } | ProfileController implements ProfileApiDelegate { @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) public ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request) { return ResponseEntity.ok(profileService.updateAccountProperties(request)); } @Autowired ProfileController(
ActionAuditQueryService actionAuditQueryService,
CaptchaVerificationService captchaVerificationService,
Clock clock,
CloudStorageService cloudStorageService,
DemographicSurveyMapper demographicSurveyMapper,
DirectoryService directoryService,
FireCloudService fireCloudService,
InstitutionService institutionService,
PageVisitMapper pageVisitMapper,
ProfileAuditor profileAuditor,
ProfileService profileService,
Provider<DbUser> userProvider,
Provider<MailService> mailServiceProvider,
Provider<UserAuthentication> userAuthenticationProvider,
Provider<WorkbenchConfig> workbenchConfigProvider,
ShibbolethService shibbolethService,
UserDao userDao,
UserService userService,
VerifiedInstitutionalAffiliationMapper verifiedInstitutionalAffiliationMapper); @Override ResponseEntity<Profile> getMe(); @Override ResponseEntity<UsernameTakenResponse> isUsernameTaken(String username); @Override ResponseEntity<Profile> createAccount(CreateAccountRequest request); @Override ResponseEntity<Profile> requestBetaAccess(); @Override ResponseEntity<Profile> submitDataUseAgreement(
Integer dataUseAgreementSignedVersion, String initials); @Override ResponseEntity<Profile> syncComplianceTrainingStatus(); @Override ResponseEntity<Profile> syncEraCommonsStatus(); @Override ResponseEntity<Profile> syncTwoFactorAuthStatus(); @Override ResponseEntity<Void> invitationKeyVerification(
InvitationVerificationRequest invitationVerificationRequest); @Override ResponseEntity<Void> updateContactEmail(
UpdateContactEmailRequest updateContactEmailRequest); @Override ResponseEntity<Void> resendWelcomeEmail(ResendWelcomeEmailRequest resendRequest); @Override ResponseEntity<Profile> updatePageVisits(PageVisit newPageVisit); @Override ResponseEntity<Void> updateProfile(Profile updatedProfile); @AuthorityRequired(Authority.ACCESS_CONTROL_ADMIN) @Override @Deprecated // use updateAccountProperties() ResponseEntity<EmptyResponse> updateVerifiedInstitutionalAffiliation(
Long userId, VerifiedInstitutionalAffiliation verifiedAffiliation); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<UserListResponse> getAllUsers(); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUser(Long userId); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> getUserByUsername(String username); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<EmptyResponse> bypassAccessRequirement(
Long userId, AccessBypassRequest request); @Override ResponseEntity<EmptyResponse> unsafeSelfBypassAccessRequirement(
AccessBypassRequest request); @Override @AuthorityRequired({Authority.ACCESS_CONTROL_ADMIN}) ResponseEntity<Profile> updateAccountProperties(AccountPropertyUpdate request); @Override ResponseEntity<Profile> updateNihToken(NihToken token); @Override ResponseEntity<Void> deleteProfile(); @Override ResponseEntity<UserAuditLogQueryResponse> getAuditLogEntries(
String usernameWithoutGsuiteDomain,
Integer limit,
Long afterMillis,
Long beforeMillisNullable); } |
@Test public void testLogsApiKeyFailure() { assertThrows( UnauthorizedException.class, () -> sumoLogicController.logEgressEvent("bad-key", request)); verify(mockEgressEventAuditor).fireBadApiKey("bad-key", request); } | @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request); } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request); static final String SUMOLOGIC_KEY_FILENAME; } |
@Test public void testLogsRequestParsingFailure() { request.setEventsJsonArray("bad-json"); assertThrows( BadRequestException.class, () -> sumoLogicController.logEgressEvent(API_KEY, request)); verify(mockEgressEventAuditor).fireFailedToParseEgressEventRequest(request); } | @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request); } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request); static final String SUMOLOGIC_KEY_FILENAME; } |
@Test public void fillBuffer_failedCreateRequest() { long expectedCount = billingProjectBufferEntryDao.count() + 1; doThrow(RuntimeException.class) .when(mockFireCloudService) .createAllOfUsBillingProject(anyString()); try { billingProjectBufferService.bufferBillingProjects(); } catch (Exception e) { } assertThat(billingProjectBufferEntryDao.count()).isEqualTo(expectedCount); } | 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 testLogsSingleEvent() { sumoLogicController.logEgressEvent(API_KEY, request); verify(mockEgressEventService).handleEvent(event); } | @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request); } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request); static final String SUMOLOGIC_KEY_FILENAME; } |
@Test public void testLogsMultipleEvents() throws JsonProcessingException { EgressEvent event2 = new EgressEvent(); request.setEventsJsonArray(objectMapper.writeValueAsString(Arrays.asList(event, event2))); sumoLogicController.logEgressEvent(API_KEY, request); verify(mockEgressEventService, times(2)).handleEvent(any()); } | @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request); } | SumoLogicController implements SumoLogicApiDelegate { @Override public ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request) { authorizeRequest(X_API_KEY, request); try { ObjectMapper mapper = new ObjectMapper(); EgressEvent[] events = mapper.readValue(request.getEventsJsonArray(), EgressEvent[].class); Arrays.stream(events).forEach(egressEventService::handleEvent); return ResponseEntity.noContent().build(); } catch (IOException e) { log.severe( String.format( "Failed to parse SumoLogic egress event JSON: %s", request.getEventsJsonArray())); log.severe(e.getMessage()); this.egressEventAuditor.fireFailedToParseEgressEventRequest(request); throw new BadRequestException("Error parsing event details"); } } @Autowired SumoLogicController(
CloudStorageService cloudStorageService,
EgressEventAuditor egressEventAuditor,
EgressEventService egressEventService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> logEgressEvent(String X_API_KEY, EgressEventRequest request); static final String SUMOLOGIC_KEY_FILENAME; } |
@Test public void testGetCohortsInWorkspace() throws Exception { Cohort c1 = createDefaultCohort(); c1.setName("c1"); c1 = cohortsController.createCohort(workspace.getNamespace(), workspace.getId(), c1).getBody(); Cohort c2 = createDefaultCohort(); c2.setName("c2"); c2 = cohortsController.createCohort(workspace.getNamespace(), workspace.getId(), c2).getBody(); List<Cohort> cohorts = cohortsController .getCohortsInWorkspace(workspace.getNamespace(), workspace.getId()) .getBody() .getItems(); assertThat(cohorts).containsAllOf(c1, c2); assertThat(cohorts.size()).isEqualTo(2); } | @Override public ResponseEntity<CohortListResponse> getCohortsInWorkspace( String workspaceNamespace, String workspaceId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DbWorkspace workspace = workspaceService.getRequiredWithCohorts(workspaceNamespace, workspaceId); CohortListResponse response = new CohortListResponse(); Set<DbCohort> cohorts = workspace.getCohorts(); if (cohorts != null) { response.setItems( cohorts.stream() .map(cohortMapper::dbModelToClient) .sorted(Comparator.comparing(c -> c.getName())) .collect(Collectors.toList())); } return ResponseEntity.ok(response); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<CohortListResponse> getCohortsInWorkspace( String workspaceNamespace, String workspaceId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DbWorkspace workspace = workspaceService.getRequiredWithCohorts(workspaceNamespace, workspaceId); CohortListResponse response = new CohortListResponse(); Set<DbCohort> cohorts = workspace.getCohorts(); if (cohorts != null) { response.setItems( cohorts.stream() .map(cohortMapper::dbModelToClient) .sorted(Comparator.comparing(c -> c.getName())) .collect(Collectors.toList())); } return ResponseEntity.ok(response); } } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<CohortListResponse> getCohortsInWorkspace( String workspaceNamespace, String workspaceId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DbWorkspace workspace = workspaceService.getRequiredWithCohorts(workspaceNamespace, workspaceId); CohortListResponse response = new CohortListResponse(); Set<DbCohort> cohorts = workspace.getCohorts(); if (cohorts != null) { response.setItems( cohorts.stream() .map(cohortMapper::dbModelToClient) .sorted(Comparator.comparing(c -> c.getName())) .collect(Collectors.toList())); } return ResponseEntity.ok(response); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<CohortListResponse> getCohortsInWorkspace( String workspaceNamespace, String workspaceId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DbWorkspace workspace = workspaceService.getRequiredWithCohorts(workspaceNamespace, workspaceId); CohortListResponse response = new CohortListResponse(); Set<DbCohort> cohorts = workspace.getCohorts(); if (cohorts != null) { response.setItems( cohorts.stream() .map(cohortMapper::dbModelToClient) .sorted(Comparator.comparing(c -> c.getName())) .collect(Collectors.toList())); } return ResponseEntity.ok(response); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<CohortListResponse> getCohortsInWorkspace( String workspaceNamespace, String workspaceId) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DbWorkspace workspace = workspaceService.getRequiredWithCohorts(workspaceNamespace, workspaceId); CohortListResponse response = new CohortListResponse(); Set<DbCohort> cohorts = workspace.getCohorts(); if (cohorts != null) { response.setItems( cohorts.stream() .map(cohortMapper::dbModelToClient) .sorted(Comparator.comparing(c -> c.getName())) .collect(Collectors.toList())); } return ResponseEntity.ok(response); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } |
@Test(expected = ServerErrorException.class) public void testCreateCohortBadCriteria() { Cohort cohort = createDefaultCohort(); cohort.setCriteria(badCohortCriteria); cohortsController.createCohort(workspace.getNamespace(), workspace.getId(), cohort).getBody(); } | @Override public ResponseEntity<Cohort> createCohort( String workspaceNamespace, String workspaceId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); try { new Gson().fromJson(cohort.getCriteria(), SearchRequest.class); } catch (JsonSyntaxException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), cohort.getName()), e); } checkForDuplicateCohortNameException(cohort.getName(), workspace); DbCohort newCohort = cohortFactory.createCohort(cohort, userProvider.get(), workspace.getWorkspaceId()); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (DataIntegrityViolationException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> createCohort( String workspaceNamespace, String workspaceId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); try { new Gson().fromJson(cohort.getCriteria(), SearchRequest.class); } catch (JsonSyntaxException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), cohort.getName()), e); } checkForDuplicateCohortNameException(cohort.getName(), workspace); DbCohort newCohort = cohortFactory.createCohort(cohort, userProvider.get(), workspace.getWorkspaceId()); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (DataIntegrityViolationException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> createCohort( String workspaceNamespace, String workspaceId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); try { new Gson().fromJson(cohort.getCriteria(), SearchRequest.class); } catch (JsonSyntaxException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), cohort.getName()), e); } checkForDuplicateCohortNameException(cohort.getName(), workspace); DbCohort newCohort = cohortFactory.createCohort(cohort, userProvider.get(), workspace.getWorkspaceId()); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (DataIntegrityViolationException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> createCohort( String workspaceNamespace, String workspaceId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); try { new Gson().fromJson(cohort.getCriteria(), SearchRequest.class); } catch (JsonSyntaxException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), cohort.getName()), e); } checkForDuplicateCohortNameException(cohort.getName(), workspace); DbCohort newCohort = cohortFactory.createCohort(cohort, userProvider.get(), workspace.getWorkspaceId()); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (DataIntegrityViolationException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> createCohort( String workspaceNamespace, String workspaceId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); try { new Gson().fromJson(cohort.getCriteria(), SearchRequest.class); } catch (JsonSyntaxException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), cohort.getName()), e); } checkForDuplicateCohortNameException(cohort.getName(), workspace); DbCohort newCohort = cohortFactory.createCohort(cohort, userProvider.get(), workspace.getWorkspaceId()); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (DataIntegrityViolationException e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } |
@Test public void testUpdateCohort() throws Exception { Cohort cohort = createDefaultCohort(); cohort = cohortsController .createCohort(workspace.getNamespace(), workspace.getId(), cohort) .getBody(); cohort.setName("updated-name"); Cohort updated = cohortsController .updateCohort(workspace.getNamespace(), workspace.getId(), cohort.getId(), cohort) .getBody(); cohort.setEtag(updated.getEtag()); assertThat(updated).isEqualTo(cohort); cohort.setName("updated-name2"); updated = cohortsController .updateCohort(workspace.getNamespace(), workspace.getId(), cohort.getId(), cohort) .getBody(); cohort.setEtag(updated.getEtag()); assertThat(updated).isEqualTo(cohort); Cohort got = cohortsController .getCohort(workspace.getNamespace(), workspace.getId(), cohort.getId()) .getBody(); assertThat(got).isEqualTo(cohort); } | @Override public ResponseEntity<Cohort> updateCohort( String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbCohort dbCohort = getDbCohort(workspaceNamespace, workspaceId, cohortId); if (Strings.isNullOrEmpty(cohort.getEtag())) { throw new BadRequestException("missing required update field 'etag'"); } int version = Etags.toVersion(cohort.getEtag()); if (dbCohort.getVersion() != version) { throw new ConflictException("Attempted to modify outdated cohort version"); } if (cohort.getType() != null) { dbCohort.setType(cohort.getType()); } if (cohort.getName() != null) { dbCohort.setName(cohort.getName()); } if (cohort.getDescription() != null) { dbCohort.setDescription(cohort.getDescription()); } if (cohort.getCriteria() != null) { dbCohort.setCriteria(cohort.getCriteria()); } Timestamp now = new Timestamp(clock.instant().toEpochMilli()); dbCohort.setLastModifiedTime(now); try { dbCohort = cohortDao.save(dbCohort); } catch (OptimisticLockException e) { log.log(Level.WARNING, "version conflict for cohort update", e); throw new ConflictException("Failed due to concurrent cohort modification"); } return ResponseEntity.ok(cohortMapper.dbModelToClient(dbCohort)); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> updateCohort( String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbCohort dbCohort = getDbCohort(workspaceNamespace, workspaceId, cohortId); if (Strings.isNullOrEmpty(cohort.getEtag())) { throw new BadRequestException("missing required update field 'etag'"); } int version = Etags.toVersion(cohort.getEtag()); if (dbCohort.getVersion() != version) { throw new ConflictException("Attempted to modify outdated cohort version"); } if (cohort.getType() != null) { dbCohort.setType(cohort.getType()); } if (cohort.getName() != null) { dbCohort.setName(cohort.getName()); } if (cohort.getDescription() != null) { dbCohort.setDescription(cohort.getDescription()); } if (cohort.getCriteria() != null) { dbCohort.setCriteria(cohort.getCriteria()); } Timestamp now = new Timestamp(clock.instant().toEpochMilli()); dbCohort.setLastModifiedTime(now); try { dbCohort = cohortDao.save(dbCohort); } catch (OptimisticLockException e) { log.log(Level.WARNING, "version conflict for cohort update", e); throw new ConflictException("Failed due to concurrent cohort modification"); } return ResponseEntity.ok(cohortMapper.dbModelToClient(dbCohort)); } } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> updateCohort( String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbCohort dbCohort = getDbCohort(workspaceNamespace, workspaceId, cohortId); if (Strings.isNullOrEmpty(cohort.getEtag())) { throw new BadRequestException("missing required update field 'etag'"); } int version = Etags.toVersion(cohort.getEtag()); if (dbCohort.getVersion() != version) { throw new ConflictException("Attempted to modify outdated cohort version"); } if (cohort.getType() != null) { dbCohort.setType(cohort.getType()); } if (cohort.getName() != null) { dbCohort.setName(cohort.getName()); } if (cohort.getDescription() != null) { dbCohort.setDescription(cohort.getDescription()); } if (cohort.getCriteria() != null) { dbCohort.setCriteria(cohort.getCriteria()); } Timestamp now = new Timestamp(clock.instant().toEpochMilli()); dbCohort.setLastModifiedTime(now); try { dbCohort = cohortDao.save(dbCohort); } catch (OptimisticLockException e) { log.log(Level.WARNING, "version conflict for cohort update", e); throw new ConflictException("Failed due to concurrent cohort modification"); } return ResponseEntity.ok(cohortMapper.dbModelToClient(dbCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> updateCohort( String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbCohort dbCohort = getDbCohort(workspaceNamespace, workspaceId, cohortId); if (Strings.isNullOrEmpty(cohort.getEtag())) { throw new BadRequestException("missing required update field 'etag'"); } int version = Etags.toVersion(cohort.getEtag()); if (dbCohort.getVersion() != version) { throw new ConflictException("Attempted to modify outdated cohort version"); } if (cohort.getType() != null) { dbCohort.setType(cohort.getType()); } if (cohort.getName() != null) { dbCohort.setName(cohort.getName()); } if (cohort.getDescription() != null) { dbCohort.setDescription(cohort.getDescription()); } if (cohort.getCriteria() != null) { dbCohort.setCriteria(cohort.getCriteria()); } Timestamp now = new Timestamp(clock.instant().toEpochMilli()); dbCohort.setLastModifiedTime(now); try { dbCohort = cohortDao.save(dbCohort); } catch (OptimisticLockException e) { log.log(Level.WARNING, "version conflict for cohort update", e); throw new ConflictException("Failed due to concurrent cohort modification"); } return ResponseEntity.ok(cohortMapper.dbModelToClient(dbCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> updateCohort( String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbCohort dbCohort = getDbCohort(workspaceNamespace, workspaceId, cohortId); if (Strings.isNullOrEmpty(cohort.getEtag())) { throw new BadRequestException("missing required update field 'etag'"); } int version = Etags.toVersion(cohort.getEtag()); if (dbCohort.getVersion() != version) { throw new ConflictException("Attempted to modify outdated cohort version"); } if (cohort.getType() != null) { dbCohort.setType(cohort.getType()); } if (cohort.getName() != null) { dbCohort.setName(cohort.getName()); } if (cohort.getDescription() != null) { dbCohort.setDescription(cohort.getDescription()); } if (cohort.getCriteria() != null) { dbCohort.setCriteria(cohort.getCriteria()); } Timestamp now = new Timestamp(clock.instant().toEpochMilli()); dbCohort.setLastModifiedTime(now); try { dbCohort = cohortDao.save(dbCohort); } catch (OptimisticLockException e) { log.log(Level.WARNING, "version conflict for cohort update", e); throw new ConflictException("Failed due to concurrent cohort modification"); } return ResponseEntity.ok(cohortMapper.dbModelToClient(dbCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } |
@Test public void testDuplicateCohort() { Cohort originalCohort = createDefaultCohort(); originalCohort = cohortsController .createCohort(workspace.getNamespace(), workspace.getId(), originalCohort) .getBody(); DuplicateCohortRequest params = new DuplicateCohortRequest(); params.setNewName("New Cohort Name"); params.setOriginalCohortId(originalCohort.getId()); Cohort newCohort = cohortsController .duplicateCohort(workspace.getNamespace(), workspace.getId(), params) .getBody(); newCohort = cohortsController .getCohort(workspace.getNamespace(), workspace.getId(), newCohort.getId()) .getBody(); assertThat(newCohort.getName()).isEqualTo(params.getNewName()); assertThat(newCohort.getCriteria()).isEqualTo(originalCohort.getCriteria()); assertThat(newCohort.getType()).isEqualTo(originalCohort.getType()); assertThat(newCohort.getDescription()).isEqualTo(originalCohort.getDescription()); } | @Override public ResponseEntity<Cohort> duplicateCohort( String workspaceNamespace, String workspaceId, DuplicateCohortRequest params) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); checkForDuplicateCohortNameException(params.getNewName(), workspace); DbCohort originalCohort = getDbCohort(workspaceNamespace, workspaceId, params.getOriginalCohortId()); DbCohort newCohort = cohortFactory.duplicateCohort( params.getNewName(), userProvider.get(), workspace, originalCohort); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (Exception e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> duplicateCohort( String workspaceNamespace, String workspaceId, DuplicateCohortRequest params) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); checkForDuplicateCohortNameException(params.getNewName(), workspace); DbCohort originalCohort = getDbCohort(workspaceNamespace, workspaceId, params.getOriginalCohortId()); DbCohort newCohort = cohortFactory.duplicateCohort( params.getNewName(), userProvider.get(), workspace, originalCohort); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (Exception e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> duplicateCohort( String workspaceNamespace, String workspaceId, DuplicateCohortRequest params) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); checkForDuplicateCohortNameException(params.getNewName(), workspace); DbCohort originalCohort = getDbCohort(workspaceNamespace, workspaceId, params.getOriginalCohortId()); DbCohort newCohort = cohortFactory.duplicateCohort( params.getNewName(), userProvider.get(), workspace, originalCohort); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (Exception e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> duplicateCohort( String workspaceNamespace, String workspaceId, DuplicateCohortRequest params) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); checkForDuplicateCohortNameException(params.getNewName(), workspace); DbCohort originalCohort = getDbCohort(workspaceNamespace, workspaceId, params.getOriginalCohortId()); DbCohort newCohort = cohortFactory.duplicateCohort( params.getNewName(), userProvider.get(), workspace, originalCohort); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (Exception e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } | CohortsController implements CohortsApiDelegate { @Override public ResponseEntity<Cohort> duplicateCohort( String workspaceNamespace, String workspaceId, DuplicateCohortRequest params) { workspaceService.enforceWorkspaceAccessLevelAndRegisteredAuthDomain( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); DbWorkspace workspace = workspaceService.getRequired(workspaceNamespace, workspaceId); checkForDuplicateCohortNameException(params.getNewName(), workspace); DbCohort originalCohort = getDbCohort(workspaceNamespace, workspaceId, params.getOriginalCohortId()); DbCohort newCohort = cohortFactory.duplicateCohort( params.getNewName(), userProvider.get(), workspace, originalCohort); try { newCohort = cohortDao.save(newCohort); userRecentResourceService.updateCohortEntry( workspace.getWorkspaceId(), userProvider.get().getUserId(), newCohort.getCohortId()); } catch (Exception e) { throw new ServerErrorException( String.format( "Could not save Cohort (\"/%s/%s/%s\")", workspace.getWorkspaceNamespace(), workspace.getWorkspaceId(), newCohort.getName()), e); } return ResponseEntity.ok(cohortMapper.dbModelToClient(newCohort)); } @Autowired CohortsController(
WorkspaceService workspaceService,
CohortDao cohortDao,
CdrVersionDao cdrVersionDao,
CohortFactory cohortFactory,
CohortMapper cohortMapper,
CohortReviewDao cohortReviewDao,
ConceptSetDao conceptSetDao,
CohortMaterializationService cohortMaterializationService,
Provider<DbUser> userProvider,
Clock clock,
CdrVersionService cdrVersionService,
UserRecentResourceService userRecentResourceService); @Override ResponseEntity<Cohort> createCohort(
String workspaceNamespace, String workspaceId, Cohort cohort); @Override ResponseEntity<Cohort> duplicateCohort(
String workspaceNamespace, String workspaceId, DuplicateCohortRequest params); @Override ResponseEntity<EmptyResponse> deleteCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<Cohort> getCohort(
String workspaceNamespace, String workspaceId, Long cohortId); @Override ResponseEntity<CohortListResponse> getCohortsInWorkspace(
String workspaceNamespace, String workspaceId); @Override ResponseEntity<Cohort> updateCohort(
String workspaceNamespace, String workspaceId, Long cohortId, Cohort cohort); @Override ResponseEntity<MaterializeCohortResponse> materializeCohort(
String workspaceNamespace, String workspaceId, MaterializeCohortRequest request); @Override ResponseEntity<CdrQuery> getDataTableQuery(
String workspaceNamespace, String workspaceId, DataTableSpecification request); @Override ResponseEntity<CohortAnnotationsResponse> getCohortAnnotations(
String workspaceNamespace, String workspaceId, CohortAnnotationsRequest request); } |
@Test public void testAddFieldValuesFromBigQueryToPreviewListWorksWithNullValues() { DataSetPreviewValueList dataSetPreviewValueList = new DataSetPreviewValueList(); List<DataSetPreviewValueList> valuePreviewList = ImmutableList.of(dataSetPreviewValueList); List<FieldValue> fieldValueListRows = ImmutableList.of(FieldValue.of(FieldValue.Attribute.PRIMITIVE, null)); FieldValueList fieldValueList = FieldValueList.of(fieldValueListRows); dataSetController.addFieldValuesFromBigQueryToPreviewList(valuePreviewList, fieldValueList); assertThat(valuePreviewList.get(0).getQueryValue().get(0)) .isEqualTo(DataSetController.EMPTY_CELL_MARKER); } | @VisibleForTesting public void addFieldValuesFromBigQueryToPreviewList( List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList) { IntStream.range(0, fieldValueList.size()) .forEach( columnNumber -> valuePreviewList .get(columnNumber) .addQueryValueItem( Optional.ofNullable(fieldValueList.get(columnNumber).getValue()) .map(Object::toString) .orElse(EMPTY_CELL_MARKER))); } | DataSetController implements DataSetApiDelegate { @VisibleForTesting public void addFieldValuesFromBigQueryToPreviewList( List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList) { IntStream.range(0, fieldValueList.size()) .forEach( columnNumber -> valuePreviewList .get(columnNumber) .addQueryValueItem( Optional.ofNullable(fieldValueList.get(columnNumber).getValue()) .map(Object::toString) .orElse(EMPTY_CELL_MARKER))); } } | DataSetController implements DataSetApiDelegate { @VisibleForTesting public void addFieldValuesFromBigQueryToPreviewList( List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList) { IntStream.range(0, fieldValueList.size()) .forEach( columnNumber -> valuePreviewList .get(columnNumber) .addQueryValueItem( Optional.ofNullable(fieldValueList.get(columnNumber).getValue()) .map(Object::toString) .orElse(EMPTY_CELL_MARKER))); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); } | DataSetController implements DataSetApiDelegate { @VisibleForTesting public void addFieldValuesFromBigQueryToPreviewList( List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList) { IntStream.range(0, fieldValueList.size()) .forEach( columnNumber -> valuePreviewList .get(columnNumber) .addQueryValueItem( Optional.ofNullable(fieldValueList.get(columnNumber).getValue()) .map(Object::toString) .orElse(EMPTY_CELL_MARKER))); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); } | DataSetController implements DataSetApiDelegate { @VisibleForTesting public void addFieldValuesFromBigQueryToPreviewList( List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList) { IntStream.range(0, fieldValueList.size()) .forEach( columnNumber -> valuePreviewList .get(columnNumber) .addQueryValueItem( Optional.ofNullable(fieldValueList.get(columnNumber).getValue()) .map(Object::toString) .orElse(EMPTY_CELL_MARKER))); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } |
@Test(expected = BadRequestException.class) public void testGetQueryFailsWithNoCohort() { DataSetRequest dataSet = buildEmptyDataSetRequest(); dataSet = dataSet .addConceptSetIdsItem(CONCEPT_SET_ONE_ID) .domainValuePairs(ImmutableList.of(new DomainValuePair().domain(Domain.CONDITION))); dataSetController.generateCode( workspace.getNamespace(), WORKSPACE_NAME, KernelTypeEnum.PYTHON.toString(), dataSet); } | public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } |
@Test(expected = BadRequestException.class) public void testGetQueryFailsWithNoConceptSet() { DataSetRequest dataSet = buildEmptyDataSetRequest(); dataSet = dataSet .addCohortIdsItem(COHORT_ONE_ID) .domainValuePairs(ImmutableList.of(new DomainValuePair().domain(Domain.CONDITION))); dataSetController.generateCode( workspace.getNamespace(), WORKSPACE_NAME, KernelTypeEnum.PYTHON.toString(), dataSet); } | public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } |
@Test public void testGetQueryDropsQueriesWithNoValue() { final DataSetRequest dataSet = buildEmptyDataSetRequest() .dataSetId(1l) .addCohortIdsItem(COHORT_ONE_ID) .addConceptSetIdsItem(CONCEPT_SET_ONE_ID); expectedException.expect(BadRequestException.class); DataSetCodeResponse response = dataSetController .generateCode( workspace.getNamespace(), WORKSPACE_NAME, KernelTypeEnum.PYTHON.toString(), dataSet) .getBody(); } | public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); } | DataSetController implements DataSetApiDelegate { public ResponseEntity<DataSetCodeResponse> generateCode( String workspaceNamespace, String workspaceId, String kernelTypeEnumString, DataSetRequest dataSetRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); final KernelTypeEnum kernelTypeEnum = KernelTypeEnum.fromValue(kernelTypeEnumString); if (dataSetRequest.getWorkspaceId() == null) { dataSetRequest.setWorkspaceId(dbWorkspace.getWorkspaceId()); } final Map<String, QueryJobConfiguration> bigQueryJobConfigsByDomain = dataSetService.domainToBigQueryConfig(dataSetRequest); if (bigQueryJobConfigsByDomain.isEmpty()) { log.warning("Empty query map generated for this DataSetRequest"); } String qualifier = generateRandomEightCharacterQualifier(); final ImmutableList<String> codeCells = ImmutableList.copyOf( dataSetService.generateCodeCells( kernelTypeEnum, dataSetRequest.getName(), qualifier, bigQueryJobConfigsByDomain)); final String generatedCode = String.join("\n\n", codeCells); return ResponseEntity.ok( new DataSetCodeResponse().code(generatedCode).kernelType(kernelTypeEnum)); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } |
@Test public void fillBuffer_prefixName() { workbenchConfig.billing.projectNamePrefix = "test-prefix-"; billingProjectBufferService.bufferBillingProjects(); ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class); verify(mockFireCloudService).createAllOfUsBillingProject(captor.capture()); String billingProjectName = captor.getValue(); assertThat(billingProjectName).doesNotContain("--"); } | 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 createDataSetMissingArguments() { DataSetRequest dataSet = buildEmptyDataSetRequest().name(null); List<Long> cohortIds = new ArrayList<>(); cohortIds.add(1L); List<Long> conceptIds = new ArrayList<>(); conceptIds.add(1L); List<DomainValuePair> valuePairList = new ArrayList<>(); DomainValuePair domainValue = new DomainValuePair(); domainValue.setDomain(Domain.DRUG); domainValue.setValue("DRUGS_VALUE"); valuePairList.add(domainValue); dataSet.setDomainValuePairs(valuePairList); dataSet.setConceptSetIds(conceptIds); dataSet.setCohortIds(cohortIds); expectedException.expect(BadRequestException.class); expectedException.expectMessage("Missing name"); dataSetController.createDataSet(workspace.getNamespace(), WORKSPACE_NAME, dataSet); dataSet.setName("dataSet"); dataSet.setCohortIds(null); expectedException.expect(BadRequestException.class); expectedException.expectMessage("Missing cohort ids"); dataSetController.createDataSet(workspace.getNamespace(), WORKSPACE_NAME, dataSet); dataSet.setCohortIds(cohortIds); dataSet.setConceptSetIds(null); expectedException.expect(BadRequestException.class); expectedException.expectMessage("Missing concept set ids"); dataSetController.createDataSet(workspace.getNamespace(), WORKSPACE_NAME, dataSet); dataSet.setConceptSetIds(conceptIds); dataSet.setDomainValuePairs(null); expectedException.expect(BadRequestException.class); expectedException.expectMessage("Missing values"); dataSetController.createDataSet(workspace.getNamespace(), WORKSPACE_NAME, dataSet); } | @Override public ResponseEntity<DataSet> createDataSet( String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest) { validateDataSetCreateRequest(dataSetRequest); final long workspaceId = workspaceService .getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceFirecloudName, WorkspaceAccessLevel.WRITER) .getWorkspaceId(); dataSetRequest.setWorkspaceId(workspaceId); return ResponseEntity.ok( dataSetService.saveDataSet(dataSetRequest, userProvider.get().getUserId())); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DataSet> createDataSet( String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest) { validateDataSetCreateRequest(dataSetRequest); final long workspaceId = workspaceService .getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceFirecloudName, WorkspaceAccessLevel.WRITER) .getWorkspaceId(); dataSetRequest.setWorkspaceId(workspaceId); return ResponseEntity.ok( dataSetService.saveDataSet(dataSetRequest, userProvider.get().getUserId())); } } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DataSet> createDataSet( String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest) { validateDataSetCreateRequest(dataSetRequest); final long workspaceId = workspaceService .getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceFirecloudName, WorkspaceAccessLevel.WRITER) .getWorkspaceId(); dataSetRequest.setWorkspaceId(workspaceId); return ResponseEntity.ok( dataSetService.saveDataSet(dataSetRequest, userProvider.get().getUserId())); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DataSet> createDataSet( String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest) { validateDataSetCreateRequest(dataSetRequest); final long workspaceId = workspaceService .getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceFirecloudName, WorkspaceAccessLevel.WRITER) .getWorkspaceId(); dataSetRequest.setWorkspaceId(workspaceId); return ResponseEntity.ok( dataSetService.saveDataSet(dataSetRequest, userProvider.get().getUserId())); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DataSet> createDataSet( String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest) { validateDataSetCreateRequest(dataSetRequest); final long workspaceId = workspaceService .getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceFirecloudName, WorkspaceAccessLevel.WRITER) .getWorkspaceId(); dataSetRequest.setWorkspaceId(workspaceId); return ResponseEntity.ok( dataSetService.saveDataSet(dataSetRequest, userProvider.get().getUserId())); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } |
@Test public void exportToNewNotebook() { DataSetRequest dataSet = buildEmptyDataSetRequest().name("blah"); dataSet = dataSet.addCohortIdsItem(COHORT_ONE_ID); dataSet = dataSet.addConceptSetIdsItem(CONCEPT_SET_ONE_ID); List<DomainValuePair> domainValuePairs = mockDomainValuePair(); dataSet.setDomainValuePairs(domainValuePairs); ArrayList<String> tables = new ArrayList<>(); tables.add("FROM `" + TEST_CDR_TABLE + ".condition_occurrence` c_occurrence"); mockLinkingTableQuery(tables); String notebookName = "Hello World"; DataSetExportRequest request = new DataSetExportRequest() .dataSetRequest(dataSet) .newNotebook(true) .notebookName(notebookName) .kernelType(KernelTypeEnum.PYTHON); dataSetController.exportToNotebook(workspace.getNamespace(), WORKSPACE_NAME, request).getBody(); verify(mockNotebooksService, never()).getNotebookContents(any(), any()); verify(mockNotebooksService, times(1)) .saveNotebook(eq(WORKSPACE_BUCKET_NAME), eq(notebookName), any(JSONObject.class)); } | @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } |
@Test(expected = ForbiddenException.class) public void exportToNotebook_requiresActiveBilling() { DbWorkspace dbWorkspace = workspaceDao.findByWorkspaceNamespaceAndFirecloudNameAndActiveStatus( workspace.getNamespace(), WORKSPACE_NAME, DbStorageEnums.workspaceActiveStatusToStorage(WorkspaceActiveStatus.ACTIVE)); dbWorkspace.setBillingStatus(BillingStatus.INACTIVE); workspaceDao.save(dbWorkspace); DataSetExportRequest request = new DataSetExportRequest(); dataSetController.exportToNotebook(workspace.getNamespace(), WORKSPACE_NAME, request); } | @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } |
@Test public void exportToExistingNotebook() { DataSetRequest dataSet = buildEmptyDataSetRequest(); dataSet = dataSet.addCohortIdsItem(COHORT_ONE_ID); dataSet = dataSet.addConceptSetIdsItem(CONCEPT_SET_ONE_ID); List<DomainValuePair> domainValuePairs = mockDomainValuePair(); dataSet.setDomainValuePairs(domainValuePairs); ArrayList<String> tables = new ArrayList<>(); tables.add("FROM `" + TEST_CDR_TABLE + ".condition_occurrence` c_occurrence"); mockLinkingTableQuery(tables); String notebookName = "Hello World"; when(mockNotebooksService.getNotebookContents(WORKSPACE_BUCKET_NAME, notebookName)) .thenReturn( new JSONObject() .put("cells", new JSONArray()) .put("metadata", new JSONObject()) .put("nbformat", 4) .put("nbformat_minor", 2)); DataSetExportRequest request = new DataSetExportRequest() .dataSetRequest(dataSet) .newNotebook(false) .notebookName(notebookName); dataSetController.exportToNotebook(workspace.getNamespace(), WORKSPACE_NAME, request).getBody(); verify(mockNotebooksService, times(1)).getNotebookContents(WORKSPACE_BUCKET_NAME, notebookName); verify(mockNotebooksService, times(1)) .saveNotebook(eq(WORKSPACE_BUCKET_NAME), eq(notebookName), any(JSONObject.class)); } | @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<EmptyResponse> exportToNotebook( String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest) { DbWorkspace dbWorkspace = workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.WRITER); workspaceService.validateActiveBilling(workspaceNamespace, workspaceId); JSONObject notebookFile = new JSONObject(); FirecloudWorkspaceResponse workspace = fireCloudService.getWorkspace(workspaceNamespace, workspaceId); JSONObject metaData = new JSONObject(); if (!dataSetExportRequest.getNewNotebook()) { notebookFile = notebooksService.getNotebookContents( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName()); try { String language = Optional.of(notebookFile.getJSONObject("metadata")) .flatMap(metaDataObj -> Optional.of(metaDataObj.getJSONObject("kernelspec"))) .map(kernelSpec -> kernelSpec.getString("language")) .orElse("Python"); if ("R".equals(language)) { dataSetExportRequest.setKernelType(KernelTypeEnum.R); } else { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } catch (JSONException e) { dataSetExportRequest.setKernelType(KernelTypeEnum.PYTHON); } } else { switch (dataSetExportRequest.getKernelType()) { case PYTHON: break; case R: metaData .put( "kernelspec", new JSONObject().put("display_name", "R").put("language", "R").put("name", "ir")) .put( "language_info", new JSONObject() .put("codemirror_mode", "r") .put("file_extension", ".r") .put("mimetype", "text/x-r-source") .put("name", "r") .put("pygments_lexer", "r") .put("version", "3.4.4")); break; default: throw new BadRequestException( "Kernel Type " + dataSetExportRequest.getKernelType() + " is not supported"); } } if (dataSetExportRequest.getDataSetRequest().getWorkspaceId() == null) { dataSetExportRequest.getDataSetRequest().setWorkspaceId(dbWorkspace.getWorkspaceId()); } Map<String, QueryJobConfiguration> queriesByDomain = dataSetService.domainToBigQueryConfig(dataSetExportRequest.getDataSetRequest()); String qualifier = generateRandomEightCharacterQualifier(); List<String> queriesAsStrings = dataSetService.generateCodeCells( dataSetExportRequest.getKernelType(), dataSetExportRequest.getDataSetRequest().getName(), qualifier, queriesByDomain); if (dataSetExportRequest.getNewNotebook()) { notebookFile = new JSONObject() .put("cells", new JSONArray()) .put("metadata", metaData) .put("nbformat", 4) .put("nbformat_minor", 2); } for (String query : queriesAsStrings) { notebookFile.getJSONArray("cells").put(createNotebookCodeCellWithString(query)); } notebooksService.saveNotebook( workspace.getWorkspace().getBucketName(), dataSetExportRequest.getNotebookName(), notebookFile); return ResponseEntity.ok(new EmptyResponse()); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } |
@Test public void testGetValuesFromDomain() { when(mockBigQueryService.getTableFieldsFromDomain(Domain.CONDITION)) .thenReturn( FieldList.of( Field.of("FIELD_ONE", LegacySQLTypeName.STRING), Field.of("FIELD_TWO", LegacySQLTypeName.STRING))); List<DomainValue> domainValues = dataSetController .getValuesFromDomain( workspace.getNamespace(), WORKSPACE_NAME, Domain.CONDITION.toString()) .getBody() .getItems(); verify(mockBigQueryService).getTableFieldsFromDomain(Domain.CONDITION); assertThat(domainValues) .containsExactly( new DomainValue().value("field_one"), new DomainValue().value("field_two")); } | @Override public ResponseEntity<DomainValuesResponse> getValuesFromDomain( String workspaceNamespace, String workspaceId, String domainValue) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DomainValuesResponse response = new DomainValuesResponse(); FieldList fieldList = bigQueryService.getTableFieldsFromDomain(Domain.valueOf(domainValue)); response.setItems( fieldList.stream() .map(field -> new DomainValue().value(field.getName().toLowerCase())) .collect(Collectors.toList())); return ResponseEntity.ok(response); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DomainValuesResponse> getValuesFromDomain( String workspaceNamespace, String workspaceId, String domainValue) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DomainValuesResponse response = new DomainValuesResponse(); FieldList fieldList = bigQueryService.getTableFieldsFromDomain(Domain.valueOf(domainValue)); response.setItems( fieldList.stream() .map(field -> new DomainValue().value(field.getName().toLowerCase())) .collect(Collectors.toList())); return ResponseEntity.ok(response); } } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DomainValuesResponse> getValuesFromDomain( String workspaceNamespace, String workspaceId, String domainValue) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DomainValuesResponse response = new DomainValuesResponse(); FieldList fieldList = bigQueryService.getTableFieldsFromDomain(Domain.valueOf(domainValue)); response.setItems( fieldList.stream() .map(field -> new DomainValue().value(field.getName().toLowerCase())) .collect(Collectors.toList())); return ResponseEntity.ok(response); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DomainValuesResponse> getValuesFromDomain( String workspaceNamespace, String workspaceId, String domainValue) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DomainValuesResponse response = new DomainValuesResponse(); FieldList fieldList = bigQueryService.getTableFieldsFromDomain(Domain.valueOf(domainValue)); response.setItems( fieldList.stream() .map(field -> new DomainValue().value(field.getName().toLowerCase())) .collect(Collectors.toList())); return ResponseEntity.ok(response); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); } | DataSetController implements DataSetApiDelegate { @Override public ResponseEntity<DomainValuesResponse> getValuesFromDomain( String workspaceNamespace, String workspaceId, String domainValue) { workspaceService.getWorkspaceEnforceAccessLevelAndSetCdrVersion( workspaceNamespace, workspaceId, WorkspaceAccessLevel.READER); DomainValuesResponse response = new DomainValuesResponse(); FieldList fieldList = bigQueryService.getTableFieldsFromDomain(Domain.valueOf(domainValue)); response.setItems( fieldList.stream() .map(field -> new DomainValue().value(field.getName().toLowerCase())) .collect(Collectors.toList())); return ResponseEntity.ok(response); } @Autowired DataSetController(
BigQueryService bigQueryService,
CdrVersionService cdrVersionService,
DataSetService dataSetService,
FireCloudService fireCloudService,
NotebooksService notebooksService,
Provider<DbUser> userProvider,
@Qualifier(DatasetConfig.DATASET_PREFIX_CODE) Provider<String> prefixProvider,
WorkspaceService workspaceService); @Override ResponseEntity<DataSet> createDataSet(
String workspaceNamespace, String workspaceFirecloudName, DataSetRequest dataSetRequest); @VisibleForTesting String generateRandomEightCharacterQualifier(); ResponseEntity<DataSetCodeResponse> generateCode(
String workspaceNamespace,
String workspaceId,
String kernelTypeEnumString,
DataSetRequest dataSetRequest); @Override ResponseEntity<DataSetPreviewResponse> previewDataSetByDomain(
String workspaceNamespace, String workspaceId, DataSetPreviewRequest dataSetPreviewRequest); @VisibleForTesting void addFieldValuesFromBigQueryToPreviewList(
List<DataSetPreviewValueList> valuePreviewList, FieldValueList fieldValueList); @Override ResponseEntity<EmptyResponse> exportToNotebook(
String workspaceNamespace, String workspaceId, DataSetExportRequest dataSetExportRequest); @Override ResponseEntity<Boolean> markDirty(
String workspaceNamespace, String workspaceId, MarkDataSetRequest markDataSetRequest); @Override ResponseEntity<EmptyResponse> deleteDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSet> updateDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId, DataSetRequest request); @Override ResponseEntity<DataSet> getDataSet(
String workspaceNamespace, String workspaceId, Long dataSetId); @Override ResponseEntity<DataSetListResponse> getDataSetByResourceId(
String workspaceNamespace, String workspaceId, ResourceType resourceType, Long id); @Override ResponseEntity<DataDictionaryEntry> getDataDictionaryEntry(
Long cdrVersionId, String domain, String domainValue); @Override ResponseEntity<DomainValuesResponse> getValuesFromDomain(
String workspaceNamespace, String workspaceId, String domainValue); static final String EMPTY_CELL_MARKER; } |
@Test public void testBulkSyncTrainingStatusV1() throws org.pmiops.workbench.moodle.ApiException, NotFoundException { workbenchConfig.featureFlags.enableMoodleV2Api = false; doAnswer(i -> i.getArgument(0)).when(userService).syncComplianceTrainingStatusV1(any(), any()); offlineUserController.bulkSyncComplianceTrainingStatus(); verify(userService, times(4)).syncComplianceTrainingStatusV1(any(), any()); } | @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } |
@Test public void testBulkSyncTrainingStatusV2() throws org.pmiops.workbench.moodle.ApiException, NotFoundException { workbenchConfig.featureFlags.enableMoodleV2Api = true; doAnswer(i -> i.getArgument(0)).when(userService).syncComplianceTrainingStatusV2(any(), any()); offlineUserController.bulkSyncComplianceTrainingStatus(); verify(userService, times(4)).syncComplianceTrainingStatusV2(any(), any()); } | @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } |
@Test(expected = ServerErrorException.class) public void testBulkSyncTrainingStatusWithSingleUserErrorV1() throws org.pmiops.workbench.moodle.ApiException, NotFoundException { workbenchConfig.featureFlags.enableMoodleV2Api = false; doAnswer(i -> i.getArgument(0)).when(userService).syncComplianceTrainingStatusV1(any(), any()); doThrow(new org.pmiops.workbench.moodle.ApiException("Unknown error")) .when(userService) .syncComplianceTrainingStatusV1( argThat(user -> user.getUsername().equals("[email protected]")), any()); offlineUserController.bulkSyncComplianceTrainingStatus(); verify(userService, times(4)).syncComplianceTrainingStatusV1(any(), any()); } | @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } |
@Test(expected = ServerErrorException.class) public void testBulkSyncTrainingStatusWithSingleUserErrorV2() throws org.pmiops.workbench.moodle.ApiException, NotFoundException { workbenchConfig.featureFlags.enableMoodleV2Api = true; doAnswer(i -> i.getArgument(0)).when(userService).syncComplianceTrainingStatusV2(any(), any()); doThrow(new org.pmiops.workbench.moodle.ApiException("Unknown error")) .when(userService) .syncComplianceTrainingStatusV2( argThat(user -> user.getUsername().equals("[email protected]")), any()); offlineUserController.bulkSyncComplianceTrainingStatus(); verify(userService, times(4)).syncComplianceTrainingStatusV2(any(), any()); } | @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } | OfflineUserController implements OfflineUserApiDelegate { @Override public ResponseEntity<Void> bulkSyncComplianceTrainingStatus() { int errorCount = 0; int userCount = 0; int changeCount = 0; int accessLevelChangeCount = 0; for (DbUser user : userService.getAllUsers()) { userCount++; try { Timestamp oldTime = user.getComplianceTrainingCompletionTime(); DataAccessLevel oldLevel = user.getDataAccessLevelEnum(); DbUser updatedUser; if (workbenchConfigProvider.get().featureFlags.enableMoodleV2Api) { updatedUser = userService.syncComplianceTrainingStatusV2(user, Agent.asSystem()); } else { updatedUser = userService.syncComplianceTrainingStatusV1(user, Agent.asSystem()); } Timestamp newTime = updatedUser.getComplianceTrainingCompletionTime(); DataAccessLevel newLevel = updatedUser.getDataAccessLevelEnum(); if (!Objects.equals(newTime, oldTime)) { log.info( String.format( "Compliance training completion changed for user %s. Old %s, new %s", user.getUsername(), oldTime, newTime)); changeCount++; } if (oldLevel != newLevel) { log.info( String.format( "Data access level changed for user %s. Old %s, new %s", user.getUsername(), oldLevel.toString(), newLevel.toString())); accessLevelChangeCount++; } } catch (org.pmiops.workbench.moodle.ApiException | NotFoundException e) { errorCount++; log.log( Level.SEVERE, String.format( "Error syncing compliance training status for user %s", user.getUsername()), e); } } log.info( String.format( "Checked %d users, updated %d completion times, updated %d access levels", userCount, changeCount, accessLevelChangeCount)); if (errorCount > 0) { throw new ServerErrorException( String.format("%d errors encountered during compliance training sync", errorCount)); } return ResponseEntity.noContent().build(); } @Autowired OfflineUserController(
CloudResourceManagerService cloudResourceManagerService,
UserService userService,
Provider<WorkbenchConfig> workbenchConfigProvider); @Override ResponseEntity<Void> bulkSyncComplianceTrainingStatus(); @Override ResponseEntity<Void> bulkSyncEraCommonsStatus(); @Override ResponseEntity<Void> bulkSyncTwoFactorAuthStatus(); @Override ResponseEntity<Void> bulkAuditProjectAccess(); } |
@Test public void testBulkSyncEraCommonsStatus() throws IOException, org.pmiops.workbench.firecloud.ApiException { doAnswer(i -> i.getArgument(0)) .when(userService) .syncEraCommonsStatusUsingImpersonation(any(), any()); offlineUserController.bulkSyncEraCommonsStatus(); verify(userService, times(3)).syncEraCommonsStatusUsingImpersonation(any(), any()); } | @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 fillBuffer_capacity() { for (int i = 0; i < BUFFER_CAPACITY; i++) { billingProjectBufferService.bufferBillingProjects(); } int expectedCallCount = 0; billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY + expectedCallCount)) .createAllOfUsBillingProject(anyString()); DbBillingProjectBufferEntry entry = billingProjectBufferEntryDao.findAll().iterator().next(); entry.setStatusEnum(BufferEntryStatus.ASSIGNED, this::getCurrentTimestamp); billingProjectBufferEntryDao.save(entry); expectedCallCount++; billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY + expectedCallCount)) .createAllOfUsBillingProject(anyString()); expectedCallCount++; workbenchConfig.billing.bufferCapacity = (int) BUFFER_CAPACITY + 1; billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY + expectedCallCount)) .createAllOfUsBillingProject(anyString()); billingProjectBufferService.bufferBillingProjects(); verify(mockFireCloudService, times((int) BUFFER_CAPACITY + expectedCallCount)) .createAllOfUsBillingProject(anyString()); } | 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(); } |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.