MM-15276: Migrate Team.Update to sync by default (#10693)
* MM-15276: Migrate Team.Update to sync by default * MM-15276: Addressing review comments and change Update func signature similar to other interface Update method * update store mocks for update fn * addressing review comments
Этот коммит содержится в:
коммит произвёл
Jesús Espino
родитель
b24013d54c
Коммит
ec95793b90
26
app/team.go
26
app/team.go
@@ -136,12 +136,7 @@ func (a *App) UpdateTeam(team *model.Team) (*model.Team, *model.AppError) {
|
||||
}
|
||||
|
||||
func (a *App) updateTeamUnsanitized(team *model.Team) (*model.Team, *model.AppError) {
|
||||
result := <-a.Srv.Store.Team().Update(team)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
|
||||
return result.Data.(*model.Team), nil
|
||||
return a.Srv.Store.Team().Update(team)
|
||||
}
|
||||
|
||||
// RenameTeam is used to rename the team Name and the DisplayName fields
|
||||
@@ -180,8 +175,8 @@ func (a *App) UpdateTeamScheme(team *model.Team) (*model.Team, *model.AppError)
|
||||
|
||||
oldTeam.SchemeId = team.SchemeId
|
||||
|
||||
if result := <-a.Srv.Store.Team().Update(oldTeam); result.Err != nil {
|
||||
return nil, result.Err
|
||||
if oldTeam, err = a.Srv.Store.Team().Update(oldTeam); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
a.sendTeamEvent(oldTeam, model.WEBSOCKET_EVENT_UPDATE_TEAM)
|
||||
@@ -1051,8 +1046,8 @@ func (a *App) PermanentDeleteTeamId(teamId string) *model.AppError {
|
||||
|
||||
func (a *App) PermanentDeleteTeam(team *model.Team) *model.AppError {
|
||||
team.DeleteAt = model.GetMillis()
|
||||
if result := <-a.Srv.Store.Team().Update(team); result.Err != nil {
|
||||
return result.Err
|
||||
if _, err := a.Srv.Store.Team().Update(team); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if result := <-a.Srv.Store.Channel().GetTeamChannels(team.Id); result.Err != nil {
|
||||
@@ -1090,8 +1085,8 @@ func (a *App) SoftDeleteTeam(teamId string) *model.AppError {
|
||||
}
|
||||
|
||||
team.DeleteAt = model.GetMillis()
|
||||
if result := <-a.Srv.Store.Team().Update(team); result.Err != nil {
|
||||
return result.Err
|
||||
if team, err = a.Srv.Store.Team().Update(team); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
a.sendTeamEvent(team, model.WEBSOCKET_EVENT_DELETE_TEAM)
|
||||
@@ -1104,11 +1099,12 @@ func (a *App) RestoreTeam(teamId string) *model.AppError {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
team.DeleteAt = 0
|
||||
result := <-a.Srv.Store.Team().Update(team)
|
||||
if result.Err != nil {
|
||||
return result.Err
|
||||
if team, err = a.Srv.Store.Team().Update(team); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
a.sendTeamEvent(team, model.WEBSOCKET_EVENT_RESTORE_TEAM)
|
||||
return nil
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user