refactor: enhance tag sanitization and user validation logic

Author: fightingBald

apps/product-query-svc/domain/product.go

@@ -91,12 +91,29 @@ func (p *Product) RemoveTag(tag string) {
 
 // replaceTags 重建标签列表（调用方负责去重复构建）。
 func (p *Product) replaceTags(tags []string) error {
+	sanitized, err := sanitizeTags(tags)
+	if err != nil {
+		return err
+	}
+	p.Tags = sanitized
+	return nil
+}
+
+// errValidation 构造带细节的校验错误。
+func errValidation(msg string) error {
+	return errors.Join(ErrValidation, errors.New(msg))
+}
+
+func equalFold(a, b string) bool {
+	return strings.EqualFold(strings.TrimSpace(a), strings.TrimSpace(b))
+}
+
+func sanitizeTags(tags []string) ([]string, error) {
 	if len(tags) == 0 {
-		p.Tags = nil
-		return nil
+		return nil, nil
 	}
 	seen := make(map[string]struct{}, len(tags))
-	out := outBuffer(len(tags))
+	sanitized := make([]string, 0, len(tags))
 	for _, raw := range tags {
 		cleaned := strings.TrimSpace(raw)
 		if cleaned == "" {
@@ -107,27 +124,13 @@ func (p *Product) replaceTags(tags []string) error {
 			continue
 		}
 		seen[key] = struct{}{}
-		out = append(out, cleaned)
-		if len(out) > maxTags {
-			return errValidation("tags exceed limit")
+		sanitized = append(sanitized, cleaned)
+		if len(sanitized) > maxTags {
+			return nil, errValidation("tags exceed limit")
 		}
 	}
-	p.Tags = out
-	return nil
-}
-
-// errValidation 构造带细节的校验错误。
-func errValidation(msg string) error {
-	return errors.Join(ErrValidation, errors.New(msg))
-}
-
-func equalFold(a, b string) bool {
-	return strings.EqualFold(strings.TrimSpace(a), strings.TrimSpace(b))
-}
-
-func outBuffer(capacity int) []string {
-	if capacity < 0 {
-		capacity = 0
+	if len(sanitized) == 0 {
+		return nil, nil
 	}
-	return make([]string, 0, capacity)
+	return sanitized, nil
 }

apps/product-query-svc/domain/users.go

@@ -1,19 +1,15 @@
 package domain
 
 import (
-	"errors"
 	"regexp"
+	"strings"
 	"time"
 )
 
-var (
-	ErrEmailValidation = errors.New("email validation error")
-)
+var emailRegexp = regexp.MustCompile(`^[a-zA-Z0-9._%+\-]+@[a-zA-Z0-9.\-]+\.[a-zA-Z]{2,}$`)
 
 func IsValidEmail(email string) bool {
-	// 这是一个常用的简化正则，够用 90% 场景
-	re := regexp.MustCompile(`^[a-zA-Z0-9._%+\-]+@[a-zA-Z0-9.\-]+\.[a-zA-Z]{2,}$`)
-	return re.MatchString(email)
+	return emailRegexp.MatchString(strings.TrimSpace(email))
 }
 
 type User struct {
@@ -24,25 +20,36 @@ type User struct {
 }
 
 func NewUser(name string, email string) (*User, error) {
-	u := &User{Name: name, Email: email, CreatedAt: time.Now()}
+	u := &User{
+		Name:      strings.TrimSpace(name),
+		Email:     strings.TrimSpace(email),
+		CreatedAt: time.Now().UTC(),
+	}
 
 	if err := u.Validate(); err != nil {
-		return nil, ErrValidation
+		return nil, err
 	}
 
 	return u, nil
 }
 
 func (u *User) Validate() error {
-	if IsValidEmail(u.Email) {
-		return ErrValidation
+	if u.Name == "" {
+		return errValidation("name required")
+	}
+	if !IsValidEmail(u.Email) {
+		return errValidation("invalid email format")
 	}
 	return nil
 }
 
 //TODO how to avoid a same email could create several account
 
 func (u *User) ChangeName(newName string) error {
-	u.Name = newName
+	cleaned := strings.TrimSpace(newName)
+	if cleaned == "" {
+		return errValidation("name required")
+	}
+	u.Name = cleaned
 	return nil
 }