Migrate Groups store to sync by default (GetGroups and Counts) (#10998)

app/group.go

@@ -150,41 +150,33 @@ func (a *App) ChannelMembersToRemove() ([]*model.ChannelMember, *model.AppError)
 }
 
 func (a *App) GetGroupsByChannel(channelId string, opts model.GroupSearchOpts) ([]*model.Group, int, *model.AppError) {
-	result := <-a.Srv.Store.Group().GetGroupsByChannel(channelId, opts)
-	if result.Err != nil {
-		return nil, 0, result.Err
+	groups, err := a.Srv.Store.Group().GetGroupsByChannel(channelId, opts)
+	if err != nil {
+		return nil, 0, err
 	}
-	groups := result.Data.([]*model.Group)
 
-	result = <-a.Srv.Store.Group().CountGroupsByChannel(channelId, opts)
-	if result.Err != nil {
-		return nil, 0, result.Err
+	count, err := a.Srv.Store.Group().CountGroupsByChannel(channelId, opts)
+	if err != nil {
+		return nil, 0, err
 	}
-	count := result.Data.(int64)
 
 	return groups, int(count), nil
 }
 
 func (a *App) GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) ([]*model.Group, int, *model.AppError) {
-	result := <-a.Srv.Store.Group().GetGroupsByTeam(teamId, opts)
-	if result.Err != nil {
-		return nil, 0, result.Err
+	groups, err := a.Srv.Store.Group().GetGroupsByTeam(teamId, opts)
+	if err != nil {
+		return nil, 0, err
 	}
-	groups := result.Data.([]*model.Group)
 
-	result = <-a.Srv.Store.Group().CountGroupsByTeam(teamId, opts)
-	if result.Err != nil {
-		return nil, 0, result.Err
+	count, err := a.Srv.Store.Group().CountGroupsByTeam(teamId, opts)
+	if err != nil {
+		return nil, 0, err
 	}
-	count := result.Data.(int64)
 
 	return groups, int(count), nil
 }
 
 func (a *App) GetGroups(page, perPage int, opts model.GroupSearchOpts) ([]*model.Group, *model.AppError) {
-	result := <-a.Srv.Store.Group().GetGroups(page, perPage, opts)
-	if result.Err != nil {
-		return nil, result.Err
-	}
-	return result.Data.([]*model.Group), nil
+	return a.Srv.Store.Group().GetGroups(page, perPage, opts)
 }