public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: Move tempuser model to tempuser package (#61024)

Browse Source 
* Move tempuser model to tempuser package

* Add xorm tags for ID
This commit is contained in:
idafurjes
2023-01-06 09:02:05 +01:00
committed by GitHub
parent 8e8f498674
commit d1c9b308bc
10 changed files with 156 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/temp_user/tempuserimpl/store.go
+43 -29
View File
@@ -5,23 +5,23 @@ import (
"time"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/models"
tempuser "github.com/grafana/grafana/pkg/services/temp_user"
)
type store interface {
UpdateTempUserStatus(ctx context.Context, cmd *models.UpdateTempUserStatusCommand) error
CreateTempUser(ctx context.Context, cmd *models.CreateTempUserCommand) error
UpdateTempUserWithEmailSent(ctx context.Context, cmd *models.UpdateTempUserWithEmailSentCommand) error
GetTempUsersQuery(ctx context.Context, query *models.GetTempUsersQuery) error
GetTempUserByCode(ctx context.Context, query *models.GetTempUserByCodeQuery) error
ExpireOldUserInvites(ctx context.Context, cmd *models.ExpireTempUsersCommand) error
UpdateTempUserStatus(ctx context.Context, cmd *tempuser.UpdateTempUserStatusCommand) error
CreateTempUser(ctx context.Context, cmd *tempuser.CreateTempUserCommand) (*tempuser.TempUser, error)
UpdateTempUserWithEmailSent(ctx context.Context, cmd *tempuser.UpdateTempUserWithEmailSentCommand) error
GetTempUsersQuery(ctx context.Context, query *tempuser.GetTempUsersQuery) ([]*tempuser.TempUserDTO, error)
GetTempUserByCode(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error)
ExpireOldUserInvites(ctx context.Context, cmd *tempuser.ExpireTempUsersCommand) error
}
type xormStore struct {
db db.DB
}
func (ss *xormStore) UpdateTempUserStatus(ctx context.Context, cmd *models.UpdateTempUserStatusCommand) error {
func (ss *xormStore) UpdateTempUserStatus(ctx context.Context, cmd *tempuser.UpdateTempUserStatusCommand) error {
return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
var rawSQL = "UPDATE temp_user SET status=? WHERE code=?"
_, err := sess.Exec(rawSQL, string(cmd.Status), cmd.Code)
@@ -29,18 +29,19 @@ func (ss *xormStore) UpdateTempUserStatus(ctx context.Context, cmd *models.Updat
})
}
func (ss *xormStore) CreateTempUser(ctx context.Context, cmd *models.CreateTempUserCommand) error {
return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
func (ss *xormStore) CreateTempUser(ctx context.Context, cmd *tempuser.CreateTempUserCommand) (*tempuser.TempUser, error) {
var queryResult *tempuser.TempUser
err := ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
// create user
user := &models.TempUser{
user := &tempuser.TempUser{
Email: cmd.Email,
Name: cmd.Name,
OrgId: cmd.OrgId,
OrgID: cmd.OrgID,
Code: cmd.Code,
Role: cmd.Role,
Status: cmd.Status,
RemoteAddr: cmd.RemoteAddr,
InvitedByUserId: cmd.InvitedByUserId,
InvitedByUserID: cmd.InvitedByUserID,
EmailSentOn: time.Now(),
Created: time.Now().Unix(),
Updated: time.Now().Unix(),
@@ -50,15 +51,19 @@ func (ss *xormStore) CreateTempUser(ctx context.Context, cmd *models.CreateTempU
return err
}
cmd.Result = user
queryResult = user
return nil
})
if err != nil {
return nil, err
}
return queryResult, nil
}
func (ss *xormStore) UpdateTempUserWithEmailSent(ctx context.Context, cmd *models.UpdateTempUserWithEmailSentCommand) error {
func (ss *xormStore) UpdateTempUserWithEmailSent(ctx context.Context, cmd *tempuser.UpdateTempUserWithEmailSentCommand) error {
return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
user := &models.TempUser{
user := &tempuser.TempUser{
EmailSent: true,
EmailSentOn: time.Now(),
}
@@ -69,8 +74,9 @@ func (ss *xormStore) UpdateTempUserWithEmailSent(ctx context.Context, cmd *model
})
}
func (ss *xormStore) GetTempUsersQuery(ctx context.Context, query *models.GetTempUsersQuery) error {
return ss.db.WithDbSession(ctx, func(dbSess *db.Session) error {
func (ss *xormStore) GetTempUsersQuery(ctx context.Context, query *tempuser.GetTempUsersQuery) ([]*tempuser.TempUserDTO, error) {
queryResult := make([]*tempuser.TempUserDTO, 0)
err := ss.db.WithDbSession(ctx, func(dbSess *db.Session) error {
rawSQL := `SELECT
tu.id as id,
tu.org_id as org_id,
@@ -90,9 +96,9 @@ func (ss *xormStore) GetTempUsersQuery(ctx context.Context, query *models.GetTem
WHERE tu.status=?`
params := []interface{}{string(query.Status)}
if query.OrgId > 0 {
if query.OrgID > 0 {
rawSQL += ` AND tu.org_id=?`
params = append(params, query.OrgId)
params = append(params, query.OrgID)
}
if query.Email != "" {
@@ -102,15 +108,19 @@ func (ss *xormStore) GetTempUsersQuery(ctx context.Context, query *models.GetTem
rawSQL += " ORDER BY tu.created desc"
query.Result = make([]*models.TempUserDTO, 0)
sess := dbSess.SQL(rawSQL, params...)
err := sess.Find(&query.Result)
err := sess.Find(&queryResult)
return err
})
if err != nil {
return nil, err
}
return queryResult, nil
}
func (ss *xormStore) GetTempUserByCode(ctx context.Context, query *models.GetTempUserByCodeQuery) error {
return ss.db.WithDbSession(ctx, func(dbSess *db.Session) error {
func (ss *xormStore) GetTempUserByCode(ctx context.Context, query *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
var queryResult *tempuser.TempUserDTO
err := ss.db.WithDbSession(ctx, func(dbSess *db.Session) error {
var rawSQL = `SELECT
tu.id as id,
tu.org_id as org_id,
@@ -129,25 +139,29 @@ func (ss *xormStore) GetTempUserByCode(ctx context.Context, query *models.GetTem
LEFT OUTER JOIN ` + ss.db.GetDialect().Quote("user") + ` as u on u.id = tu.invited_by_user_id
WHERE tu.code=?`
var tempUser models.TempUserDTO
var tempUser tempuser.TempUserDTO
sess := dbSess.SQL(rawSQL, query.Code)
has, err := sess.Get(&tempUser)
if err != nil {
return err
} else if !has {
return models.ErrTempUserNotFound
return tempuser.ErrTempUserNotFound
}
query.Result = &tempUser
queryResult = &tempUser
return err
})
if err != nil {
return nil, err
}
return queryResult, nil
}
func (ss *xormStore) ExpireOldUserInvites(ctx context.Context, cmd *models.ExpireTempUsersCommand) error {
func (ss *xormStore) ExpireOldUserInvites(ctx context.Context, cmd *tempuser.ExpireTempUsersCommand) error {
return ss.db.WithTransactionalDbSession(ctx, func(sess *db.Session) error {
var rawSQL = "UPDATE temp_user SET status = ?, updated = ? WHERE created <= ? AND status in (?, ?)"
if result, err := sess.Exec(rawSQL, string(models.TmpUserExpired), time.Now().Unix(), cmd.OlderThan.Unix(), string(models.TmpUserSignUpStarted), string(models.TmpUserInvitePending)); err != nil {
if result, err := sess.Exec(rawSQL, string(tempuser.TmpUserExpired), time.Now().Unix(), cmd.OlderThan.Unix(), string(tempuser.TmpUserSignUpStarted), string(tempuser.TmpUserInvitePending)); err != nil {
return err
} else if cmd.NumExpired, err = result.RowsAffected(); err != nil {
return err