Fix idempotency of scheme migrations. (#8935)

This fixes the issue where if the migration tries to migrate an already
scheme-aware member object it would end up removing it's scheme-derived
roles.

Instead, only if the member object is unmigrated do we default to
setting the scheme-derived role booleans to false. We tell if it is an
unmigrated member object by checking if the booleans are set to null.
Этот коммит содержится в:
George Goldberg
2018-06-11 15:24:08 +01:00
коммит произвёл Carlos Tadeu Panato Junior
родитель 566539bc67
Коммит d4761a94ce
2 изменённых файлов: 12 добавлений и 4 удалений

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

@@ -1733,8 +1733,12 @@ func (s SqlChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId
for _, member := range channelMembers {
roles := strings.Fields(member.Roles)
var newRoles []string
member.SchemeAdmin = sql.NullBool{Bool: false, Valid: true}
member.SchemeUser = sql.NullBool{Bool: false, Valid: true}
if !member.SchemeAdmin.Valid {
member.SchemeAdmin = sql.NullBool{Bool: false, Valid: true}
}
if !member.SchemeUser.Valid {
member.SchemeUser = sql.NullBool{Bool: false, Valid: true}
}
for _, role := range roles {
if role == model.CHANNEL_ADMIN_ROLE_ID {
member.SchemeAdmin = sql.NullBool{Bool: true, Valid: true}

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

@@ -755,8 +755,12 @@ func (s SqlTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) s
for _, member := range teamMembers {
roles := strings.Fields(member.Roles)
var newRoles []string
member.SchemeAdmin = sql.NullBool{Bool: false, Valid: true}
member.SchemeUser = sql.NullBool{Bool: false, Valid: true}
if !member.SchemeAdmin.Valid {
member.SchemeAdmin = sql.NullBool{Bool: false, Valid: true}
}
if !member.SchemeUser.Valid {
member.SchemeUser = sql.NullBool{Bool: false, Valid: true}
}
for _, role := range roles {
if role == model.TEAM_ADMIN_ROLE_ID {
member.SchemeAdmin = sql.NullBool{Bool: true, Valid: true}