Migrate "Team.ClearAllCustomRoleAssignments" to Sync by default (#11587)

app/permissions.go

@@ -33,8 +33,8 @@ func (a *App) ResetPermissionsSystem() *model.AppError {
 	}
 
 	// Reset all Custom Role assignments to TeamMembers.
-	if result := <-a.Srv.Store.Team().ClearAllCustomRoleAssignments(); result.Err != nil {
+	if err := a.Srv.Store.Team().ClearAllCustomRoleAssignments(); err != nil {
-		return result.Err
+		return err
 	}
 
 	// Reset all Custom Role assignments to ChannelMembers.

store/sqlstore/team_store.go

@@ -886,62 +886,58 @@ func (s SqlTeamStore) InvalidateAllTeamIdsForUser(userId string) {
 	}
 }
 
-func (s SqlTeamStore) ClearAllCustomRoleAssignments() store.StoreChannel {
+func (s SqlTeamStore) ClearAllCustomRoleAssignments() *model.AppError {
-	return store.Do(func(result *store.StoreResult) {
-		builtInRoles := model.MakeDefaultRoles()
-		lastUserId := strings.Repeat("0", 26)
-		lastTeamId := strings.Repeat("0", 26)
 
-		for {
+	builtInRoles := model.MakeDefaultRoles()
-			var transaction *gorp.Transaction
+	lastUserId := strings.Repeat("0", 26)
-			var err error
+	lastTeamId := strings.Repeat("0", 26)
 
-			if transaction, err = s.GetMaster().Begin(); err != nil {
+	for {
-				result.Err = model.NewAppError("SqlTeamStore.ClearAllCustomRoleAssignments", "store.sql_team.clear_all_custom_role_assignments.open_transaction.app_error", nil, err.Error(), http.StatusInternalServerError)
+		var transaction *gorp.Transaction
-				return
+		var err error
-			}
-			defer finalizeTransaction(transaction)
 
-			var teamMembers []*teamMember
+		if transaction, err = s.GetMaster().Begin(); err != nil {
-			if _, err := transaction.Select(&teamMembers, "SELECT * from TeamMembers WHERE (TeamId, UserId) > (:TeamId, :UserId) ORDER BY TeamId, UserId LIMIT 1000", map[string]interface{}{"TeamId": lastTeamId, "UserId": lastUserId}); err != nil {
+			return model.NewAppError("SqlTeamStore.ClearAllCustomRoleAssignments", "store.sql_team.clear_all_custom_role_assignments.open_transaction.app_error", nil, err.Error(), http.StatusInternalServerError)
-				result.Err = model.NewAppError("SqlTeamStore.ClearAllCustomRoleAssignments", "store.sql_team.clear_all_custom_role_assignments.select.app_error", nil, err.Error(), http.StatusInternalServerError)
+		}
-				return
+		defer finalizeTransaction(transaction)
-			}
 
-			if len(teamMembers) == 0 {
+		var teamMembers []*teamMember
-				break
+		if _, err := transaction.Select(&teamMembers, "SELECT * from TeamMembers WHERE (TeamId, UserId) > (:TeamId, :UserId) ORDER BY TeamId, UserId LIMIT 1000", map[string]interface{}{"TeamId": lastTeamId, "UserId": lastUserId}); err != nil {
-			}
+			return model.NewAppError("SqlTeamStore.ClearAllCustomRoleAssignments", "store.sql_team.clear_all_custom_role_assignments.select.app_error", nil, err.Error(), http.StatusInternalServerError)
+		}
 
-			for _, member := range teamMembers {
+		if len(teamMembers) == 0 {
-				lastUserId = member.UserId
+			break
-				lastTeamId = member.TeamId
+		}
 
-				var newRoles []string
+		for _, member := range teamMembers {
+			lastUserId = member.UserId
+			lastTeamId = member.TeamId
 
-				for _, role := range strings.Fields(member.Roles) {
+			var newRoles []string
-					for name := range builtInRoles {
-						if name == role {
-							newRoles = append(newRoles, role)
-							break
-						}
-					}
-				}
 
-				newRolesString := strings.Join(newRoles, " ")
+			for _, role := range strings.Fields(member.Roles) {
-				if newRolesString != member.Roles {
+				for name := range builtInRoles {
-					if _, err := transaction.Exec("UPDATE TeamMembers SET Roles = :Roles WHERE UserId = :UserId AND TeamId = :TeamId", map[string]interface{}{"Roles": newRolesString, "TeamId": member.TeamId, "UserId": member.UserId}); err != nil {
+					if name == role {
-						result.Err = model.NewAppError("SqlTeamStore.ClearAllCustomRoleAssignments", "store.sql_team.clear_all_custom_role_assignments.update.app_error", nil, err.Error(), http.StatusInternalServerError)
+						newRoles = append(newRoles, role)
-						return
+						break
 					}
 				}
 			}
 
-			if err := transaction.Commit(); err != nil {
+			newRolesString := strings.Join(newRoles, " ")
-				result.Err = model.NewAppError("SqlTeamStore.ClearAllCustomRoleAssignments", "store.sql_team.clear_all_custom_role_assignments.commit_transaction.app_error", nil, err.Error(), http.StatusInternalServerError)
+			if newRolesString != member.Roles {
-				return
+				if _, err := transaction.Exec("UPDATE TeamMembers SET Roles = :Roles WHERE UserId = :UserId AND TeamId = :TeamId", map[string]interface{}{"Roles": newRolesString, "TeamId": member.TeamId, "UserId": member.UserId}); err != nil {
+					return model.NewAppError("SqlTeamStore.ClearAllCustomRoleAssignments", "store.sql_team.clear_all_custom_role_assignments.update.app_error", nil, err.Error(), http.StatusInternalServerError)
+				}
 			}
 		}
-	})
+
+		if err := transaction.Commit(); err != nil {
+			return model.NewAppError("SqlTeamStore.ClearAllCustomRoleAssignments", "store.sql_team.clear_all_custom_role_assignments.commit_transaction.app_error", nil, err.Error(), http.StatusInternalServerError)
+		}
+	}
+	return nil
 }
 
 func (s SqlTeamStore) AnalyticsGetTeamCountForScheme(schemeId string) store.StoreChannel {

store/store.go

@@ -118,7 +118,7 @@ type TeamStore interface {
 	GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, *model.AppError)
 	MigrateTeamMembers(fromTeamId string, fromUserId string) (map[string]string, *model.AppError)
 	ResetAllTeamSchemes() *model.AppError
-	ClearAllCustomRoleAssignments() StoreChannel
+	ClearAllCustomRoleAssignments() *model.AppError
 	AnalyticsGetTeamCountForScheme(schemeId string) StoreChannel
 	GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, *model.AppError)
 	GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, *model.AppError)

store/storetest/mocks/TeamStore.go

@@ -53,15 +53,15 @@ func (_m *TeamStore) AnalyticsTeamCount() (int64, *model.AppError) {
 }
 
 // ClearAllCustomRoleAssignments provides a mock function with given fields:
-func (_m *TeamStore) ClearAllCustomRoleAssignments() store.StoreChannel {
+func (_m *TeamStore) ClearAllCustomRoleAssignments() *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

@@ -1516,7 +1516,7 @@ func testTeamStoreClearAllCustomRoleAssignments(t *testing.T, ss store.Store) {
 	store.Must(ss.Team().SaveMember(m3, -1))
 	store.Must(ss.Team().SaveMember(m4, -1))
 
-	require.Nil(t, (<-ss.Team().ClearAllCustomRoleAssignments()).Err)
+	require.Nil(t, (ss.Team().ClearAllCustomRoleAssignments()))
 
 	r1, err := ss.Team().GetMember(m1.TeamId, m1.UserId)
 	require.Nil(t, err)