feat: 增加客户端采购员归属管理 (#54)

This commit is contained in:
chengma
2026-08-09 16:02:25 +08:00
parent 0181170457
commit e0c0dac7a0
17 changed files with 766 additions and 37 deletions
+130
View File
@@ -2,6 +2,7 @@ package service
import (
"database/sql"
"errors"
"path/filepath"
"sync"
"testing"
@@ -252,6 +253,135 @@ func TestDeleteClients_批量删除(t *testing.T) {
}
}
// ── 采购员归属(#54)──────────────────────────────────
func prepareClientAssignmentUsers(t *testing.T, db *sql.DB) (*model.User, *model.User, *model.User) {
t.Helper()
now := time.Date(2026, 8, 9, 8, 0, 0, 0, time.UTC)
admin := prepareAdminUser(t, db, now)
for _, username := range []string{"buyer-a", "buyer-b"} {
if err := CreatePurchaser(db, admin, username, "buyer-password", "buyer-password", now); err != nil {
t.Fatalf("准备采购员 %s 失败: %v", username, err)
}
}
a, _ := repository.FindUserByUsername(db, "buyer-a")
b, _ := repository.FindUserByUsername(db, "buyer-b")
return admin, a, b
}
func TestClientAssignment_一人多客户端并按采购员隔离列表(t *testing.T) {
db := newTestDB(t)
admin, buyerA, buyerB := prepareClientAssignmentUsers(t, db)
RegisterClient(db, model.Client{ClientID: "c-1", Name: "一号机"}, true)
RegisterClient(db, model.Client{ClientID: "c-2", Name: "二号机"}, true)
now := time.Date(2026, 8, 9, 9, 0, 0, 0, time.UTC)
for _, clientID := range []string{"c-1", "c-2"} {
changed, transferred, err := AssignClient(db, admin, clientID, buyerA.UserID, now)
if err != nil || !changed || transferred {
t.Fatalf("绑定 %s 失败: changed=%t transferred=%t err=%v", clientID, changed, transferred, err)
}
}
aRows, err := ListClientViewsForUser(db, buyerA, "", time.Minute)
if err != nil || len(aRows) != 2 {
t.Fatalf("采购员 A 应看到两台客户端,rows=%+v err=%v", aRows, err)
}
bRows, err := ListAssignableClients(db, buyerB, time.Minute)
if err != nil || len(bRows) != 0 {
t.Fatalf("采购员 B 不应看到 A 的客户端,rows=%+v err=%v", bRows, err)
}
adminRows, _ := ListClientViewsForUser(db, admin, "", time.Minute)
if len(adminRows) != 2 || adminRows[0].AssignedUsername != "buyer-a" {
t.Fatalf("管理员应看到全部客户端及负责人,实际 %+v", adminRows)
}
}
func TestClientAssignment_转交解绑保留审计且不改任务(t *testing.T) {
db := newTestDB(t)
admin, buyerA, buyerB := prepareClientAssignmentUsers(t, db)
RegisterClient(db, model.Client{ClientID: "c-1", Name: "一号机"}, true)
insertTask(t, db, "TASK-KEEP", "c-1")
t1 := time.Date(2026, 8, 9, 9, 0, 0, 0, time.UTC)
t2 := t1.Add(time.Hour)
t3 := t2.Add(time.Hour)
if _, _, err := AssignClient(db, admin, "c-1", buyerA.UserID, t1); err != nil {
t.Fatal(err)
}
changed, transferred, err := AssignClient(db, admin, "c-1", buyerB.UserID, t2)
if err != nil || !changed || !transferred {
t.Fatalf("转交失败: changed=%t transferred=%t err=%v", changed, transferred, err)
}
if err := UnassignClient(db, admin, "c-1", t3); err != nil {
t.Fatalf("解绑失败: %v", err)
}
rows, err := db.Query(`SELECT user_id, started_at, ended_at, assigned_by_user_id,
ended_by_user_id, end_reason FROM client_user_assignments
WHERE client_id = 'c-1' ORDER BY started_at`)
if err != nil {
t.Fatal(err)
}
defer rows.Close()
type audit struct{ user, started, ended, assignedBy, endedBy, reason string }
audits := make([]audit, 0, 2)
for rows.Next() {
var a audit
if err := rows.Scan(&a.user, &a.started, &a.ended, &a.assignedBy, &a.endedBy, &a.reason); err != nil {
t.Fatal(err)
}
audits = append(audits, a)
}
if len(audits) != 2 || audits[0].reason != "transfer" || audits[1].reason != "unbind" {
t.Fatalf("归属历史不完整: %+v", audits)
}
for _, a := range audits {
if a.assignedBy != admin.UserID || a.endedBy != admin.UserID || a.ended == "" {
t.Errorf("操作管理员或结束时间未记录: %+v", a)
}
}
var assignedClient string
var status model.TaskStatus
if err := db.QueryRow(`SELECT assigned_client, status FROM tasks WHERE task_id = 'TASK-KEEP'`).Scan(&assignedClient, &status); err != nil {
t.Fatal(err)
}
if assignedClient != "c-1" || status != model.TaskAssigned {
t.Errorf("归属变化不应修改任务,client=%q status=%q", assignedClient, status)
}
}
func TestClientAssignment_权限禁用账号唯一约束及重新登记(t *testing.T) {
db := newTestDB(t)
admin, buyerA, buyerB := prepareClientAssignmentUsers(t, db)
RegisterClient(db, model.Client{ClientID: "c-1", Name: "一号机"}, true)
now := time.Date(2026, 8, 9, 9, 0, 0, 0, time.UTC)
if _, _, err := AssignClient(db, buyerA, "c-1", buyerB.UserID, now); !errors.Is(err, ErrAdminRequired) {
t.Fatalf("采购员不应有绑定权限,实际 %v", err)
}
if err := ChangeUserStatus(db, admin, buyerB.UserID, model.UserDisabled, now); err != nil {
t.Fatal(err)
}
if _, _, err := AssignClient(db, admin, "c-1", buyerB.UserID, now); !errors.Is(err, repository.ErrPurchaserNotActive) {
t.Fatalf("禁用采购员不应成为目标,实际 %v", err)
}
if _, _, err := AssignClient(db, admin, "c-1", buyerA.UserID, now); err != nil {
t.Fatal(err)
}
// 数据库索引是最后一道并发保护,直接插入第二条当前归属必须失败。
if _, err := db.Exec(`INSERT INTO client_user_assignments
(assignment_id, client_id, user_id, started_at, assigned_by_user_id)
VALUES ('duplicate', 'c-1', ?, ?, ?)`, buyerA.UserID, model.NowISO(), admin.UserID); err == nil {
t.Fatal("同一客户端插入第二个当前负责人应该被唯一索引拒绝")
}
if n, err := DeleteClients(db, []string{"c-1"}); err != nil || n != 1 {
t.Fatalf("删除客户端失败: n=%d err=%v", n, err)
}
RegisterClient(db, model.Client{ClientID: "c-1", Name: "重新登记的一号机"}, true)
views, err := ListClientViewsForUser(db, buyerA, "", time.Minute)
if err != nil || len(views) != 1 || views[0].AssignedUsername != "buyer-a" {
t.Fatalf("同编号重新登记后应恢复当前归属,views=%+v err=%v", views, err)
}
}
// ── 领取任务 ───────────────────────────────────────────
func TestClaimNextTask_没有任务返回nil(t *testing.T) {