From f5b96a61d36e15189ee6b672264fac888bbf0ae6 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 4 Apr 2021 17:16:13 +0800
Subject: [PATCH] remove unused code

---
 pkg/api/users.go      |  1 -
 pkg/models/user.go    | 15 ---------------
 pkg/services/users.go |  4 ----
 3 files changed, 20 deletions(-)

diff --git a/pkg/api/users.go b/pkg/api/users.go
index 0f60a8e9..c0bdfc8b 100644
--- a/pkg/api/users.go
+++ b/pkg/api/users.go
@@ -128,7 +128,6 @@ func (a *UsersApi) UserUpdateProfileHandler(c *core.Context) (interface{}, *errs
 	userNew := &models.User{
 		Uid:   user.Uid,
 		Salt:  user.Salt,
-		Rands: user.Rands,
 	}
 
 	if userUpdateReq.Email != "" && userUpdateReq.Email != user.Email {
diff --git a/pkg/models/user.go b/pkg/models/user.go
index 9fcbb079..96457cdc 100644
--- a/pkg/models/user.go
+++ b/pkg/models/user.go
@@ -6,16 +6,6 @@ import (
 	"github.com/mayswind/lab/pkg/utils"
 )
 
-// UserType represents user type
-type UserType byte
-
-// User types
-const (
-	USER_TYPE_NORMAL      UserType = 0
-	USER_TYPE_ADMIN       UserType = 63
-	USER_TYPE_SUPER_ADMIN UserType = 127
-)
-
 // WeekDay represents week day
 type WeekDay byte
 
@@ -54,12 +44,9 @@ type User struct {
 	Nickname             string               `xorm:"VARCHAR(64) NOT NULL"`
 	Password             string               `xorm:"VARCHAR(64) NOT NULL"`
 	Salt                 string               `xorm:"VARCHAR(10) NOT NULL"`
-	Rands                string               `xorm:"VARCHAR(10) NOT NULL"`
-	Type                 UserType             `xorm:"TINYINT NOT NULL"`
 	DefaultCurrency      string               `xorm:"VARCHAR(3) NOT NULL"`
 	FirstDayOfWeek       WeekDay              `xorm:"TINYINT NOT NULL"`
 	TransactionEditScope TransactionEditScope `xorm:"TINYINT NOT NULL"`
-	IsAdmin              bool                 `xorm:"NOT NULL"`
 	Deleted              bool                 `xorm:"NOT NULL"`
 	EmailVerified        bool                 `xorm:"NOT NULL"`
 	CreatedUnixTime      int64
@@ -116,7 +103,6 @@ type UserProfileResponse struct {
 	Username             string               `json:"username"`
 	Email                string               `json:"email"`
 	Nickname             string               `json:"nickname"`
-	Type                 UserType             `json:"type"`
 	DefaultCurrency      string               `json:"defaultCurrency"`
 	FirstDayOfWeek       WeekDay              `json:"firstDayOfWeek"`
 	TransactionEditScope TransactionEditScope `json:"transactionEditScope"`
@@ -183,7 +169,6 @@ func (u *User) ToUserProfileResponse() *UserProfileResponse {
 		Username:             u.Username,
 		Email:                u.Email,
 		Nickname:             u.Nickname,
-		Type:                 u.Type,
 		DefaultCurrency:      u.DefaultCurrency,
 		FirstDayOfWeek:       u.FirstDayOfWeek,
 		TransactionEditScope: u.TransactionEditScope,
diff --git a/pkg/services/users.go b/pkg/services/users.go
index 73db01ca..301acfe1 100644
--- a/pkg/services/users.go
+++ b/pkg/services/users.go
@@ -134,10 +134,6 @@ func (s *UserService) CreateUser(user *models.User) error {
 		return err
 	}
 
-	if user.Rands, err = utils.GetRandomString(10); err != nil {
-		return err
-	}
-
 	user.Uid = s.GenerateUuid(uuid.UUID_TYPE_USER)
 	user.Password = utils.EncodePassword(user.Password, user.Salt)