yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-12-04 19:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct childrenCount for Organizations in Teams (#20138) (#20139)

Browse Source 
* Fix childrenCount of organization in team (#19761)

* Fix UT (#19761)

* Fix code style (#20138)

* Fix UT (#20138)

(cherry picked from commit 7e8c94c7b8e046cdf697ded132a70eff5794b450)
This commit is contained in:
Juntao Zhang 2025-03-18 09:51:16 +08:00 committed by OpenMetadata Release Bot
parent 66b7a8d2cc
commit a3f730bab2
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<String> listTeamsUnderOrganization(
@BindUUID("teamId") UUID teamId, @Bind("relation") int relation);
}

13
openmetadata-service/src/test/java/org/openmetadata/service/resources/teams/TeamResourceTest.java
View File

@ -506,20 +506,19 @@ public class TeamResourceTest extends EntityResourceTest<Team, CreateTeam> {
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