feat(tenant): 隔离客服通知文件与后台任务
This commit is contained in:
@@ -27,6 +27,7 @@ func NewRepository(db *gorm.DB) *Repository {
|
||||
// - 被租用需辅助:每个订单发一次,同一账号被反复租用会分别提醒;
|
||||
// - 上架未成交:同一账号只发一次。
|
||||
type Entry struct {
|
||||
TenantID uint64
|
||||
UserID uint64
|
||||
Phone string
|
||||
Node string
|
||||
@@ -48,11 +49,17 @@ func Enqueue(tx *gorm.DB, entry Entry) (bool, error) {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
tenantID := entry.TenantID
|
||||
phone := strings.TrimSpace(entry.Phone)
|
||||
if phone == "" {
|
||||
if phone == "" || tenantID == 0 {
|
||||
var user model.User
|
||||
if err := tx.Select("id", "phone").First(&user, entry.UserID).Error; err == nil {
|
||||
phone = strings.TrimSpace(user.Phone)
|
||||
if err := tx.Select("id", "phone", "tenant_id").First(&user, entry.UserID).Error; err == nil {
|
||||
if phone == "" {
|
||||
phone = strings.TrimSpace(user.Phone)
|
||||
}
|
||||
if tenantID == 0 {
|
||||
tenantID = user.TenantID
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -66,6 +73,7 @@ func Enqueue(tx *gorm.DB, entry Entry) (bool, error) {
|
||||
}
|
||||
|
||||
row := model.SmsMessage{
|
||||
TenantID: tenantID,
|
||||
UserID: entry.UserID,
|
||||
Phone: phone,
|
||||
Node: node,
|
||||
|
||||
@@ -82,6 +82,44 @@ func TestEnqueueIgnoresUnknownNodeAndMissingUser(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnqueueDerivesAndDeduplicatesByTenant(t *testing.T) {
|
||||
db := newSmsTestDB(t)
|
||||
tenantA := model.Tenant{Code: "sms-a", Name: "短信 A", Status: "active"}
|
||||
tenantB := model.Tenant{Code: "sms-b", Name: "短信 B", Status: "active"}
|
||||
if err := db.Create(&tenantA).Error; err != nil {
|
||||
t.Fatalf("创建租户 A: %v", err)
|
||||
}
|
||||
if err := db.Create(&tenantB).Error; err != nil {
|
||||
t.Fatalf("创建租户 B: %v", err)
|
||||
}
|
||||
userA := model.User{TenantID: tenantA.ID, Phone: "13600000001"}
|
||||
userB := model.User{TenantID: tenantB.ID, Phone: "13600000002"}
|
||||
if err := db.Create(&userA).Error; err != nil {
|
||||
t.Fatalf("创建用户 A: %v", err)
|
||||
}
|
||||
if err := db.Create(&userB).Error; err != nil {
|
||||
t.Fatalf("创建用户 B: %v", err)
|
||||
}
|
||||
for _, userID := range []uint64{userA.ID, userB.ID} {
|
||||
inserted, err := Enqueue(db, Entry{
|
||||
UserID: userID,
|
||||
Node: NodeListingReviewRejected,
|
||||
BizType: "listing",
|
||||
BizID: 7001,
|
||||
})
|
||||
if err != nil || !inserted {
|
||||
t.Fatalf("Enqueue(%d) inserted=%v err=%v", userID, inserted, err)
|
||||
}
|
||||
}
|
||||
var rows []model.SmsMessage
|
||||
if err := db.Where("node = ? AND biz_id = ?", NodeListingReviewRejected, 7001).Order("id ASC").Find(&rows).Error; err != nil {
|
||||
t.Fatalf("查询短信: %v", err)
|
||||
}
|
||||
if len(rows) != 2 || rows[0].TenantID != tenantA.ID || rows[1].TenantID != tenantB.ID {
|
||||
t.Fatalf("短信租户隔离异常: %+v", rows)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRepositoryStatusTransitions(t *testing.T) {
|
||||
db := newSmsTestDB(t)
|
||||
ctx := context.Background()
|
||||
|
||||
Reference in New Issue
Block a user