TeamStore migration Part 3 (#15397)

* Migration completed

* TODO

app/syncables.go

@@ -204,23 +204,20 @@ func (a *App) SyncSyncableRoles(syncableID string, syncableType model.GroupSynca
 		mlog.Any("permitted_admins", permittedAdmins),
 	)
 
-	var updateFunc func(string, []string) *model.AppError
-
 	switch syncableType {
 	case model.GroupSyncableTypeTeam:
-		updateFunc = a.Srv().Store.Team().UpdateMembersRole
+		nErr := a.Srv().Store.Team().UpdateMembersRole(syncableID, permittedAdmins)
+		if nErr != nil {
+			// TODO: Should we change the key "store.update_error" to "app.update_error"? It is very general and changing it now will modify lots of files
+			return model.NewAppError("SyncSyncableRoles", "store.update_error", nil, nErr.Error(), http.StatusInternalServerError)
+		}
+
+		return nil
 	case model.GroupSyncableTypeChannel:
-		updateFunc = a.Srv().Store.Channel().UpdateMembersRole
+		return a.Srv().Store.Channel().UpdateMembersRole(syncableID, permittedAdmins)
 	default:
 		return model.NewAppError("App.SyncSyncableRoles", "groups.unsupported_syncable_type", map[string]interface{}{"Value": syncableType}, "", http.StatusInternalServerError)
 	}
-
-	err = updateFunc(syncableID, permittedAdmins)
-	if err != nil {
-		return err
-	}
-
-	return nil
 }
 
 // SyncRolesAndMembership updates the SchemeAdmin status and membership of all of the members of the given