senlinai/agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(backend): harden final MVP invariants

Browse Source
This commit is contained in:
yanweidong
2026-07-22 01:24:41 +08:00
parent 251b212e06
commit 78d4845688
26 changed files with 977 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
backend/internal/logic/projects/dashboard.go
View File

@@ -1,24 +0,0 @@
package projects
import "senlinai-agent/backend/internal/models"
// Dashboard 保留旧概览查询给尚未迁移的 handler；所有统计仍严格限定项目所有者。
func (s *Service) Dashboard(ownerID uint, projectID uint) (Dashboard, error) {
if err := ensureProjectOwner(ownerID, projectID); err != nil {
return Dashboard{}, err
}
dashboard := Dashboard{ProjectID: projectID}
if err := models.DBService.Model(&models.SenlinAgentInboxItem{}).Where("project_id = ? AND status = ?", projectID, "open").Count(&dashboard.PendingInboxCount).Error; err != nil {
return dashboard, err
}
if err := models.DBService.Model(&models.SenlinAgentTask{}).Where("project_id = ? AND status <> ?", projectID, "done").Count(&dashboard.OpenTaskCount).Error; err != nil {
return dashboard, err
}
if err := models.DBService.Model(&models.SenlinAgentNote{}).Where("project_id = ?", projectID).Count(&dashboard.RecentNoteCount).Error; err != nil {
return dashboard, err
}
if err := models.DBService.Model(&models.SenlinAgentAISession{}).Where("project_id = ?", projectID).Count(&dashboard.RecentSessionCount).Error; err != nil {
return dashboard, err
}
return dashboard, nil
}

8
backend/internal/logic/projects/dto.go
View File

@@ -41,14 +41,6 @@ type CreateCronPlanInput struct {
NextRunAt *time.Time
}
type Dashboard struct {
ProjectID uint `json:"project_id"`
PendingInboxCount int64 `json:"pending_inbox_count"`
OpenTaskCount int64 `json:"open_task_count"`
RecentNoteCount int64 `json:"recent_note_count"`
RecentSessionCount int64 `json:"recent_session_count"`
}
// WorkspaceDTO 是项目工作区首屏聚合响应，所有数据库对象均以公开 identity 关联。
type WorkspaceDTO struct {
Project WorkspaceProjectDTO `json:"project"`

44
backend/internal/logic/projects/object_crud.go
View File

@@ -3,8 +3,10 @@ package projects
import (
"errors"
"strings"
"time"
"gorm.io/gorm"
"gorm.io/gorm/clause"
"senlinai-agent/backend/internal/models"
)
@@ -28,7 +30,7 @@ func (s *Service) CreateCronPlan(ownerID uint, projectID uint, input CreateCronP
}
plan := &models.SenlinAgentCronPlan{
ProjectID: projectID, CreatedBy: ownerID, Title: title, Schedule: schedule,
Enabled: input.Enabled, NextRunAt: input.NextRunAt, LastResult: "Not run yet",
Enabled: input.Enabled, NextRunAt: input.NextRunAt,
}
return plan, models.DBService.Create(plan).Error
}
@@ -45,16 +47,40 @@ func (s *Service) CreateTag(projectID uint, name string) (*models.SenlinAgentTag
if name == "" {
return nil, ErrTagNameRequired
}
var existing models.SenlinAgentTag
err := models.DBService.Where("project_id = ? AND name = ?", projectID, name).First(&existing).Error
if err == nil {
return &existing, nil
var lastErr error
for attempt := 0; attempt < 5; attempt++ {
candidate := models.SenlinAgentTag{ProjectID: projectID, Name: name}
lastErr = models.DBService.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "project_id"}, {Name: "name"}},
DoNothing: true,
}).Create(&candidate).Error
if lastErr == nil {
var stored models.SenlinAgentTag
lastErr = models.DBService.Where("project_id = ? AND name = ?", projectID, name).First(&stored).Error
if lastErr == nil {
return &stored, nil
}
}
if !retryableTagWrite(lastErr) {
return nil, lastErr
}
time.Sleep(time.Duration(attempt+1) * time.Millisecond)
}
if !errors.Is(err, gorm.ErrRecordNotFound) {
return nil, err
return nil, lastErr
}
func retryableTagWrite(err error) bool {
if errors.Is(err, gorm.ErrDuplicatedKey) || errors.Is(err, gorm.ErrRecordNotFound) || strings.Contains(strings.ToLower(err.Error()), "database is locked") {
return true
}
tag := &models.SenlinAgentTag{ProjectID: projectID, Name: name}
return tag, models.DBService.Create(tag).Error
var sqlState interface{ SQLState() string }
if errors.As(err, &sqlState) {
switch sqlState.SQLState() {
case "40001", "40P01", "55P03":
return true
}
}
return false
}
func (s *Service) ListProjectTags(ownerID uint, projectID uint) ([]models.SenlinAgentTag, error) {

93
backend/internal/logic/projects/service_test.go
View File

@@ -3,6 +3,9 @@ package projects
import (
"errors"
"fmt"
"path/filepath"
"sync"
"sync/atomic"
"testing"
"time"
@@ -11,6 +14,7 @@ import (
"github.com/stretchr/testify/require"
"gorm.io/driver/postgres"
"gorm.io/gorm"
"gorm.io/gorm/logger"
"senlinai-agent/backend/internal/models"
)
@@ -106,36 +110,6 @@ func TestCreateProjectPersistsWorkspaceMetadata(t *testing.T) {
require.Equal(t, "RSS 采集和线索沉淀", workspace.Project.Description)
}
func TestDashboardCountsOnlyRequestedProject(t *testing.T) {
database := newTestDB(t)
service := NewService()
first, err := service.CreateProject(1, "Alpha", "")
require.NoError(t, err)
second, err := service.CreateProject(1, "Beta", "")
require.NoError(t, err)
require.NoError(t, database.Create(&models.SenlinAgentInboxItem{ProjectID: first.ID, CreatedBy: 1, SourceType: "text", Status: "open"}).Error)
require.NoError(t, database.Create(&models.SenlinAgentInboxItem{ProjectID: second.ID, CreatedBy: 1, SourceType: "text", Status: "open"}).Error)
require.NoError(t, database.Create(&models.SenlinAgentTask{ProjectID: first.ID, CreatedBy: 1, Title: "A", Status: "open"}).Error)
require.NoError(t, database.Create(&models.SenlinAgentTask{ProjectID: second.ID, CreatedBy: 1, Title: "B", Status: "open"}).Error)
dashboard, err := service.Dashboard(1, first.ID)
require.NoError(t, err)
require.Equal(t, int64(1), dashboard.PendingInboxCount)
require.Equal(t, int64(1), dashboard.OpenTaskCount)
}
func TestDashboardRejectsProjectOwnedByAnotherUser(t *testing.T) {
newTestDB(t)
service := NewService()
project, err := service.CreateProject(2, "Beta", "")
require.NoError(t, err)
_, err = service.Dashboard(1, project.ID)
require.Error(t, err)
}
func TestWorkspaceMatchesFrontendContract(t *testing.T) {
database := newTestDB(t)
service := NewService()
@@ -230,6 +204,64 @@ func TestCreateProjectTagRejectsProjectOwnedByAnotherUser(t *testing.T) {
require.Error(t, err)
}
func TestCreateProjectTagConcurrentlyReturnsOneProjectScopedTag(t *testing.T) {
databasePath := filepath.ToSlash(filepath.Join(t.TempDir(), "tags.db"))
database, err := gorm.Open(sqlite.Open(fmt.Sprintf("file:%s?_pragma=busy_timeout(10000)&_pragma=journal_mode(WAL)", databasePath)), &gorm.Config{TranslateError: true, Logger: logger.Default.LogMode(logger.Silent)})
require.NoError(t, err)
sqlDB, err := database.DB()
require.NoError(t, err)
t.Cleanup(func() { require.NoError(t, sqlDB.Close()) })
require.NoError(t, models.AutoMigrate(database))
models.DBService = database
service := NewService()
project, err := service.CreateProjectWithInput(1, CreateProjectRequest{Name: "Concurrent", Identifier: "CONCURRENT"})
require.NoError(t, err)
arrived := make(chan struct{}, 2)
release := make(chan struct{})
var synchronizedQueries atomic.Int32
require.NoError(t, database.Callback().Create().Before("gorm:create").Register("test:synchronize_tag_inserts", func(tx *gorm.DB) {
if tx.Statement.Schema == nil || tx.Statement.Schema.Table != (models.SenlinAgentTag{}).TableName() {
return
}
if synchronizedQueries.Add(1) <= 2 {
arrived <- struct{}{}
<-release
}
}))
type result struct {
tag *models.SenlinAgentTag
err error
}
results := make(chan result, 2)
var workers sync.WaitGroup
workers.Add(2)
for range 2 {
go func() {
defer workers.Done()
tag, err := service.CreateProjectTag(1, project.ID, "UI")
results <- result{tag: tag, err: err}
}()
}
<-arrived
<-arrived
close(release)
workers.Wait()
close(results)
identities := map[string]struct{}{}
for value := range results {
require.NoError(t, value.err)
require.NotNil(t, value.tag)
identities[value.tag.Identity] = struct{}{}
}
require.Len(t, identities, 1)
var count int64
require.NoError(t, database.Model(&models.SenlinAgentTag{}).Where("project_id = ? AND name = ?", project.ID, "UI").Count(&count).Error)
require.Equal(t, int64(1), count)
}
func TestCreateCronPlanAddsPlanToOwnedProject(t *testing.T) {
database := newTestDB(t)
service := NewService()
@@ -252,6 +284,7 @@ func TestCreateCronPlanAddsPlanToOwnedProject(t *testing.T) {
require.Equal(t, "0 9 * * *", plan.Schedule)
require.True(t, plan.Enabled)
require.NotNil(t, plan.NextRunAt)
require.Empty(t, plan.LastResult, "创建计划只保存元数据，不能伪造执行结果")
workspace, err := service.Workspace(1, project.Identity)
require.NoError(t, err)
require.Len(t, workspace.CronPlans, 1)

2
backend/internal/logic/projects/workspace.go
View File

@@ -269,7 +269,7 @@ func (s *Service) workspaceCronPlans(projectID uint, projectIdentity string) ([]
items = append(items, WorkspaceCronPlanDTO{
ID: plan.Identity, ProjectID: projectIdentity, Title: plan.Title, Schedule: plan.Schedule,
NextRun: utcOptionalTime(plan.NextRunAt), Enabled: plan.Enabled,
LastResult: defaultString(plan.LastResult, "Not run yet"), Owner: owner,
LastResult: strings.TrimSpace(plan.LastResult), Owner: owner,
})
}
return items, nil

7
backend/internal/logic/projects/workspace_test.go
View File

@@ -3,7 +3,6 @@ package projects
import (
"encoding/json"
"fmt"
"os"
"testing"
"time"
@@ -123,12 +122,6 @@ func TestWorkspaceDoneTaskDoesNotInventCompletedAt(t *testing.T) {
require.Contains(t, string(payload), `"completedAt":null`)
}
func TestWorkspaceFileDoesNotOwnDashboard(t *testing.T) {
source, err := os.ReadFile("workspace.go")
require.NoError(t, err)
require.NotContains(t, string(source), "func (s *Service) Dashboard")
}
func TestWorkspaceRejectsProjectOwnedByAnotherUserByIdentity(t *testing.T) {
newTestDB(t)
service := NewService()