优化

internal/biz/user.go

@@ -38,6 +38,8 @@ type UserListFilter struct {
 type UserRepo interface {
 	FindUserByUsername(context.Context, string) (*User, error)
 	FindUserByID(context.Context, uint) (*User, error)
+	FindUserByUUID(context.Context, string) (*User, error)
+	HasAuthorityMenu(context.Context, uint, string) (bool, error)
 	MenusByAuthority(context.Context, uint) ([]*Menu, error)
 	ListUsers(context.Context, int, int, *UserListFilter) ([]*User, int64, error)
 	CreateUser(context.Context, *User) (*User, error)
@@ -77,23 +79,29 @@ func (uc *UserUsecase) User(ctx context.Context, id uint) (*User, error) {
 	return user, nil
 }
 
-func (uc *UserUsecase) fallbackDefaultRouter(ctx context.Context, user *User) {
-	if user == nil || user.Authority.DefaultRouter == "" {
-		return
-	}
-	menus, err := uc.repo.MenusByAuthority(ctx, user.AuthorityID)
-	if err != nil || !menuNameExists(menus, user.Authority.DefaultRouter) {
-		user.Authority.DefaultRouter = "404"
+// UserByUUID resolves the identity from the UUID embedded in the JWT rather
+// than from the mutable numeric ID used by administrative records.
+func (uc *UserUsecase) UserByUUID(ctx context.Context, uuid string) (*User, error) {
+	user, err := uc.repo.FindUserByUUID(ctx, uuid)
+	if err != nil {
+		return nil, err
 	}
+	_ = uc.repo.FillDepartmentNamePaths(ctx, user)
+	uc.fallbackDefaultRouter(ctx, user)
+	return user, nil
 }
 
-func menuNameExists(menus []*Menu, name string) bool {
-	for _, menu := range menus {
-		if menu.Name == name || menuNameExists(menu.Children, name) {
-			return true
-		}
+func (uc *UserUsecase) fallbackDefaultRouter(ctx context.Context, user *User) {
+	if user == nil {
+		return
+	}
+	hasMenu, err := uc.repo.HasAuthorityMenu(ctx, user.AuthorityID, user.Authority.DefaultRouter)
+	if err != nil {
+		return
+	}
+	if !hasMenu {
+		user.Authority.DefaultRouter = "404"
 	}
-	return false
 }
 
 func (uc *UserUsecase) Menus(ctx context.Context, authorityID uint) ([]*Menu, error) {
@@ -104,10 +112,6 @@ func (uc *UserUsecase) ListUsers(ctx context.Context, page, pageSize int, filter
 	return uc.repo.ListUsers(ctx, page, pageSize, filter)
 }
 func (uc *UserUsecase) CreateUser(ctx context.Context, user *User, authorityIDs []uint) (*User, error) {
-	if user.AuthorityID == 0 && len(authorityIDs) > 0 {
-		user.AuthorityID = authorityIDs[0]
-	}
-	authorityIDs = includeAuthority(authorityIDs, user.AuthorityID)
 	hash, err := bcrypt.GenerateFromPassword([]byte(user.Password), bcrypt.DefaultCost)
 	if err != nil {
 		return nil, err
@@ -132,17 +136,6 @@ func (uc *UserUsecase) UpdateSelfUser(ctx context.Context, user *User) error {
 	return uc.repo.UpdateSelfUser(ctx, user)
 }
 
-func includeAuthority(ids []uint, primary uint) []uint {
-	if primary == 0 {
-		return ids
-	}
-	for _, id := range ids {
-		if id == primary {
-			return ids
-		}
-	}
-	return append(ids, primary)
-}
 func (uc *UserUsecase) DeleteUser(ctx context.Context, id uint) error {
 	return uc.repo.DeleteUser(ctx, id)
 }