[MM-12667] Allow including deactivated users in bulk import and export (#10353)
* [MM-12667] Allow including deactivated users in bulk import and export 1. Added `deleteAt` for user type import line 2. Adding deactivated users data in bulk export 3. Importing deactivated users data in bulk import Added/Updated relevant test cases * Fixed export of replies to posts by deleted users. Updated tests for same
Этот коммит содержится в:
коммит произвёл
George Goldberg
родитель
7ac5715a02
Коммит
7f9e1273d7
@@ -1327,7 +1327,6 @@ func (s *SqlPostStore) GetParentsForExportAfter(limit int, afterId string) store
|
||||
AND p1.DeleteAt = 0
|
||||
AND Channels.DeleteAt = 0
|
||||
AND Teams.DeleteAt = 0
|
||||
AND Users.DeleteAt = 0
|
||||
ORDER BY
|
||||
p1.Id
|
||||
LIMIT
|
||||
@@ -1356,7 +1355,6 @@ func (s *SqlPostStore) GetRepliesForExport(parentId string) store.StoreChannel {
|
||||
WHERE
|
||||
Posts.ParentId = :ParentId
|
||||
AND Posts.DeleteAt = 0
|
||||
AND Users.DeleteAt = 0
|
||||
ORDER BY
|
||||
Posts.Id`,
|
||||
map[string]interface{}{"ParentId": parentId})
|
||||
|
||||
@@ -1941,4 +1941,20 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) {
|
||||
assert.Equal(t, reply1.Id, p2.Id)
|
||||
assert.Equal(t, reply1.Message, p2.Message)
|
||||
assert.Equal(t, reply1.Username, u1.Username)
|
||||
|
||||
// Checking whether replies by deleted user are exported
|
||||
u1.DeleteAt = 1002
|
||||
store.Must(ss.User().Update(&u1, false))
|
||||
|
||||
r1 = <-ss.Post().GetRepliesForExport(p1.Id)
|
||||
assert.Nil(t, r1.Err)
|
||||
|
||||
d1 = r1.Data.([]*model.ReplyForExport)
|
||||
assert.Len(t, d1, 1)
|
||||
|
||||
reply1 = d1[0]
|
||||
assert.Equal(t, reply1.Id, p2.Id)
|
||||
assert.Equal(t, reply1.Message, p2.Message)
|
||||
assert.Equal(t, reply1.Username, u1.Username)
|
||||
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user