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/temp_user.go
+15 -16
View File
@@ -4,7 +4,6 @@ import (
"context"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/models"
tempuser "github.com/grafana/grafana/pkg/services/temp_user"
)
@@ -20,7 +19,7 @@ func ProvideService(
}
}
func (s *Service) UpdateTempUserStatus(ctx context.Context, cmd *models.UpdateTempUserStatusCommand) error {
func (s *Service) UpdateTempUserStatus(ctx context.Context, cmd *tempuser.UpdateTempUserStatusCommand) error {
err := s.store.UpdateTempUserStatus(ctx, cmd)
if err != nil {
return err
@@ -28,15 +27,15 @@ func (s *Service) UpdateTempUserStatus(ctx context.Context, cmd *models.UpdateTe
return nil
}
func (s *Service) CreateTempUser(ctx context.Context, cmd *models.CreateTempUserCommand) error {
err := s.store.CreateTempUser(ctx, cmd)
func (s *Service) CreateTempUser(ctx context.Context, cmd *tempuser.CreateTempUserCommand) (*tempuser.TempUser, error) {
res, err := s.store.CreateTempUser(ctx, cmd)
if err != nil {
return err
return nil, err
}
return nil
return res, nil
}
func (s *Service) UpdateTempUserWithEmailSent(ctx context.Context, cmd *models.UpdateTempUserWithEmailSentCommand) error {
func (s *Service) UpdateTempUserWithEmailSent(ctx context.Context, cmd *tempuser.UpdateTempUserWithEmailSentCommand) error {
err := s.store.UpdateTempUserWithEmailSent(ctx, cmd)
if err != nil {
return err
@@ -44,23 +43,23 @@ func (s *Service) UpdateTempUserWithEmailSent(ctx context.Context, cmd *models.U
return nil
}
func (s *Service) GetTempUsersQuery(ctx context.Context, cmd *models.GetTempUsersQuery) error {
err := s.store.GetTempUsersQuery(ctx, cmd)
func (s *Service) GetTempUsersQuery(ctx context.Context, cmd *tempuser.GetTempUsersQuery) ([]*tempuser.TempUserDTO, error) {
res, err := s.store.GetTempUsersQuery(ctx, cmd)
if err != nil {
return err
return nil, err
}
return nil
return res, nil
}
func (s *Service) GetTempUserByCode(ctx context.Context, cmd *models.GetTempUserByCodeQuery) error {
err := s.store.GetTempUserByCode(ctx, cmd)
func (s *Service) GetTempUserByCode(ctx context.Context, cmd *tempuser.GetTempUserByCodeQuery) (*tempuser.TempUserDTO, error) {
res, err := s.store.GetTempUserByCode(ctx, cmd)
if err != nil {
return err
return nil, err
}
return nil
return res, nil
}
func (s *Service) ExpireOldUserInvites(ctx context.Context, cmd *models.ExpireTempUsersCommand) error {
func (s *Service) ExpireOldUserInvites(ctx context.Context, cmd *tempuser.ExpireTempUsersCommand) error {
err := s.store.ExpireOldUserInvites(ctx, cmd)
if err != nil {
return err