[MM-12462] Include favorite channels in bulk export (#9692)

* Include favorite channels in bulk export

* Remove duplicate method
Этот коммит содержится в:
Shobhit Gupta
2018-11-05 05:18:00 -08:00
коммит произвёл George Goldberg
родитель 90f279c7d5
Коммит bce7a7c73d
3 изменённых файлов: 31 добавлений и 6 удалений

Просмотреть файл

@@ -206,17 +206,21 @@ func (a *App) buildUserChannelMemberships(userId string, teamId string) (*[]User
var memberships []UserChannelImportData
result := <-a.Srv.Store.Channel().GetChannelMembersForExport(userId, teamId)
if result.Err != nil {
return nil, result.Err
}
members := result.Data.([]*model.ChannelMemberForExport)
for _, member := range members {
memberships = append(memberships, *ImportUserChannelDataFromChannelMember(member))
category := model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL
preferences, err := a.GetPreferenceByCategoryForUser(userId, category)
if err != nil {
return nil, err
}
for _, member := range members {
memberships = append(memberships, *ImportUserChannelDataFromChannelMemberAndPreferences(member, &preferences))
}
return &memberships, nil
}