* Migrate to Sync by default #11096 * Update with gofmt
Этот коммит содержится в:
коммит произвёл
Jesús Espino
родитель
b0ad3c10e9
Коммит
9445cb29f5
@@ -254,15 +254,12 @@ func (s SqlTeamStore) Update(team *model.Team) (*model.Team, *model.AppError) {
|
||||
return team, nil
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) UpdateDisplayName(name string, teamId string) store.StoreChannel {
|
||||
return store.Do(func(result *store.StoreResult) {
|
||||
if _, err := s.GetMaster().Exec("UPDATE Teams SET DisplayName = :Name WHERE Id = :Id", map[string]interface{}{"Name": name, "Id": teamId}); err != nil {
|
||||
result.Err = model.NewAppError("SqlTeamStore.UpdateName", "store.sql_team.update_display_name.app_error", nil, "team_id="+teamId, http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
func (s SqlTeamStore) UpdateDisplayName(name string, teamId string) *model.AppError {
|
||||
if _, err := s.GetMaster().Exec("UPDATE Teams SET DisplayName = :Name WHERE Id = :Id", map[string]interface{}{"Name": name, "Id": teamId}); err != nil {
|
||||
return model.NewAppError("SqlTeamStore.UpdateName", "store.sql_team.update_display_name.app_error", nil, "team_id="+teamId, http.StatusInternalServerError)
|
||||
}
|
||||
|
||||
result.Data = teamId
|
||||
})
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s SqlTeamStore) Get(id string) (*model.Team, *model.AppError) {
|
||||
|
||||
@@ -83,7 +83,7 @@ type Store interface {
|
||||
type TeamStore interface {
|
||||
Save(team *model.Team) (*model.Team, *model.AppError)
|
||||
Update(team *model.Team) (*model.Team, *model.AppError)
|
||||
UpdateDisplayName(name string, teamId string) StoreChannel
|
||||
UpdateDisplayName(name string, teamId string) *model.AppError
|
||||
Get(id string) (*model.Team, *model.AppError)
|
||||
GetByName(name string) (*model.Team, *model.AppError)
|
||||
SearchByName(name string) ([]*model.Team, *model.AppError)
|
||||
|
||||
@@ -702,15 +702,15 @@ func (_m *TeamStore) Update(team *model.Team) (*model.Team, *model.AppError) {
|
||||
}
|
||||
|
||||
// UpdateDisplayName provides a mock function with given fields: name, teamId
|
||||
func (_m *TeamStore) UpdateDisplayName(name string, teamId string) store.StoreChannel {
|
||||
func (_m *TeamStore) UpdateDisplayName(name string, teamId string) *model.AppError {
|
||||
ret := _m.Called(name, teamId)
|
||||
|
||||
var r0 store.StoreChannel
|
||||
if rf, ok := ret.Get(0).(func(string, string) store.StoreChannel); ok {
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(string, string) *model.AppError); ok {
|
||||
r0 = rf(name, teamId)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(store.StoreChannel)
|
||||
r0 = ret.Get(0).(*model.AppError)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -112,7 +112,7 @@ func testTeamStoreUpdateDisplayName(t *testing.T, ss store.Store) {
|
||||
|
||||
newDisplayName := "NewDisplayName"
|
||||
|
||||
if err = (<-ss.Team().UpdateDisplayName(newDisplayName, o1.Id)).Err; err != nil {
|
||||
if err = ss.Team().UpdateDisplayName(newDisplayName, o1.Id); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user