diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java index aa0b23bf4cd..de7577cf569 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java @@ -3789,9 +3789,9 @@ public interface CollectionDAO { @SqlQuery( "SELECT te.id " + "FROM team_entity te " - + "WHERE te.id NOT IN (SELECT :teamId) UNION " + + "WHERE te.id NOT IN ((SELECT :teamId) UNION " + "(SELECT toId FROM entity_relationship " - + "WHERE fromId != :teamId AND fromEntity = 'team' AND relation = :relation AND toEntity = 'team')") + + "WHERE fromId != :teamId AND fromEntity = 'team' AND relation = :relation AND toEntity = 'team'))") List listTeamsUnderOrganization( @BindUUID("teamId") UUID teamId, @Bind("relation") int relation); } diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java index bf7efeff840..9277394cf23 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java @@ -506,20 +506,19 @@ public class TeamResourceTest extends EntityResourceTest { invalidParentCount(1, DIVISION)); // Department can have more than one parent - createWithParents( - "dep", - DEPARTMENT, - div12.getEntityReference(), - div21.getEntityReference(), - ORG_TEAM.getEntityReference()); + createWithParents("dep", DEPARTMENT, div12.getEntityReference(), div21.getEntityReference()); + + ORG_TEAM = getEntity(ORG_TEAM.getId(), "children,childrenCount", ADMIN_AUTH_HEADERS); + assertEquals(ORG_TEAM.getChildren().size(), ORG_TEAM.getChildrenCount()); // // Deletion tests to ensure no dangling parent/children relationship // Delete bu1 and ensure Organization does not have it a child and bu11, div12, dep13 don't // change Org to parent deleteEntity(bu1.getId(), true, true, ADMIN_AUTH_HEADERS); - ORG_TEAM = getEntity(ORG_TEAM.getId(), "children", ADMIN_AUTH_HEADERS); + ORG_TEAM = getEntity(ORG_TEAM.getId(), "children,childrenCount", ADMIN_AUTH_HEADERS); assertEntityReferencesDoesNotContain(ORG_TEAM.getChildren(), bu1.getEntityReference()); + assertEquals(ORG_TEAM.getChildren().size(), ORG_TEAM.getChildrenCount()); } @Test