forked from longtao.wu/droboticflow
Contract step of the account-phone-login expand-migrate-contract rollout. Phone is now the sole account identifier end to end: - domain.UserRecord/CreateUserInput: delete Email, drop Phone's omitempty (required going forward). - store: delete email_unique Mongo index; phone_unique is now non-sparse (unique, not sparse) since every account creation path requires a phone. Delete FindUserByEmail, ensureUserEmailAvailableLocked, and ErrDuplicateUserEmail (confirmed dead via grep - all real call sites were already migrated to the *Phone equivalents by tickets 01-03). Mongo duplicate-key fallback and the account-mutation-guard's stale-write snapshot/filter now key off Phone instead of Email. - api: drop the now-impossible ErrDuplicateUserEmail branch in renderUserMutationError. The account-hierarchy audit endpoint and the supplier-deletion receipt struct both switch their identifying field from Email to Phone, since both are populated fresh from current account state (not frozen historical snapshots) - continuing to read a "email" key would silently go blank for every account created after this change. - frontend: src/types.ts User.phone is now required (email removed); AccountHierarchyIssue.email -> .phone in services/api/users.ts and pages/Users.tsx to match the backend audit endpoint's renamed field. - Rewrote the wide blast radius of Go test fixtures that constructed users by email across internal/api/*_test.go and internal/store/*_test.go, including the two dedicated memory-store uniqueness tests (merged into phone-only equivalents) and several opt-in "live" acceptance-fixture tests gated behind env vars for real Fanyu deployments. Repo-wide grep of Go and TS/TSX for Email/email/邮箱 turned up no remaining account-identifier references outside of a few harmless test-only cosmetic labels (e.g. "Email Tenant" as an org display name in a seed helper) and assertions that explicitly check "邮箱" text is absent from API responses. go build/vet clean. go test ./internal/api/... ./internal/store/... ./internal/domain/... : 75 failures, identical test names to the pre-ticket-05 baseline (diffed against a throwaway worktree at the prior tip). npm run lint:web (tsc --noEmit) clean. npm run test:frontend: 599/586/13, matching the stated baseline exactly. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
57 lines
2.2 KiB
Go
57 lines
2.2 KiB
Go
package api
|
|
|
|
import (
|
|
"errors"
|
|
"net/http"
|
|
|
|
"droboticflow/internal/store"
|
|
)
|
|
|
|
func renderOrganizationMutationError(writer http.ResponseWriter, err error) {
|
|
if errors.Is(err, store.ErrDuplicateOrganizationSlug) {
|
|
renderValidationError(writer, validationIssue{Field: "slug", Message: "slug must be unique"})
|
|
return
|
|
}
|
|
renderError(writer, http.StatusInternalServerError, err)
|
|
}
|
|
|
|
func renderUserMutationError(writer http.ResponseWriter, err error) {
|
|
if errors.Is(err, store.ErrAccountDeleted) {
|
|
renderJSON(writer, http.StatusGone, map[string]string{"error": "账号已删除,不能修改或重新启用", "code": "account_deleted"})
|
|
return
|
|
}
|
|
if errors.Is(err, store.ErrSupplierDeleting) {
|
|
renderJSON(writer, 409, map[string]string{"error": "供应商正在删除,不能更新账号"})
|
|
return
|
|
}
|
|
if errors.Is(err, store.ErrAccountMutationBusy) {
|
|
renderJSON(writer, 409, map[string]string{"error": "账号正在更新,请稍后重试;持续失败请管理员检查未完成操作"})
|
|
return
|
|
}
|
|
if errors.Is(err, store.ErrAccountPendingTasks) {
|
|
renderJSON(writer, 409, map[string]string{"error": "该账号有未完成的已领取任务,请先处理任务后再修改角色"})
|
|
return
|
|
}
|
|
if errors.Is(err, store.ErrSupplierUnavailable) {
|
|
renderJSON(writer, 409, map[string]string{"error": "供应商已失效,请刷新后重新选择"})
|
|
return
|
|
}
|
|
if errors.Is(err, store.ErrUserMutationConflict) {
|
|
renderJSON(writer, http.StatusConflict, map[string]string{"code": "user_changed", "error": "账号已被其他操作修改,请刷新后重试"})
|
|
return
|
|
}
|
|
if errors.Is(err, store.ErrLastActiveAdmin) {
|
|
renderJSON(writer, http.StatusConflict, map[string]string{"code": "last_active_admin", "error": "至少保留一个可登录的管理员,请先创建或启用另一管理员"})
|
|
return
|
|
}
|
|
if errors.Is(err, store.ErrSupplierImmutable) {
|
|
renderJSON(writer, http.StatusConflict, map[string]string{"code": "supplier_immutable", "error": "员工供应商创建后不可更改"})
|
|
return
|
|
}
|
|
if errors.Is(err, store.ErrDuplicateUserPhone) {
|
|
renderValidationError(writer, validationIssue{Field: "phone", Message: "phone must be unique"})
|
|
return
|
|
}
|
|
renderError(writer, http.StatusInternalServerError, err)
|
|
}
|