From 2a51148eee08c357c2f9f8600ce002b8b9a230de Mon Sep 17 00:00:00 2001 From: Vivek Ratnavel Subramanian Date: Sat, 23 Apr 2022 22:03:54 -0700 Subject: [PATCH] Fix #4312: team instance for not found (#4431) --- .../java/org/openmetadata/catalog/jdbi3/CollectionDAO.java | 2 +- .../java/org/openmetadata/catalog/jdbi3/UserRepository.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/CollectionDAO.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/CollectionDAO.java index 06e7a75c393..a503355204a 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/CollectionDAO.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/CollectionDAO.java @@ -504,7 +504,7 @@ public interface CollectionDAO { @SqlUpdate( "DELETE from entity_relationship WHERE (toId = :id AND toEntity = :entity) OR " - + "(fromId = :id AND toEntity = :entity)") + + "(fromId = :id AND fromEntity = :entity)") int deleteAll(@Bind("id") String id, @Bind("entity") String entity); } diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java index 744c3e016b1..816ec7e5660 100644 --- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java +++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/UserRepository.java @@ -214,7 +214,9 @@ public class UserRepository extends EntityRepository { /* Add all the teams that user belongs to User entity */ private List getTeams(User user) throws IOException { List teamIds = findFrom(user.getId(), Entity.USER, Relationship.HAS, Entity.TEAM); - return EntityUtil.populateEntityReferences(teamIds, Entity.TEAM); + List teams = EntityUtil.populateEntityReferences(teamIds, Entity.TEAM); + // return only the non-deleted teams + return teams.stream().filter((team) -> !team.getDeleted()).collect(Collectors.toList()); } private void assignRoles(User user, List roles) {