From 4f46fefd7dd44b148eaa457e3621e6514ceeac15 Mon Sep 17 00:00:00 2001 From: Hossein Ahmadian-Yazdi Date: Fri, 7 Aug 2020 12:59:34 -0400 Subject: [PATCH] include user delete at (#15191) --- model/channel_member_history_result.go | 7 ++++--- store/sqlstore/channel_member_history_store.go | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/model/channel_member_history_result.go b/model/channel_member_history_result.go index 6197d410ee..8f43ca4ea1 100644 --- a/model/channel_member_history_result.go +++ b/model/channel_member_history_result.go @@ -10,7 +10,8 @@ type ChannelMemberHistoryResult struct { LeaveTime *int64 // these two fields are never set in the database - when we SELECT, we join on Users to get them - UserEmail string `db:"Email"` - Username string - IsBot bool + UserEmail string `db:"Email"` + Username string + IsBot bool + UserDeleteAt int64 } diff --git a/store/sqlstore/channel_member_history_store.go b/store/sqlstore/channel_member_history_store.go index 9559319d25..67cf96ab23 100644 --- a/store/sqlstore/channel_member_history_store.go +++ b/store/sqlstore/channel_member_history_store.go @@ -114,7 +114,8 @@ func (s SqlChannelMemberHistoryStore) getFromChannelMemberHistoryTable(startTime cmh.*, u.Email, u.Username, - Bots.UserId IS NOT NULL AS IsBot + Bots.UserId IS NOT NULL AS IsBot, + u.DeleteAt AS UserDeleteAt FROM ChannelMemberHistory cmh INNER JOIN Users u ON cmh.UserId = u.Id LEFT JOIN Bots ON Bots.UserId = u.Id @@ -139,8 +140,8 @@ func (s SqlChannelMemberHistoryStore) getFromChannelMembersTable(startTime int64 ch.UserId, u.Email, u.Username, - Bots.UserId IS NOT NULL AS IsBot - + Bots.UserId IS NOT NULL AS IsBot, + u.DeleteAt AS UserDeleteAt FROM ChannelMembers AS ch INNER JOIN Users AS u ON ch.UserId = u.id LEFT JOIN Bots ON Bots.UserId = u.Id