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

* Move tempuser model to tempuser package * Add xorm tags for ID
2023-01-06 09:02:05 +01:00
parent 8e8f498674
commit d1c9b308bc
10 changed files with 156 additions and 140 deletions
@@ -1,105 +0,0 @@
-package models
-
-import (
-	"errors"
-	"time"
-
-	"github.com/grafana/grafana/pkg/services/org"
-)
-
-// Typed errors
-var (
-	ErrTempUserNotFound = errors.New("user not found")
-)
-
-type TempUserStatus string
-
-const (
-	TmpUserSignUpStarted TempUserStatus = "SignUpStarted"
-	TmpUserInvitePending TempUserStatus = "InvitePending"
-	TmpUserCompleted     TempUserStatus = "Completed"
-	TmpUserRevoked       TempUserStatus = "Revoked"
-	TmpUserExpired       TempUserStatus = "Expired"
-)
-
-// TempUser holds data for org invites and unconfirmed sign ups
-type TempUser struct {
-	Id              int64
-	OrgId           int64
-	Version         int
-	Email           string
-	Name            string
-	Role            org.RoleType
-	InvitedByUserId int64
-	Status          TempUserStatus
-
-	EmailSent   bool
-	EmailSentOn time.Time
-	Code        string
-	RemoteAddr  string
-
-	Created int64
-	Updated int64
-}
-
-// ---------------------
-// COMMANDS
-
-type CreateTempUserCommand struct {
-	Email           string
-	Name            string
-	OrgId           int64
-	InvitedByUserId int64
-	Status          TempUserStatus
-	Code            string
-	Role            org.RoleType
-	RemoteAddr      string
-
-	Result *TempUser
-}
-
-type UpdateTempUserStatusCommand struct {
-	Code   string
-	Status TempUserStatus
-}
-
-type ExpireTempUsersCommand struct {
-	OlderThan time.Time
-
-	NumExpired int64
-}
-
-type UpdateTempUserWithEmailSentCommand struct {
-	Code string
-}
-
-type GetTempUsersQuery struct {
-	OrgId  int64
-	Email  string
-	Status TempUserStatus
-
-	Result []*TempUserDTO
-}
-
-type GetTempUserByCodeQuery struct {
-	Code string
-
-	Result *TempUserDTO
-}
-
-type TempUserDTO struct {
-	Id             int64          `json:"id"`
-	OrgId          int64          `json:"orgId"`
-	Name           string         `json:"name"`
-	Email          string         `json:"email"`
-	Role           org.RoleType   `json:"role"`
-	InvitedByLogin string         `json:"invitedByLogin"`
-	InvitedByEmail string         `json:"invitedByEmail"`
-	InvitedByName  string         `json:"invitedByName"`
-	Code           string         `json:"code"`
-	Status         TempUserStatus `json:"status"`
-	Url            string         `json:"url"`
-	EmailSent      bool           `json:"emailSent"`
-	EmailSentOn    time.Time      `json:"emailSentOn"`
-	Created        time.Time      `json:"createdOn"`
-}