Chore: Copy methods from sqlstore to org store (#55615)
* Chore: Copy methods from sqlstore to org store * Rename method, add test * Add comments of tests
This commit is contained in:
@@ -2,6 +2,8 @@ package orgimpl
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
"github.com/grafana/grafana/pkg/events"
|
||||
@@ -24,6 +26,9 @@ type store interface {
|
||||
// TO BE REFACTORED - move logic to service methods and leave CRUD methods for store
|
||||
UpdateAddress(context.Context, *org.UpdateOrgAddressCommand) error
|
||||
Delete(context.Context, *org.DeleteOrgCommand) error
|
||||
GetUserOrgList(context.Context, *org.GetUserOrgListQuery) ([]*org.UserOrgDTO, error)
|
||||
Search(context.Context, *org.SearchOrgsQuery) ([]*org.OrgDTO, error)
|
||||
CreateWithMember(context.Context, *org.CreateOrgCommand) (*org.Org, error)
|
||||
}
|
||||
|
||||
type sqlStore struct {
|
||||
@@ -217,3 +222,100 @@ func (ss *sqlStore) Delete(ctx context.Context, cmd *org.DeleteOrgCommand) error
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
// TODO: refactor move logic to service method
|
||||
func (ss *sqlStore) GetUserOrgList(ctx context.Context, query *org.GetUserOrgListQuery) ([]*org.UserOrgDTO, error) {
|
||||
result := make([]*org.UserOrgDTO, 0)
|
||||
err := ss.db.WithDbSession(ctx, func(dbSess *sqlstore.DBSession) error {
|
||||
sess := dbSess.Table("org_user")
|
||||
sess.Join("INNER", "org", "org_user.org_id=org.id")
|
||||
sess.Join("INNER", ss.dialect.Quote("user"), fmt.Sprintf("org_user.user_id=%s.id", ss.dialect.Quote("user")))
|
||||
sess.Where("org_user.user_id=?", query.UserID)
|
||||
sess.Where(ss.notServiceAccountFilter())
|
||||
sess.Cols("org.name", "org_user.role", "org_user.org_id")
|
||||
sess.OrderBy("org.name")
|
||||
err := sess.Find(&result)
|
||||
sort.Sort(org.ByOrgName(result))
|
||||
return err
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (ss *sqlStore) notServiceAccountFilter() string {
|
||||
return fmt.Sprintf("%s.is_service_account = %s",
|
||||
ss.dialect.Quote("user"),
|
||||
ss.dialect.BooleanStr(false))
|
||||
}
|
||||
|
||||
func (ss *sqlStore) Search(ctx context.Context, query *org.SearchOrgsQuery) ([]*org.OrgDTO, error) {
|
||||
result := make([]*org.OrgDTO, 0)
|
||||
err := ss.db.WithDbSession(ctx, func(dbSession *sqlstore.DBSession) error {
|
||||
sess := dbSession.Table("org")
|
||||
if query.Query != "" {
|
||||
sess.Where("name LIKE ?", query.Query+"%")
|
||||
}
|
||||
if query.Name != "" {
|
||||
sess.Where("name=?", query.Name)
|
||||
}
|
||||
|
||||
if len(query.IDs) > 0 {
|
||||
sess.In("id", query.IDs)
|
||||
}
|
||||
|
||||
if query.Limit > 0 {
|
||||
sess.Limit(query.Limit, query.Limit*query.Page)
|
||||
}
|
||||
|
||||
sess.Cols("id", "name")
|
||||
err := sess.Find(&result)
|
||||
return err
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return result, nil
|
||||
}
|
||||
|
||||
// CreateWithMember creates an organization with a certain name and a certain user as member.
|
||||
func (ss *sqlStore) CreateWithMember(ctx context.Context, cmd *org.CreateOrgCommand) (*org.Org, error) {
|
||||
orga := org.Org{
|
||||
Name: cmd.Name,
|
||||
Created: time.Now(),
|
||||
Updated: time.Now(),
|
||||
}
|
||||
if err := ss.db.WithTransactionalDbSession(ctx, func(sess *sqlstore.DBSession) error {
|
||||
if isNameTaken, err := isOrgNameTaken(cmd.Name, 0, sess); err != nil {
|
||||
return err
|
||||
} else if isNameTaken {
|
||||
return models.ErrOrgNameTaken
|
||||
}
|
||||
|
||||
if _, err := sess.Insert(&orga); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
user := org.OrgUser{
|
||||
OrgID: orga.ID,
|
||||
UserID: cmd.UserID,
|
||||
Role: org.RoleAdmin,
|
||||
Created: time.Now(),
|
||||
Updated: time.Now(),
|
||||
}
|
||||
|
||||
_, err := sess.Insert(&user)
|
||||
|
||||
sess.PublishAfterCommit(&events.OrgCreated{
|
||||
Timestamp: orga.Created,
|
||||
Id: orga.ID,
|
||||
Name: orga.Name,
|
||||
})
|
||||
|
||||
return err
|
||||
}); err != nil {
|
||||
return &orga, err
|
||||
}
|
||||
return &orga, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user