[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
@@ -1300,6 +1300,51 @@ func TestImportImportUser(t *testing.T) {
|
||||
assert.True(t, channelMember.SchemeUser)
|
||||
assert.Equal(t, "", channelMember.ExplicitRoles)
|
||||
|
||||
|
||||
// Test importing deleted user with a valid team & valid channel name in apply mode.
|
||||
username = model.NewId()
|
||||
deleteAt := model.GetMillis()
|
||||
deletedUserData := &UserImportData{
|
||||
Username: &username,
|
||||
DeleteAt: &deleteAt,
|
||||
Email: ptrStr(model.NewId() + "@example.com"),
|
||||
Teams: &[]UserTeamImportData{
|
||||
{
|
||||
Name: &team.Name,
|
||||
Roles: ptrStr("team_user"),
|
||||
Channels: &[]UserChannelImportData{
|
||||
{
|
||||
Name: &channel.Name,
|
||||
Roles: ptrStr("channel_user"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
err = th.App.ImportUser(deletedUserData, false)
|
||||
assert.Nil(t, err)
|
||||
|
||||
user, err = th.App.GetUserByUsername(*deletedUserData.Username)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to get user from database.")
|
||||
}
|
||||
|
||||
teamMember, err = th.App.GetTeamMember(team.Id, user.Id)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to get the team member")
|
||||
}
|
||||
|
||||
assert.True(t, teamMember.SchemeUser)
|
||||
assert.Equal(t, "", teamMember.ExplicitRoles)
|
||||
|
||||
channelMember, err = th.App.GetChannelMember(channel.Id, user.Id)
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to get the channel member")
|
||||
}
|
||||
|
||||
assert.True(t, channelMember.SchemeUser)
|
||||
assert.Equal(t, "", channelMember.ExplicitRoles)
|
||||
|
||||
}
|
||||
|
||||
func TestImportUserDefaultNotifyProps(t *testing.T) {
|
||||
|
||||
Ссылка в новой задаче
Block a user