IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Remove x from org (#46851)

Browse Source
This commit is contained in:
Kat Yang 2022-03-22 17:17:53 -04:00 committed by GitHub
parent 560fc9812d
commit 884c2351d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
pkg/services/sqlstore/org.go
View File

@ -26,56 +26,62 @@ func (ss *SQLStore) addOrgQueryAndCommandHandlers() {
} }
func (ss *SQLStore) SearchOrgs(ctx context.Context, query *models.SearchOrgsQuery) error { func (ss *SQLStore) SearchOrgs(ctx context.Context, query *models.SearchOrgsQuery) error {
query.Result = make([]*models.OrgDTO, 0) return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
sess := x.Table("org") query.Result = make([]*models.OrgDTO, 0)
if query.Query != "" { sess := dbSession.Table("org")
sess.Where("name LIKE ?", query.Query+"%") if query.Query != "" {
} sess.Where("name LIKE ?", query.Query+"%")
if query.Name != "" { }
sess.Where("name=?", query.Name) if query.Name != "" {
} sess.Where("name=?", query.Name)
}
if len(query.Ids) > 0 { if len(query.Ids) > 0 {
sess.In("id", query.Ids) sess.In("id", query.Ids)
} }
if query.Limit > 0 { if query.Limit > 0 {
sess.Limit(query.Limit, query.Limit*query.Page) sess.Limit(query.Limit, query.Limit*query.Page)
} }
sess.Cols("id", "name") sess.Cols("id", "name")
err := sess.Find(&query.Result) err := sess.Find(&query.Result)
return err return err
})
} }
func (ss *SQLStore) GetOrgById(ctx context.Context, query *models.GetOrgByIdQuery) error { func (ss *SQLStore) GetOrgById(ctx context.Context, query *models.GetOrgByIdQuery) error {
var org models.Org return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
exists, err := x.Id(query.Id).Get(&org) var org models.Org
if err != nil { exists, err := dbSession.ID(query.Id).Get(&org)
return err if err != nil {
} return err
}
if !exists { if !exists {
return models.ErrOrgNotFound return models.ErrOrgNotFound
} }
query.Result = &org query.Result = &org
return nil return nil
})
} }
func (ss *SQLStore) GetOrgByNameHandler(ctx context.Context, query *models.GetOrgByNameQuery) error { func (ss *SQLStore) GetOrgByNameHandler(ctx context.Context, query *models.GetOrgByNameQuery) error {
var org models.Org return ss.WithDbSession(ctx, func(dbSession *DBSession) error {
exists, err := x.Where("name=?", query.Name).Get(&org) var org models.Org
if err != nil { exists, err := dbSession.Where("name=?", query.Name).Get(&org)
return err if err != nil {
} return err
}
if !exists { if !exists {
return models.ErrOrgNotFound return models.ErrOrgNotFound
} }
query.Result = &org query.Result = &org
return nil return nil
})
} }
// GetOrgByName gets an organization by name. // GetOrgByName gets an organization by name.