refactor(db): add `Users.Update` (#7263)

5 files changed, 181 insertions, 56 deletions

diff --git a/internal/route/lfs/mocks_test.go b/internal/route/lfs/mocks_test.go
index a1e89f85..07dfbecb 100644
--- a/internal/route/lfs/mocks_test.go
+++ b/internal/route/lfs/mocks_test.go
@@ -2331,6 +2331,9 @@ type MockUsersStore struct {
 	// ListFollowingsFunc is an instance of a mock function object
 	// controlling the behavior of the method ListFollowings.
 	ListFollowingsFunc *UsersStoreListFollowingsFunc
+	// UpdateFunc is an instance of a mock function object controlling the
+	// behavior of the method Update.
+	UpdateFunc *UsersStoreUpdateFunc
 	// UseCustomAvatarFunc is an instance of a mock function object
 	// controlling the behavior of the method UseCustomAvatar.
 	UseCustomAvatarFunc *UsersStoreUseCustomAvatarFunc
@@ -2386,7 +2389,7 @@ func NewMockUsersStore() *MockUsersStore {
 			},
 		},
 		IsUsernameUsedFunc: &UsersStoreIsUsernameUsedFunc{
-			defaultHook: func(context.Context, string) (r0 bool) {
+			defaultHook: func(context.Context, string, int64) (r0 bool) {
 				return
 			},
 		},
@@ -2405,6 +2408,11 @@ func NewMockUsersStore() *MockUsersStore {
 				return
 			},
 		},
+		UpdateFunc: &UsersStoreUpdateFunc{
+			defaultHook: func(context.Context, int64, db.UpdateUserOptions) (r0 error) {
+				return
+			},
+		},
 		UseCustomAvatarFunc: &UsersStoreUseCustomAvatarFunc{
 			defaultHook: func(context.Context, int64, []byte) (r0 error) {
 				return
@@ -2463,7 +2471,7 @@ func NewStrictMockUsersStore() *MockUsersStore {
 			},
 		},
 		IsUsernameUsedFunc: &UsersStoreIsUsernameUsedFunc{
-			defaultHook: func(context.Context, string) bool {
+			defaultHook: func(context.Context, string, int64) bool {
 				panic("unexpected invocation of MockUsersStore.IsUsernameUsed")
 			},
 		},
@@ -2482,6 +2490,11 @@ func NewStrictMockUsersStore() *MockUsersStore {
 				panic("unexpected invocation of MockUsersStore.ListFollowings")
 			},
 		},
+		UpdateFunc: &UsersStoreUpdateFunc{
+			defaultHook: func(context.Context, int64, db.UpdateUserOptions) error {
+				panic("unexpected invocation of MockUsersStore.Update")
+			},
+		},
 		UseCustomAvatarFunc: &UsersStoreUseCustomAvatarFunc{
 			defaultHook: func(context.Context, int64, []byte) error {
 				panic("unexpected invocation of MockUsersStore.UseCustomAvatar")
@@ -2533,6 +2546,9 @@ func NewMockUsersStoreFrom(i db.UsersStore) *MockUsersStore {
 		ListFollowingsFunc: &UsersStoreListFollowingsFunc{
 			defaultHook: i.ListFollowings,
 		},
+		UpdateFunc: &UsersStoreUpdateFunc{
+			defaultHook: i.Update,
+		},
 		UseCustomAvatarFunc: &UsersStoreUseCustomAvatarFunc{
 			defaultHook: i.UseCustomAvatar,
 		},
@@ -3518,24 +3534,24 @@ func (c UsersStoreHasForkedRepositoryFuncCall) Results() []interface{} {
 // UsersStoreIsUsernameUsedFunc describes the behavior when the
 // IsUsernameUsed method of the parent MockUsersStore instance is invoked.
 type UsersStoreIsUsernameUsedFunc struct {
-	defaultHook func(context.Context, string) bool
-	hooks       []func(context.Context, string) bool
+	defaultHook func(context.Context, string, int64) bool
+	hooks       []func(context.Context, string, int64) bool
 	history     []UsersStoreIsUsernameUsedFuncCall
 	mutex       sync.Mutex
 }
 
 // IsUsernameUsed delegates to the next hook function in the queue and
 // stores the parameter and result values of this invocation.
-func (m *MockUsersStore) IsUsernameUsed(v0 context.Context, v1 string) bool {
-	r0 := m.IsUsernameUsedFunc.nextHook()(v0, v1)
-	m.IsUsernameUsedFunc.appendCall(UsersStoreIsUsernameUsedFuncCall{v0, v1, r0})
+func (m *MockUsersStore) IsUsernameUsed(v0 context.Context, v1 string, v2 int64) bool {
+	r0 := m.IsUsernameUsedFunc.nextHook()(v0, v1, v2)
+	m.IsUsernameUsedFunc.appendCall(UsersStoreIsUsernameUsedFuncCall{v0, v1, v2, r0})
 	return r0
 }
 
 // SetDefaultHook sets function that is called when the IsUsernameUsed
 // method of the parent MockUsersStore instance is invoked and the hook
 // queue is empty.
-func (f *UsersStoreIsUsernameUsedFunc) SetDefaultHook(hook func(context.Context, string) bool) {
+func (f *UsersStoreIsUsernameUsedFunc) SetDefaultHook(hook func(context.Context, string, int64) bool) {
 	f.defaultHook = hook
 }
 
@@ -3543,7 +3559,7 @@ func (f *UsersStoreIsUsernameUsedFunc) SetDefaultHook(hook func(context.Context,
 // IsUsernameUsed method of the parent MockUsersStore instance invokes the
 // hook at the front of the queue and discards it. After the queue is empty,
 // the default hook function is invoked for any future action.
-func (f *UsersStoreIsUsernameUsedFunc) PushHook(hook func(context.Context, string) bool) {
+func (f *UsersStoreIsUsernameUsedFunc) PushHook(hook func(context.Context, string, int64) bool) {
 	f.mutex.Lock()
 	f.hooks = append(f.hooks, hook)
 	f.mutex.Unlock()
@@ -3552,19 +3568,19 @@ func (f *UsersStoreIsUsernameUsedFunc) PushHook(hook func(context.Context, strin
 // SetDefaultReturn calls SetDefaultHook with a function that returns the
 // given values.
 func (f *UsersStoreIsUsernameUsedFunc) SetDefaultReturn(r0 bool) {
-	f.SetDefaultHook(func(context.Context, string) bool {
+	f.SetDefaultHook(func(context.Context, string, int64) bool {
 		return r0
 	})
 }
 
 // PushReturn calls PushHook with a function that returns the given values.
 func (f *UsersStoreIsUsernameUsedFunc) PushReturn(r0 bool) {
-	f.PushHook(func(context.Context, string) bool {
+	f.PushHook(func(context.Context, string, int64) bool {
 		return r0
 	})
 }
 
-func (f *UsersStoreIsUsernameUsedFunc) nextHook() func(context.Context, string) bool {
+func (f *UsersStoreIsUsernameUsedFunc) nextHook() func(context.Context, string, int64) bool {
 	f.mutex.Lock()
 	defer f.mutex.Unlock()
 
@@ -3603,6 +3619,9 @@ type UsersStoreIsUsernameUsedFuncCall struct {
 	// Arg1 is the value of the 2nd argument passed to this method
 	// invocation.
 	Arg1 string
+	// Arg2 is the value of the 3rd argument passed to this method
+	// invocation.
+	Arg2 int64
 	// Result0 is the value of the 1st result returned from this method
 	// invocation.
 	Result0 bool
@@ -3611,7 +3630,7 @@ type UsersStoreIsUsernameUsedFuncCall struct {
 // Args returns an interface slice containing the arguments of this
 // invocation.
 func (c UsersStoreIsUsernameUsedFuncCall) Args() []interface{} {
-	return []interface{}{c.Arg0, c.Arg1}
+	return []interface{}{c.Arg0, c.Arg1, c.Arg2}
 }
 
 // Results returns an interface slice containing the results of this
@@ -3958,6 +3977,113 @@ func (c UsersStoreListFollowingsFuncCall) Results() []interface{} {
 	return []interface{}{c.Result0, c.Result1}
 }
 
+// UsersStoreUpdateFunc describes the behavior when the Update method of the
+// parent MockUsersStore instance is invoked.
+type UsersStoreUpdateFunc struct {
+	defaultHook func(context.Context, int64, db.UpdateUserOptions) error
+	hooks       []func(context.Context, int64, db.UpdateUserOptions) error
+	history     []UsersStoreUpdateFuncCall
+	mutex       sync.Mutex
+}
+
+// Update delegates to the next hook function in the queue and stores the
+// parameter and result values of this invocation.
+func (m *MockUsersStore) Update(v0 context.Context, v1 int64, v2 db.UpdateUserOptions) error {
+	r0 := m.UpdateFunc.nextHook()(v0, v1, v2)
+	m.UpdateFunc.appendCall(UsersStoreUpdateFuncCall{v0, v1, v2, r0})
+	return r0
+}
+
+// SetDefaultHook sets function that is called when the Update method of the
+// parent MockUsersStore instance is invoked and the hook queue is empty.
+func (f *UsersStoreUpdateFunc) SetDefaultHook(hook func(context.Context, int64, db.UpdateUserOptions) error) {
+	f.defaultHook = hook
+}
+
+// PushHook adds a function to the end of hook queue. Each invocation of the
+// Update method of the parent MockUsersStore instance invokes the hook at
+// the front of the queue and discards it. After the queue is empty, the
+// default hook function is invoked for any future action.
+func (f *UsersStoreUpdateFunc) PushHook(hook func(context.Context, int64, db.UpdateUserOptions) error) {
+	f.mutex.Lock()
+	f.hooks = append(f.hooks, hook)
+	f.mutex.Unlock()
+}
+
+// SetDefaultReturn calls SetDefaultHook with a function that returns the
+// given values.
+func (f *UsersStoreUpdateFunc) SetDefaultReturn(r0 error) {
+	f.SetDefaultHook(func(context.Context, int64, db.UpdateUserOptions) error {
+		return r0
+	})
+}
+
+// PushReturn calls PushHook with a function that returns the given values.
+func (f *UsersStoreUpdateFunc) PushReturn(r0 error) {
+	f.PushHook(func(context.Context, int64, db.UpdateUserOptions) error {
+		return r0
+	})
+}
+
+func (f *UsersStoreUpdateFunc) nextHook() func(context.Context, int64, db.UpdateUserOptions) error {
+	f.mutex.Lock()
+	defer f.mutex.Unlock()
+
+	if len(f.hooks) == 0 {
+		return f.defaultHook
+	}
+
+	hook := f.hooks[0]
+	f.hooks = f.hooks[1:]
+	return hook
+}
+
+func (f *UsersStoreUpdateFunc) appendCall(r0 UsersStoreUpdateFuncCall) {
+	f.mutex.Lock()
+	f.history = append(f.history, r0)
+	f.mutex.Unlock()
+}
+
+// History returns a sequence of UsersStoreUpdateFuncCall objects describing
+// the invocations of this function.
+func (f *UsersStoreUpdateFunc) History() []UsersStoreUpdateFuncCall {
+	f.mutex.Lock()
+	history := make([]UsersStoreUpdateFuncCall, len(f.history))
+	copy(history, f.history)
+	f.mutex.Unlock()
+
+	return history
+}
+
+// UsersStoreUpdateFuncCall is an object that describes an invocation of
+// method Update on an instance of MockUsersStore.
+type UsersStoreUpdateFuncCall struct {
+	// Arg0 is the value of the 1st argument passed to this method
+	// invocation.
+	Arg0 context.Context
+	// Arg1 is the value of the 2nd argument passed to this method
+	// invocation.
+	Arg1 int64
+	// Arg2 is the value of the 3rd argument passed to this method
+	// invocation.
+	Arg2 db.UpdateUserOptions
+	// Result0 is the value of the 1st result returned from this method
+	// invocation.
+	Result0 error
+}
+
+// Args returns an interface slice containing the arguments of this
+// invocation.
+func (c UsersStoreUpdateFuncCall) Args() []interface{} {
+	return []interface{}{c.Arg0, c.Arg1, c.Arg2}
+}
+
+// Results returns an interface slice containing the results of this
+// invocation.
+func (c UsersStoreUpdateFuncCall) Results() []interface{} {
+	return []interface{}{c.Result0}
+}
+
 // UsersStoreUseCustomAvatarFunc describes the behavior when the
 // UseCustomAvatar method of the parent MockUsersStore instance is invoked.
 type UsersStoreUseCustomAvatarFunc struct {
diff --git a/internal/route/org/setting.go b/internal/route/org/setting.go
index f3e65b9b..bcef4ea1 100644
--- a/internal/route/org/setting.go
+++ b/internal/route/org/setting.go
@@ -5,8 +5,6 @@
 package org
 
 import (
-	"strings"
-
 	"github.com/pkg/errors"
 	log "unknwon.dev/clog/v2"
 
@@ -40,43 +38,47 @@ func SettingsPost(c *context.Context, f form.UpdateOrgSetting) {
 
 	org := c.Org.Organization
 
-	// Check if organization name has been changed.
-	if org.LowerName != strings.ToLower(f.Name) {
-		if db.Users.IsUsernameUsed(c.Req.Context(), f.Name) {
-			c.Data["OrgName"] = true
-			c.RenderWithErr(c.Tr("form.username_been_taken"), SETTINGS_OPTIONS, &f)
-			return
-		} else if err := db.Users.ChangeUsername(c.Req.Context(), org.ID, f.Name); err != nil {
+	// Check if the organization username (including cases) had been changed
+	if org.Name != f.Name {
+		err := db.Users.ChangeUsername(c.Req.Context(), c.Org.Organization.ID, f.Name)
+		if err != nil {
 			c.Data["OrgName"] = true
+			var msg string
 			switch {
+			case db.IsErrUserAlreadyExist(errors.Cause(err)):
+				msg = c.Tr("form.username_been_taken")
 			case db.IsErrNameNotAllowed(errors.Cause(err)):
-				c.RenderWithErr(c.Tr("user.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value()), SETTINGS_OPTIONS, &f)
+				msg = c.Tr("user.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value())
 			default:
 				c.Error(err, "change organization name")
+				return
 			}
+
+			c.RenderWithErr(msg, SETTINGS_OPTIONS, &f)
 			return
 		}
+
 		// reset c.org.OrgLink with new name
 		c.Org.OrgLink = conf.Server.Subpath + "/org/" + f.Name
 		log.Trace("Organization name changed: %s -> %s", org.Name, f.Name)
 	}
-	// In case it's just a case change.
-	org.Name = f.Name
-	org.LowerName = strings.ToLower(f.Name)
 
+	opts := db.UpdateUserOptions{
+		FullName:        f.FullName,
+		Website:         f.Website,
+		Location:        f.Location,
+		Description:     f.Description,
+		MaxRepoCreation: org.MaxRepoCreation,
+	}
 	if c.User.IsAdmin {
-		org.MaxRepoCreation = f.MaxRepoCreation
+		opts.MaxRepoCreation = f.MaxRepoCreation
 	}
-
-	org.FullName = f.FullName
-	org.Description = f.Description
-	org.Website = f.Website
-	org.Location = f.Location
-	if err := db.UpdateUser(org); err != nil {
-		c.Error(err, "update user")
+	err := db.Users.Update(c.Req.Context(), c.User.ID, opts)
+	if err != nil {
+		c.Error(err, "update organization")
 		return
 	}
-	log.Trace("Organization setting updated: %s", org.Name)
+
 	c.Flash.Success(c.Tr("org.settings.update_setting_success"))
 	c.Redirect(c.Org.OrgLink + "/settings")
 }
diff --git a/internal/route/repo/setting.go b/internal/route/repo/setting.go
index cd87769a..e5e4fe6f 100644
--- a/internal/route/repo/setting.go
+++ b/internal/route/repo/setting.go
@@ -225,7 +225,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) {
 		}
 
 		newOwner := c.Query("new_owner_name")
-		if !db.Users.IsUsernameUsed(c.Req.Context(), newOwner) {
+		if !db.Users.IsUsernameUsed(c.Req.Context(), newOwner, c.Repo.Owner.ID) {
 			c.RenderWithErr(c.Tr("form.enterred_invalid_owner_name"), SETTINGS_OPTIONS, nil)
 			return
 		}
diff --git a/internal/route/user/auth.go b/internal/route/user/auth.go
index 86cf1f2e..1977fe17 100644
--- a/internal/route/user/auth.go
+++ b/internal/route/user/auth.go
@@ -439,7 +439,7 @@ func verifyActiveEmailCode(code, email string) *db.EmailAddress {
 		data := com.ToStr(user.ID) + email + user.LowerName + user.Password + user.Rands
 
 		if tool.VerifyTimeLimitCode(data, minutes, prefix) {
-			emailAddress, err := db.EmailAddresses.GetByEmail(gocontext.TODO(), email)
+			emailAddress, err := db.EmailAddresses.GetByEmail(gocontext.TODO(), email, false)
 			if err == nil {
 				return emailAddress
 			}
diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go
index 2924a8f0..fbb7c9ae 100644
--- a/internal/route/user/setting.go
+++ b/internal/route/user/setting.go
@@ -11,7 +11,6 @@ import (
 	"html/template"
 	"image/png"
 	"io"
-	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/pquerna/otp"
@@ -69,9 +68,10 @@ func SettingsPost(c *context.Context, f form.UpdateProfile) {
 
 	// Non-local users are not allowed to change their username
 	if c.User.IsLocal() {
-		// Check if username characters have been changed
-		if c.User.LowerName != strings.ToLower(f.Name) {
-			if err := db.Users.ChangeUsername(c.Req.Context(), c.User.ID, f.Name); err != nil {
+		// Check if the username (including cases) had been changed
+		if c.User.Name != f.Name {
+			err := db.Users.ChangeUsername(c.Req.Context(), c.User.ID, f.Name)
+			if err != nil {
 				c.FormErr("Name")
 				var msg string
 				switch {
@@ -90,23 +90,20 @@ func SettingsPost(c *context.Context, f form.UpdateProfile) {
 
 			log.Trace("Username changed: %s -> %s", c.User.Name, f.Name)
 		}
-
-		// In case it's just a case change
-		c.User.Name = f.Name
-		c.User.LowerName = strings.ToLower(f.Name)
 	}
 
-	c.User.FullName = f.FullName
-	c.User.Email = f.Email
-	c.User.Website = f.Website
-	c.User.Location = f.Location
-	if err := db.UpdateUser(c.User); err != nil {
-		if db.IsErrEmailAlreadyUsed(err) {
-			msg := c.Tr("form.email_been_used")
-			c.RenderWithErr(msg, SETTINGS_PROFILE, &f)
-			return
-		}
-		c.Errorf(err, "update user")
+	err := db.Users.Update(
+		c.Req.Context(),
+		c.User.ID,
+		db.UpdateUserOptions{
+			FullName:        f.FullName,
+			Website:         f.Website,
+			Location:        f.Location,
+			MaxRepoCreation: c.User.MaxRepoCreation,
+		},
+	)
+	if err != nil {
+		c.Error(err, "update user")
 		return
 	}