Bug: Rollback change in search (#55443)

pull/53655/head^2
idafurjes 3 years ago committed by GitHub
parent cb93ed04a7
commit eff4daacaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      pkg/services/searchV2/service.go
  2. 1
      pkg/services/sqlstore/store.go

@ -102,14 +102,14 @@ func (s *StandardSearchService) IsDisabled() bool {
} }
func (s *StandardSearchService) Run(ctx context.Context) error { func (s *StandardSearchService) Run(ctx context.Context) error {
orgQuery := &org.SearchOrgsQuery{} orgQuery := &models.SearchOrgsQuery{}
result, err := s.orgService.Search(ctx, orgQuery) err := s.sql.SearchOrgs(ctx, orgQuery)
if err != nil { if err != nil {
return fmt.Errorf("can't get org list: %w", err) return fmt.Errorf("can't get org list: %w", err)
} }
orgIDs := make([]int64, 0, len(result)) orgIDs := make([]int64, 0, len(orgQuery.Result))
for _, org := range result { for _, org := range orgQuery.Result {
orgIDs = append(orgIDs, org.ID) orgIDs = append(orgIDs, org.Id)
} }
return s.dashboardIndex.run(ctx, orgIDs, s.reIndexCh) return s.dashboardIndex.run(ctx, orgIDs, s.reIndexCh)
} }

@ -63,6 +63,7 @@ type Store interface {
Reset() error Reset() error
Quote(value string) string Quote(value string) string
GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error GetDBHealthQuery(ctx context.Context, query *models.GetDBHealthQuery) error
SearchOrgs(ctx context.Context, query *models.SearchOrgsQuery) error
IsAdminOfTeams(ctx context.Context, query *models.IsAdminOfTeamsQuery) error IsAdminOfTeams(ctx context.Context, query *models.IsAdminOfTeamsQuery) error
GetSqlxSession() *session.SessionDB GetSqlxSession() *session.SessionDB
} }

Loading…
Cancel
Save