IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

GH-11550 Migrate "Team.ResetAllTeamSchemes" to Sync by default (#11564)

Browse Source 
* Refactor as per #11550

* Remove trailing semicolon
This commit is contained in:
Keaton Neville
2019-07-08 17:01:39 -04:00
committed by Jesse Hallam
parent eddf48c848
commit 1640702d5e
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
store/sqlstore/team_store.go
View File

@@ -876,12 +876,11 @@ func (s SqlTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) s
})
}
func (s SqlTeamStore) ResetAllTeamSchemes() store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
if _, err := s.GetMaster().Exec("UPDATE Teams SET SchemeId=''"); err != nil {
result.Err = model.NewAppError("SqlTeamStore.ResetAllTeamSchemes", "store.sql_team.reset_all_team_schemes.app_error", nil, err.Error(), http.StatusInternalServerError)
}
})
func (s SqlTeamStore) ResetAllTeamSchemes() *model.AppError {
if _, err := s.GetMaster().Exec("UPDATE Teams SET SchemeId=''"); err != nil {
return model.NewAppError("SqlTeamStore.ResetAllTeamSchemes", "store.sql_team.reset_all_team_schemes.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return nil
}
var allTeamIdsForUserCache = utils.NewLru(ALL_TEAM_IDS_FOR_USER_CACHE_SIZE)

2
store/store.go
View File

@@ -117,7 +117,7 @@ type TeamStore interface {
UpdateLastTeamIconUpdate(teamId string, curTime int64) *model.AppError
GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, *model.AppError)
MigrateTeamMembers(fromTeamId string, fromUserId string) StoreChannel
ResetAllTeamSchemes() StoreChannel
ResetAllTeamSchemes() *model.AppError
ClearAllCustomRoleAssignments() StoreChannel
AnalyticsGetTeamCountForScheme(schemeId string) StoreChannel
GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, *model.AppError)

8
store/storetest/mocks/TeamStore.go
View File

@@ -712,15 +712,15 @@ func (_m *TeamStore) RemoveMember(teamId string, userId string) store.StoreChann
}
// ResetAllTeamSchemes provides a mock function with given fields:
func (_m *TeamStore) ResetAllTeamSchemes() store.StoreChannel {
func (_m *TeamStore) ResetAllTeamSchemes() *model.AppError {
ret := _m.Called()
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func() store.StoreChannel); ok {
var r0 *model.AppError
if rf, ok := ret.Get(0).(func() *model.AppError); ok {
r0 = rf()
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(*model.AppError)
}
}

4
store/storetest/team_store.go
View File

@@ -1480,8 +1480,8 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
assert.Equal(t, s1.Id, *t1.SchemeId)
assert.Equal(t, s1.Id, *t2.SchemeId)
res := <-ss.Team().ResetAllTeamSchemes()
assert.Nil(t, res.Err)
res := ss.Team().ResetAllTeamSchemes()
assert.Nil(t, res)
t1, err = ss.Team().Get(t1.Id)
require.Nil(t, err)