Add paginated search backend

CDCgov · Dec 24, 2024 · a9dec54 · a9dec54
1 parent 8750659
commit a9dec54
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 2 deletions.
diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/api/apiuser/UserResolver.java b/backend/src/main/java/gov/cdc/usds/simplereport/api/apiuser/UserResolver.java
@@ -42,10 +42,15 @@ public List<ApiUserWithStatus> usersWithStatus() {
   }
 
   @QueryMapping
-  public Page<ApiUserWithStatus> usersWithStatusPage(@Argument int pageNumber) {
+  public Page<ApiUserWithStatus> usersWithStatusPage(
+      @Argument int pageNumber, @Argument String searchQuery) {
     if (pageNumber < 0) {
       pageNumber = ApiUserService.DEFAULT_OKTA_USER_PAGE_OFFSET;
     }
+    if (!searchQuery.isBlank()) {
+      return _userService.searchUsersAndStatusInCurrentOrgPaged(
+          pageNumber, DEFAULT_OKTA_USER_PAGE_SIZE, searchQuery);
+    }
     return _userService.getPagedUsersAndStatusInCurrentOrg(pageNumber, DEFAULT_OKTA_USER_PAGE_SIZE);
   }
 

diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/service/ApiUserService.java b/backend/src/main/java/gov/cdc/usds/simplereport/service/ApiUserService.java
@@ -638,6 +638,33 @@ public Page<ApiUserWithStatus> getPagedUsersAndStatusInCurrentOrg(int pageNumber
     return new PageImpl<>(userWithStatusList, pageRequest, userCountInOrg);
   }
 
+  public Page<ApiUserWithStatus> searchUsersAndStatusInCurrentOrgPaged(
+      int pageNumber, int pageSize, String searchQuery) {
+    List<ApiUserWithStatus> allUsers = getUsersAndStatusInCurrentOrg();
+
+    List<ApiUserWithStatus> filteredUsersList =
+        allUsers.stream()
+            .filter(
+                u -> {
+                  String firstName =
+                      u.getFirstName() == null ? "" : String.format("%s ", u.getFirstName());
+                  String middleName =
+                      u.getMiddleName() == null ? "" : String.format("%s ", u.getMiddleName());
+                  String fullName = firstName + middleName + u.getLastName();
+                  return fullName.toLowerCase().contains(searchQuery.toLowerCase());
+                })
+            .toList();
+
+    int totalResults = filteredUsersList.size();
+    int startIndex = pageNumber * pageSize;
+    int endIndex = Math.min((startIndex + pageSize), filteredUsersList.size());
+
+    List<ApiUserWithStatus> pageContent = filteredUsersList.subList(startIndex, endIndex);
+    PageRequest pageRequest = PageRequest.of(pageNumber, pageSize);
+
+    return new PageImpl<>(pageContent, pageRequest, totalResults);
+  }
+
   // To be addressed in #8108
   @AuthorizationConfiguration.RequirePermissionManageUsers
   public List<ApiUserWithStatus> getUsersAndStatusInCurrentOrg() {

diff --git a/backend/src/main/resources/graphql/main.graphqls b/backend/src/main/resources/graphql/main.graphqls
@@ -550,7 +550,7 @@ type Query {
   users: [ApiUser] @requiredPermissions(allOf: ["MANAGE_USERS"])
   usersWithStatus: [ApiUserWithStatus!]
     @requiredPermissions(allOf: ["MANAGE_USERS"])
-  usersWithStatusPage(pageNumber: Int): ApiUserWithStatusPage! @requiredPermissions(allOf: ["MANAGE_USERS"])
+  usersWithStatusPage(pageNumber: Int, searchQuery: String): ApiUserWithStatusPage! @requiredPermissions(allOf: ["MANAGE_USERS"])
   user(id: ID, email: String): User
     @requiredPermissions(allOf: ["MANAGE_USERS"])
   whoami: User!

diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/service/ApiUserServiceTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/service/ApiUserServiceTest.java
@@ -173,6 +173,17 @@ void getPagedUsersAndStatusInCurrentOrg_success() {
         users2ndList.get(2), "[email protected]", "Reynolds", UserStatus.ACTIVE);
   }
 
+  @Test
+  @WithSimpleReportOrgAdminUser
+  void searchUsersAndStatusInCurrentOrgPaged_success() {
+    initSampleData();
+    Page<ApiUserWithStatus> usersPage =
+        _service.searchUsersAndStatusInCurrentOrgPaged(0, 10, "Bob");
+    List<ApiUserWithStatus> users = usersPage.stream().toList();
+    assertEquals(1, users.size());
+    checkApiUserWithStatus(users.get(0), "[email protected]", "Bobberoo", UserStatus.ACTIVE);
+  }
+
   @Test
   @WithSimpleReportOrgAdminUser
   void getUser_withAdminUser_withOktaMigrationDisabled_success() {