IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-08-18 17:15:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bus: Tests cleanup (#46025)

Browse Source 
* Delete unused bus from usagestats

* Few updates to remove bus from searchusers test

* Fix import
This commit is contained in:
Selene
2022-03-02 11:05:31 +01:00
committed by GitHub
parent 5eaf6509c0
commit 2e6f14d17f
6 changed files with 45 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/searchusers/searchusers.go
+5 -5
View File
@@ -3,8 +3,8 @@ package searchusers
import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/sqlstore"
)
type Service interface {
@@ -13,12 +13,12 @@ type Service interface {
}
type OSSService struct {
bus bus.Bus
sqlStore sqlstore.Store
searchUserFilter models.SearchUserFilter
}
func ProvideUsersService(bus bus.Bus, searchUserFilter models.SearchUserFilter) *OSSService {
return &OSSService{bus: bus, searchUserFilter: searchUserFilter}
func ProvideUsersService(sqlStore sqlstore.Store, searchUserFilter models.SearchUserFilter) *OSSService {
return &OSSService{sqlStore: sqlStore, searchUserFilter: searchUserFilter}
}
func (s *OSSService) SearchUsers(c *models.ReqContext) response.Response {
@@ -60,7 +60,7 @@ func (s *OSSService) SearchUser(c *models.ReqContext) (*models.SearchUsersQuery,
}
query := &models.SearchUsersQuery{Query: searchQuery, Filters: filters, Page: page, Limit: perPage}
if err := s.bus.Dispatch(c.Req.Context(), query); err != nil {
if err := s.sqlStore.SearchUsers(c.Req.Context(), query); err != nil {
return nil, err
}