refactor: shorten model and table prefixes

This commit is contained in:
2026-07-23 14:30:17 +08:00
parent 6e7be2f3a4
commit 0ca2898ac0
71 changed files with 707 additions and 638 deletions

View File

@@ -24,7 +24,7 @@ func TestUpdateLocksTaskBeforeProjectValidation(t *testing.T) {
func TestShareObjectLocksTaskBeforeObjectValidation(t *testing.T) {
database, _, project, task := newTaskLockFixture(t)
note := models.SenlinAgentNote{ProjectID: project.ID, CreatedBy: task.CreatedBy, Title: "Context", Markdown: "Private"}
note := models.SaNote{ProjectID: project.ID, CreatedBy: task.CreatedBy, Title: "Context", Markdown: "Private"}
require.NoError(t, database.Create(&note).Error)
queries := captureTaskQueryOrder(t, database)
@@ -38,8 +38,8 @@ func TestShareObjectLocksTaskBeforeObjectValidation(t *testing.T) {
func TestAssigneeOnlySeesExplicitlySharedObjects(t *testing.T) {
database := newTestDB(t)
assigneeID := uint(2)
task := models.SenlinAgentTask{ProjectID: 1, CreatedBy: 1, AssigneeID: &assigneeID, Title: "处理合同"}
note := models.SenlinAgentNote{ProjectID: 1, CreatedBy: 1, Title: "合同背景", Markdown: "只在共享后可见"}
task := models.SaTask{ProjectID: 1, CreatedBy: 1, AssigneeID: &assigneeID, Title: "处理合同"}
note := models.SaNote{ProjectID: 1, CreatedBy: 1, Title: "合同背景", Markdown: "只在共享后可见"}
require.NoError(t, database.Create(&task).Error)
require.NoError(t, database.Create(&note).Error)
service := NewService()
@@ -67,8 +67,8 @@ func TestShareObjectRejectsUnsupportedType(t *testing.T) {
func TestShareObjectRejectsObjectFromAnotherProject(t *testing.T) {
database := newTestDB(t)
task := models.SenlinAgentTask{ProjectID: 1, CreatedBy: 1, Title: "Review"}
note := models.SenlinAgentNote{ProjectID: 2, CreatedBy: 1, Title: "Other project", Markdown: "Private context"}
task := models.SaTask{ProjectID: 1, CreatedBy: 1, Title: "Review"}
note := models.SaNote{ProjectID: 2, CreatedBy: 1, Title: "Other project", Markdown: "Private context"}
require.NoError(t, database.Create(&task).Error)
require.NoError(t, database.Create(&note).Error)
service := NewService()
@@ -80,15 +80,15 @@ func TestShareObjectRejectsObjectFromAnotherProject(t *testing.T) {
func TestAssignResolvesIdentityAndTaskDTOReflectsReassignment(t *testing.T) {
database := newTestDB(t)
owner := models.SenlinAgentUser{Email: "owner@example.com", DisplayName: "Owner", PasswordHash: "hash"}
first := models.SenlinAgentUser{Email: "first@example.com", DisplayName: "First", PasswordHash: "hash"}
second := models.SenlinAgentUser{Email: "second@example.com", DisplayName: "Second", PasswordHash: "hash"}
owner := models.SaUser{Email: "owner@example.com", DisplayName: "Owner", PasswordHash: "hash"}
first := models.SaUser{Email: "first@example.com", DisplayName: "First", PasswordHash: "hash"}
second := models.SaUser{Email: "second@example.com", DisplayName: "Second", PasswordHash: "hash"}
require.NoError(t, database.Create(&owner).Error)
require.NoError(t, database.Create(&first).Error)
require.NoError(t, database.Create(&second).Error)
project := models.SenlinAgentProject{OwnerID: owner.ID, Name: "Alpha", Identifier: "ALPHA"}
project := models.SaProject{OwnerID: owner.ID, Name: "Alpha", Identifier: "ALPHA"}
require.NoError(t, database.Create(&project).Error)
task := models.SenlinAgentTask{ProjectID: project.ID, CreatedBy: owner.ID, Title: "安排评审", Status: "open"}
task := models.SaTask{ProjectID: project.ID, CreatedBy: owner.ID, Title: "安排评审", Status: "open"}
require.NoError(t, database.Create(&task).Error)
service := NewService(database)
@@ -102,7 +102,7 @@ func TestAssignResolvesIdentityAndTaskDTOReflectsReassignment(t *testing.T) {
require.NoError(t, err)
require.Equal(t, second.Identity, *reassigned.AssigneeID)
var event models.SenlinAgentProjectEvent
var event models.SaProjectEvent
require.NoError(t, database.Where("project_id = ? AND entity_type = ? AND entity_id = ?", project.ID, "task", task.ID).Order("id desc").First(&event).Error)
require.Equal(t, "task_assigned", event.EventType)
}
@@ -116,14 +116,14 @@ func newTestDB(t *testing.T) *gorm.DB {
return database
}
func newTaskLockFixture(t *testing.T) (*gorm.DB, models.SenlinAgentUser, models.SenlinAgentProject, models.SenlinAgentTask) {
func newTaskLockFixture(t *testing.T) (*gorm.DB, models.SaUser, models.SaProject, models.SaTask) {
t.Helper()
database := newTestDB(t)
owner := models.SenlinAgentUser{Email: "lock-owner@example.com", DisplayName: "Owner", PasswordHash: "hash"}
owner := models.SaUser{Email: "lock-owner@example.com", DisplayName: "Owner", PasswordHash: "hash"}
require.NoError(t, database.Create(&owner).Error)
project := models.SenlinAgentProject{OwnerID: owner.ID, Name: "Lock", Identifier: "LOCK"}
project := models.SaProject{OwnerID: owner.ID, Name: "Lock", Identifier: "LOCK"}
require.NoError(t, database.Create(&project).Error)
task := models.SenlinAgentTask{ProjectID: project.ID, CreatedBy: owner.ID, Title: "Lock me", Status: "open"}
task := models.SaTask{ProjectID: project.ID, CreatedBy: owner.ID, Title: "Lock me", Status: "open"}
require.NoError(t, database.Create(&task).Error)
return database, owner, project, task
}
@@ -138,11 +138,11 @@ func captureTaskQueryOrder(t *testing.T, database *gorm.DB) *[]string {
if tx.Statement.Schema != nil {
table = tx.Statement.Schema.Table
}
if table != (models.SenlinAgentTask{}).TableName() && table != (models.SenlinAgentProject{}).TableName() {
if table != (models.SaTask{}).TableName() && table != (models.SaProject{}).TableName() {
return
}
entry := "project"
if table == (models.SenlinAgentTask{}).TableName() {
if table == (models.SaTask{}).TableName() {
entry = "task"
if _, ok := tx.Statement.Clauses["FOR"]; ok {
entry += ":locked"