[MM-16777] Migrate Team.MigrateTeamMembers to Sync by default (#11584)
* Migrate Team.MigrateTeamMembers to Sync by default * Remove commented out MigrateTeamMembers function * Remove return nil when no team members in query * Return nil when no more team members in query * Remove commented out code lines * Format MigrateTeamMembers code * Return some data from MigrateTeamMembers function * Return data and error from MigrateTeamMembers * Use result for consistency * Control loop to allow loop to break in storetest/team_store.go * Fix test MigrateTeamMembers test in storetest/team_store.go * Change err to e in storetest/team_store.go
Этот коммит содержится в:
коммит произвёл
Jesús Espino
родитель
9ce5b28c63
Коммит
15be0c6c79
@@ -71,19 +71,18 @@ func (worker *Worker) runAdvancedPermissionsPhase2Migration(lastDone string) (bo
|
||||
|
||||
if progress.CurrentTable == "TeamMembers" {
|
||||
// Run a TeamMembers migration batch.
|
||||
if result := <-worker.app.Srv.Store.Team().MigrateTeamMembers(progress.LastTeamId, progress.LastUserId); result.Err != nil {
|
||||
return false, progress.ToJson(), result.Err
|
||||
if result, err := worker.app.Srv.Store.Team().MigrateTeamMembers(progress.LastTeamId, progress.LastUserId); err != nil {
|
||||
return false, progress.ToJson(), err
|
||||
} else {
|
||||
if result.Data == nil {
|
||||
if result == nil {
|
||||
// We haven't progressed. That means that we've reached the end of this stage of the migration, and should now advance to the next stage.
|
||||
progress.LastUserId = strings.Repeat("0", 26)
|
||||
progress.CurrentTable = "ChannelMembers"
|
||||
return false, progress.ToJson(), nil
|
||||
}
|
||||
|
||||
data := result.Data.(map[string]string)
|
||||
progress.LastTeamId = data["TeamId"]
|
||||
progress.LastUserId = data["UserId"]
|
||||
progress.LastTeamId = result["TeamId"]
|
||||
progress.LastUserId = result["UserId"]
|
||||
}
|
||||
} else if progress.CurrentTable == "ChannelMembers" {
|
||||
// Run a ChannelMembers migration batch.
|
||||
|
||||
Ссылка в новой задаче
Block a user