[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
@@ -170,8 +170,13 @@ func TestExportAllUsers(t *testing.T) {
|
||||
th1 := Setup(t).InitBasic()
|
||||
defer th1.TearDown()
|
||||
|
||||
// Adding a user and deactivating it to check whether it gets included in bulk export
|
||||
user := th1.CreateUser()
|
||||
_, err := th1.App.UpdateActive(user, false)
|
||||
require.Nil(t, err)
|
||||
|
||||
var b bytes.Buffer
|
||||
err := th1.App.BulkExport(&b, "somefile", "somePath", "someDir")
|
||||
err = th1.App.BulkExport(&b, "somefile", "somePath", "someDir")
|
||||
require.Nil(t, err)
|
||||
|
||||
th2 := Setup(t)
|
||||
@@ -192,4 +197,20 @@ func TestExportAllUsers(t *testing.T) {
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, len(users1), len(users2))
|
||||
assert.ElementsMatch(t, users1, users2)
|
||||
|
||||
// Checking whether deactivated users were included in bulk export
|
||||
deletedUsers1, err := th1.App.GetUsers(&model.UserGetOptions{
|
||||
Inactive: true,
|
||||
Page: 0,
|
||||
PerPage: 10,
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
deletedUsers2, err := th1.App.GetUsers(&model.UserGetOptions{
|
||||
Inactive: true,
|
||||
Page: 0,
|
||||
PerPage: 10,
|
||||
})
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, len(deletedUsers1), len(deletedUsers2))
|
||||
assert.ElementsMatch(t, deletedUsers1, deletedUsers2)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user