yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-11-08 15:04:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get feed and count data of soft deleted user (#17135)

Browse Source
This commit is contained in:
sonika-shah 2024-07-23 10:19:02 +05:30 committed by GitHub
parent b125ba7b48
commit 8f5ca552e3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FeedRepository.java
View File

@ -550,7 +550,7 @@ public class FeedRepository {
if (reference.getType().equals(USER) || reference.getType().equals(Entity.TEAM)) { if (reference.getType().equals(USER) || reference.getType().equals(Entity.TEAM)) {
if (reference.getType().equals(USER)) { if (reference.getType().equals(USER)) {
UUID userId = reference.getId(); UUID userId = reference.getId();
User user = Entity.getEntity(USER, userId, TEAMS_FIELD, NON_DELETED); User user = Entity.getEntity(USER, userId, TEAMS_FIELD, ALL);
List<String> teamIds = getTeamIds(user); List<String> teamIds = getTeamIds(user);
List<String> teamNames = getTeamNames(user); List<String> teamNames = getTeamNames(user);
String userTeamJsonMysql = getUserTeamJsonMysql(userId, teamIds); String userTeamJsonMysql = getUserTeamJsonMysql(userId, teamIds);
@ -688,8 +688,7 @@ public class FeedRepository {
total = filteredThreads.totalCount(); total = filteredThreads.totalCount();
} else { } else {
// Only data assets are added as about // Only data assets are added as about
User user = User user = userId != null ? Entity.getEntity(USER, userId, TEAMS_FIELD, ALL) : null;
userId != null ? Entity.getEntity(USER, userId, TEAMS_FIELD, NON_DELETED) : null;
List<String> teamNameHash = getTeamNames(user); List<String> teamNameHash = getTeamNames(user);
String userName = user == null ? null : user.getFullyQualifiedName(); String userName = user == null ? null : user.getFullyQualifiedName();
List<String> jsons = List<String> jsons =
@ -1150,7 +1149,7 @@ public class FeedRepository {
/** Return the tasks created by or assigned to the user. */ /** Return the tasks created by or assigned to the user. */
private FilteredThreads getTasksOfUser(FeedFilter filter, UUID userId, int limit) { private FilteredThreads getTasksOfUser(FeedFilter filter, UUID userId, int limit) {
String username = Entity.getEntityReferenceById(Entity.USER, userId, NON_DELETED).getName(); String username = Entity.getEntityReferenceById(Entity.USER, userId, ALL).getName();
List<String> teamIds = getTeamIds(userId); List<String> teamIds = getTeamIds(userId);
List<String> userTeamJsonPostgres = getUserTeamJsonPostgres(userId, teamIds); List<String> userTeamJsonPostgres = getUserTeamJsonPostgres(userId, teamIds);
String userTeamJsonMysql = getUserTeamJsonMysql(userId, teamIds); String userTeamJsonMysql = getUserTeamJsonMysql(userId, teamIds);
@ -1168,7 +1167,7 @@ public class FeedRepository {
/** Return the tasks created by the user. */ /** Return the tasks created by the user. */
private FilteredThreads getTasksAssignedBy(FeedFilter filter, UUID userId, int limit) { private FilteredThreads getTasksAssignedBy(FeedFilter filter, UUID userId, int limit) {
String username = Entity.getEntityReferenceById(Entity.USER, userId, NON_DELETED).getName(); String username = Entity.getEntityReferenceById(Entity.USER, userId, ALL).getName();
List<String> jsons = dao.feedDAO().listTasksAssigned(username, limit, filter.getCondition()); List<String> jsons = dao.feedDAO().listTasksAssigned(username, limit, filter.getCondition());
List<Thread> threads = JsonUtils.readObjects(jsons, Thread.class); List<Thread> threads = JsonUtils.readObjects(jsons, Thread.class);
int totalCount = dao.feedDAO().listCountTasksAssignedBy(username, filter.getCondition(false)); int totalCount = dao.feedDAO().listCountTasksAssignedBy(username, filter.getCondition(false));
@ -1194,7 +1193,7 @@ public class FeedRepository {
private FilteredThreads getThreadsForGlossary( private FilteredThreads getThreadsForGlossary(
FeedFilter filter, UUID userId, int limit, EntityLink entityLink) { FeedFilter filter, UUID userId, int limit, EntityLink entityLink) {
User user = userId != null ? Entity.getEntity(USER, userId, TEAMS_FIELD, NON_DELETED) : null; User user = userId != null ? Entity.getEntity(USER, userId, TEAMS_FIELD, ALL) : null;
List<String> teamNameHash = getTeamNames(user); List<String> teamNameHash = getTeamNames(user);
String userName = user == null ? null : user.getFullyQualifiedName(); String userName = user == null ? null : user.getFullyQualifiedName();
int filterRelation = -1; int filterRelation = -1;
@ -1227,7 +1226,7 @@ public class FeedRepository {
* with @mention. * with @mention.
*/ */
private FilteredThreads getThreadsByMentions(FeedFilter filter, UUID userId, int limit) { private FilteredThreads getThreadsByMentions(FeedFilter filter, UUID userId, int limit) {
User user = Entity.getEntity(Entity.USER, userId, TEAMS_FIELD, NON_DELETED); User user = Entity.getEntity(Entity.USER, userId, TEAMS_FIELD, ALL);
String userNameHash = getUserNameHash(user); String userNameHash = getUserNameHash(user);
// Return the threads where the user or team was mentioned // Return the threads where the user or team was mentioned
List<String> teamNamesHash = getTeamNames(user); List<String> teamNamesHash = getTeamNames(user);
@ -1256,7 +1255,7 @@ public class FeedRepository {
private List<String> getTeamIds(UUID userId) { private List<String> getTeamIds(UUID userId) {
List<String> teamIds = null; List<String> teamIds = null;
if (userId != null) { if (userId != null) {
User user = Entity.getEntity(Entity.USER, userId, TEAMS_FIELD, NON_DELETED); User user = Entity.getEntity(Entity.USER, userId, TEAMS_FIELD, ALL);
teamIds = getTeamIds(user); teamIds = getTeamIds(user);
} }
return nullOrEmpty(teamIds) ? List.of(StringUtils.EMPTY) : teamIds; return nullOrEmpty(teamIds) ? List.of(StringUtils.EMPTY) : teamIds;