yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-27 08:44:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix User entity pagination when isBot flag is False (#9604)

Browse Source 
Co-authored-by: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
This commit is contained in:
mosiac1 2023-01-05 15:58:24 +00:00 committed by GitHub
parent 9ef32eef99
commit 0ed67d69f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java
View File

@ -2439,7 +2439,7 @@ public interface CollectionDAO {
mySqlCondition);
postgresCondition =
String.format(
"%s AND ue.json#>'{isBot}' IS NULL OR ((ue.json#>'{isBot}')::boolean) = FALSE ", postgresCondition);
"%s AND (ue.json#>'{isBot}' IS NULL OR ((ue.json#>'{isBot}')::boolean) = FALSE) ", postgresCondition);
}
}
if (team == null && isAdminStr == null && isBotStr == null) {
@ -2484,7 +2484,7 @@ public interface CollectionDAO {
mySqlCondition);
postgresCondition =
String.format(
"%s AND ue.json#>'{isBot}' IS NULL OR ((ue.json#>'{isBot}')::boolean) = FALSE ", postgresCondition);
"%s AND (ue.json#>'{isBot}' IS NULL OR ((ue.json#>'{isBot}')::boolean) = FALSE) ", postgresCondition);
}
}
if (team == null && isAdminStr == null && isBotStr == null) {
@ -2536,7 +2536,7 @@ public interface CollectionDAO {
mySqlCondition);
postgresCondition =
String.format(
"%s AND ue.json#>'{isBot}' IS NULL OR ((ue.json#>'{isBot}')::boolean) = FALSE ", postgresCondition);
"%s AND (ue.json#>'{isBot}' IS NULL OR ((ue.json#>'{isBot}')::boolean) = FALSE) ", postgresCondition);
}
}
if (team == null && isAdminStr == null && isBotStr == null) {

47
openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/UserResourceTest.java
View File

@ -419,6 +419,53 @@ public class UserResourceTest extends EntityResourceTest<User, CreateUser> {
assertEquals(initialUserCount - initialBotCount, users.getPaging().getTotal());
}
@Test
void get_listUsersWithFalseBotFilterPagination(TestInfo test) throws IOException {
TeamResourceTest teamResourceTest = new TeamResourceTest();
Team team = teamResourceTest.createEntity(teamResourceTest.createRequest(test, 1), ADMIN_AUTH_HEADERS);
Map<String, String> queryParams = Map.of("isBot", "false", "team", team.getName());
// create 5 bot users
for (int i = 0; i < 5; i++) {
CreateUser create = createBotUserRequest(test, i).withTeams(List.of(team.getId()));
createAndCheckEntity(create, ADMIN_AUTH_HEADERS);
}
// create 10 non-bot users
for (int i = 5; i < 15; i++) {
CreateUser create = createRequest(test, i).withTeams(List.of(team.getId()));
createAndCheckEntity(create, ADMIN_AUTH_HEADERS);
}
ResultList<User> users = listEntities(queryParams, 5, null, null, ADMIN_AUTH_HEADERS);
assertEquals(5, users.getData().size());
assertEquals(10, users.getPaging().getTotal());
// First page must contain "after" and should not have "before"
assertNotNull(users.getPaging().getAfter());
assertNull(users.getPaging().getBefore());
User user1 = users.getData().get(0);
String after = users.getPaging().getAfter();
users = listEntities(queryParams, 5, null, after, ADMIN_AUTH_HEADERS);
assertEquals(5, users.getData().size());
assertEquals(10, users.getPaging().getTotal());
// Third page must contain only "before" since it is the last page
assertNull(users.getPaging().getAfter());
assertNotNull(users.getPaging().getBefore());
User user2 = users.getData().get(0);
assertNotEquals(user1, user2);
String before = users.getPaging().getBefore();
users = listEntities(queryParams, 5, before, null, ADMIN_AUTH_HEADERS);
assertEquals(5, users.getData().size());
assertEquals(10, users.getPaging().getTotal());
// First page must contain only "after"
assertNotNull(users.getPaging().getAfter());
assertNull(users.getPaging().getBefore());
assertEquals(user1, users.getData().get(0));
}
private CreateUser createBotUserRequest(TestInfo test, int index) {
return createBotUserRequest(getEntityName(test, index));
}