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

* Refactor as per #11550

* Remove trailing semicolon

app/permissions.go

@@ -18,8 +18,8 @@ const systemSchemeName = "00000000-0000-0000-0000-000000000000" // Prevents coll
 
 func (a *App) ResetPermissionsSystem() *model.AppError {
 	// Reset all Teams to not have a scheme.
-	if result := <-a.Srv.Store.Team().ResetAllTeamSchemes(); result.Err != nil {
+	if err := a.Srv.Store.Team().ResetAllTeamSchemes(); err != nil {
-		return result.Err
+		return err
 	}
 
 	// Reset all Channels to not have a scheme.

store/sqlstore/team_store.go

@@ -876,12 +876,11 @@ func (s SqlTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) s
 	})
 }
 
-func (s SqlTeamStore) ResetAllTeamSchemes() store.StoreChannel {
+func (s SqlTeamStore) ResetAllTeamSchemes() *model.AppError {
-	return store.Do(func(result *store.StoreResult) {
+	if _, err := s.GetMaster().Exec("UPDATE Teams SET SchemeId=''"); err != nil {
-		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)
-			result.Err = 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)

store/store.go

@@ -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)

store/storetest/mocks/TeamStore.go

@@ -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
+	var r0 *model.AppError
-	if rf, ok := ret.Get(0).(func() store.StoreChannel); ok {
+	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)
 		}
 	}
 

store/storetest/team_store.go

@@ -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()
+	res := ss.Team().ResetAllTeamSchemes()
-	assert.Nil(t, res.Err)
+	assert.Nil(t, res)
 
 	t1, err = ss.Team().Get(t1.Id)
 	require.Nil(t, err)