Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Bob/6936 query for admin emails #6962

Merged
merged 10 commits into from
Nov 17, 2023
Merged

Bob/6936 query for admin emails #6962

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
472ee6c
hook up new query wiring
fzhao99 Nov 15, 2023
1a55123
get happy path working
fzhao99 Nov 15, 2023
b5e5c52
add in error handling for not found cases
fzhao99 Nov 15, 2023
0a3e9b6
add tests
fzhao99 Nov 15, 2023
dc71984
lint
fzhao99 Nov 15, 2023
52441b0
genericize expected list of ids
fzhao99 Nov 16, 2023
5ca8254
codesmell
fzhao99 Nov 16, 2023
0c5db7c
update tests
fzhao99 Nov 17, 2023
52c040f
fix code issues
fzhao99 Nov 17, 2023
e759fab
one last code smell
fzhao99 Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions backend/src/main/java/gov/cdc/usds/simplereport/service/OrganizationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import gov.cdc.usds.simplereport.api.model.errors.IllegalGraphqlArgumentException;
import gov.cdc.usds.simplereport.api.model.errors.MisconfiguredUserException;
import gov.cdc.usds.simplereport.api.model.errors.NonexistentOrgException;
import gov.cdc.usds.simplereport.api.model.errors.NonexistentUserException;
import gov.cdc.usds.simplereport.config.AuthorizationConfiguration;
import gov.cdc.usds.simplereport.config.authorization.OrganizationRoleClaims;
import gov.cdc.usds.simplereport.db.model.ApiUser;
Expand All @@ -28,6 +27,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
Expand Down Expand Up @@ -481,12 +481,16 @@ public List<UUID> getOrgAdminUserIds(UUID orgId) {
return adminUserEmails.stream()
.map(
email -> {
ApiUser foundUser =
apiUserRepository
.findByLoginEmail(email)
.orElseThrow(NonexistentUserException::new);
return foundUser.getInternalId();
Optional<ApiUser> foundUser = apiUserRepository.findByLoginEmail(email);
if (foundUser.isEmpty()) {
log.warn(
Copy link
Collaborator

Choose a reason for hiding this comment

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

thank you for this change! :D

"Query for admin users in organization "
+ orgId
+ " found a user in Okta but not in the database. Skipping...");
}
return foundUser.map(user -> user.getInternalId()).orElse(null);
})
.filter(Objects::nonNull)
.collect(Collectors.toList());
}
}
24 changes: 14 additions & 10 deletions backend/src/test/java/gov/cdc/usds/simplereport/service/OrganizationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import gov.cdc.usds.simplereport.api.model.FacilityStats;
import gov.cdc.usds.simplereport.api.model.errors.IllegalGraphqlArgumentException;
import gov.cdc.usds.simplereport.api.model.errors.NonexistentOrgException;
import gov.cdc.usds.simplereport.api.model.errors.NonexistentUserException;
import gov.cdc.usds.simplereport.api.model.errors.OrderingProviderRequiredException;
import gov.cdc.usds.simplereport.config.simplereport.DemoUserConfiguration;
import gov.cdc.usds.simplereport.db.model.DeviceType;
Expand Down Expand Up @@ -478,20 +477,25 @@ void getOrgAdminUserIds_success() {
@Test
@WithSimpleReportSiteAdminUser
void getOrgAdminUserIds_throws_forNonExistentOrg() {
assertThrows(
NonexistentOrgException.class,
() -> _service.getOrgAdminUserIds(UUID.fromString("5ebf893a-bb57-48ca-8fc2-1ef6b25e465b")));
UUID mismatchedUUID = UUID.fromString("5ebf893a-bb57-48ca-8fc2-1ef6b25e465b");
assertThrows(NonexistentOrgException.class, () -> _service.getOrgAdminUserIds(mismatchedUUID));
}

@Test
@WithSimpleReportSiteAdminUser
void getOrgAdminUserIds_throws_forNonExistentUserInOrg() {
void getOrgAdminUserIds_skipsUser_forNonExistentUserInOrg() {
Organization createdOrg = _dataFactory.saveValidOrganization();
List<String> listWithAnExtraEmail = oktaRepository.fetchAdminUserEmail(createdOrg);
listWithAnExtraEmail.add("[email protected]");

when(oktaRepository.fetchAdminUserEmail(createdOrg))
.thenReturn(List.of("[email protected]"));
assertThrows(
NonexistentUserException.class,
() -> _service.getOrgAdminUserIds(createdOrg.getInternalId()));
when(oktaRepository.fetchAdminUserEmail(createdOrg)).thenReturn(listWithAnExtraEmail);
List<UUID> expectedIds =
listWithAnExtraEmail.stream()
.filter(email -> !email.equals("[email protected]"))
.map(email -> _apiUserRepo.findByLoginEmail(email).get().getInternalId())
.collect(Collectors.toList());

List<UUID> adminIds = _service.getOrgAdminUserIds(createdOrg.getInternalId());
assertThat(adminIds).isEqualTo(expectedIds);
}
}
Loading