fix(*): 素材库与画布 - 修复批量删除刷新、选择布局及工具引用
This commit is contained in:
1 parent
c5b81f696c
commit
dc1ad68015
27 files changed
+852
-109
No files matched your search
@@ -98,11 +98,15 @@ func (h canvasHost) StructuredReplacementQuota(userID, kind string, count int, b
|
||||
return validateStructuredReplacementQuotaWithPolicy(usage, kind, count, bytes, policy.Resource)
|
||||
}
|
||||
|
||||
func (h canvasHost) DeleteUserAssetWithResources(userID, assetID string) error {
|
||||
func (h canvasHost) DeleteUserAssetWithResources(userID, assetID string, purge bool) error {
|
||||
if h.svc == nil {
|
||||
return nil
|
||||
}
|
||||
return h.svc.deleteUserAssetWithResources(userID, assetID)
|
||||
return h.svc.deleteUserAssetWithResources(userID, assetID, purge)
|
||||
}
|
||||
|
||||
func (h canvasHost) PurgeUserAssetsWithResources(userID string, assetIDs []string) error {
|
||||
return h.svc.deleteUserAssetsWithResources(userID, assetIDs, true)
|
||||
}
|
||||
|
||||
func (h canvasHost) RecordActivity(userID, event string, count int) {
|
||||
@@ -182,6 +186,14 @@ func (s *Service) DeleteUserAsset(userID string, id string) error {
|
||||
return s.canvasDomain().DeleteUserAsset(userID, id)
|
||||
}
|
||||
|
||||
func (s *Service) PurgeUserAsset(userID string, id string) error {
|
||||
return s.canvasDomain().PurgeUserAsset(userID, id)
|
||||
}
|
||||
|
||||
func (s *Service) PurgeUserAssets(userID string, ids []string) error {
|
||||
return s.canvasDomain().PurgeUserAssets(userID, ids)
|
||||
}
|
||||
|
||||
func (s *Service) UserAssets(userID string) ([]json.RawMessage, error) {
|
||||
return s.canvasDomain().UserAssets(userID)
|
||||
}
|
||||
|
||||
@@ -66,3 +66,47 @@ func TestCanvasHistoryProtectsMediaAndDeletionWorker(t *testing.T) {
|
||||
t.Fatalf("unreferenced media not cleaned: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestArchivedAssetDeletionRemovesCanvasHistoryReference(t *testing.T) {
|
||||
svc, db, _ := newResourceDeletionTestService(t)
|
||||
resource := model.Resource{
|
||||
ID: "archived-history-resource", UserID: "user-1", Provider: "unsupported-test-provider",
|
||||
ObjectKey: "users/user-1/image/archived-history.png", Status: model.ResourceStatusReady,
|
||||
}
|
||||
asset := model.Asset{
|
||||
ID: "archived-history-asset", UserID: "user-1", Title: "回收站历史素材",
|
||||
Status: model.AssetVersionStatusArchived, PayloadJSON: `{"data":{"storageKey":"resource:archived-history-resource"}}`,
|
||||
}
|
||||
snapshot := model.CanvasSnapshot{
|
||||
ID: "archived-history-snapshot", CanvasID: "canvas", UserID: "user-1", Revision: 1,
|
||||
Title: "历史画布", PayloadJSON: `{}`, CreatedAt: time.Now(),
|
||||
}
|
||||
ref := model.CanvasSnapshotResource{SnapshotID: snapshot.ID, ResourceID: resource.ID}
|
||||
for _, item := range []any{&resource, &asset, &snapshot, &ref} {
|
||||
if err := db.Create(item).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := svc.DeleteUserAsset("user-1", asset.ID); err != nil {
|
||||
t.Fatalf("archived asset deletion failed: %v", err)
|
||||
}
|
||||
for _, check := range []struct {
|
||||
model any
|
||||
want int64
|
||||
}{
|
||||
{&model.Asset{}, 0},
|
||||
{&model.Resource{}, 0},
|
||||
{&model.CanvasSnapshotResource{}, 0},
|
||||
{&model.CanvasSnapshot{}, 1},
|
||||
{&model.ResourceDeletionJob{}, 1},
|
||||
} {
|
||||
var count int64
|
||||
if err := db.Model(check.model).Count(&count).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if count != check.want {
|
||||
t.Fatalf("%T count=%d, want %d", check.model, count, check.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,86 @@
|
||||
package app
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"infinite-canvas/backend/internal/model"
|
||||
)
|
||||
|
||||
func TestPurgeAssetsBatchSharedResourcesAndHistory(t *testing.T) {
|
||||
svc, db, _ := newResourceDeletionTestService(t)
|
||||
for _, id := range []string{"batch-shared", "keep-shared", "same-object", "foreign-alias"} {
|
||||
owner, objectKey := "user-1", id+".png"
|
||||
if id == "foreign-alias" {
|
||||
owner, objectKey = "user-2", "same-object.png"
|
||||
}
|
||||
if err := db.Create(&model.Resource{ID: id, UserID: owner, Provider: "unsupported-test-provider", ObjectKey: objectKey, Status: model.ResourceStatusReady}).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
for _, record := range []any{
|
||||
&model.Asset{ID: "first", UserID: "user-1", Status: model.AssetVersionStatusConfirmed, PayloadJSON: `{"resourceIds":["batch-shared","keep-shared","same-object"]}`},
|
||||
&model.Asset{ID: "second", UserID: "user-1", Status: model.AssetVersionStatusArchived, PayloadJSON: `{}`},
|
||||
&model.AssetVersion{ID: "second-version", AssetID: "second", DefinitionJSON: `{"resourceId":"batch-shared"}`},
|
||||
&model.AssetRepresentation{ID: "second-representation", AssetVersionID: "second-version", Role: "image", ResourceID: "batch-shared", MetadataJSON: `{}`},
|
||||
&model.Asset{ID: "unselected", UserID: "user-1", PayloadJSON: `{}`},
|
||||
&model.AssetVersion{ID: "unselected-version", AssetID: "unselected", DefinitionJSON: `{}`},
|
||||
&model.AssetRepresentation{ID: "unselected-representation", AssetVersionID: "unselected-version", Role: "video", MetadataJSON: `{"resourceId":"keep-shared"}`},
|
||||
&model.Task{ID: "batch-task", UserID: "user-1", Status: model.TaskStatusRunning, InputJSON: `{"resourceId":"batch-shared"}`},
|
||||
&model.CanvasProject{ID: "batch-canvas", UserID: "user-1", PayloadJSON: `{"resourceId":"batch-shared"}`},
|
||||
&model.CanvasSnapshot{ID: "batch-snapshot", CanvasID: "batch-canvas", UserID: "user-1", Revision: 1, PayloadJSON: `{}`, CreatedAt: time.Now()},
|
||||
&model.CanvasSnapshotResource{SnapshotID: "batch-snapshot", ResourceID: "batch-shared"},
|
||||
} {
|
||||
if err := db.Create(record).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
// Force an error late in the resource transaction, after asset and outbox writes.
|
||||
if err := db.Exec("CREATE TRIGGER fail_batch_resource_delete BEFORE DELETE ON resources BEGIN SELECT RAISE(ABORT, 'forced failure'); END;").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := svc.PurgeUserAssets("user-1", []string{"first", "second"}); err == nil {
|
||||
t.Fatal("expected rollback")
|
||||
}
|
||||
assertCount := func(record any, want int64) {
|
||||
t.Helper()
|
||||
var count int64
|
||||
if err := db.Model(record).Count(&count).Error; err != nil || count != want {
|
||||
t.Fatalf("%T count=%d want=%d err=%v", record, count, want, err)
|
||||
}
|
||||
}
|
||||
assertCount(&model.Asset{}, 3)
|
||||
assertCount(&model.Resource{}, 4)
|
||||
assertCount(&model.ResourceDeletionJob{}, 0)
|
||||
assertCount(&model.CanvasSnapshotResource{}, 1)
|
||||
assertCount(&model.AssetVersion{}, 2)
|
||||
assertCount(&model.AssetRepresentation{}, 2)
|
||||
if err := db.Exec("DROP TRIGGER fail_batch_resource_delete").Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := svc.PurgeUserAssets("user-1", []string{"first", " second ", "first"}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assertCount(&model.Asset{}, 1)
|
||||
assertCount(&model.Resource{}, 2)
|
||||
assertCount(&model.ResourceDeletionJob{}, 1)
|
||||
assertCount(&model.CanvasSnapshotResource{}, 0)
|
||||
assertCount(&model.CanvasSnapshot{}, 1)
|
||||
assertCount(&model.Task{}, 1)
|
||||
assertCount(&model.CanvasProject{}, 1)
|
||||
assertCount(&model.AssetVersion{}, 1)
|
||||
assertCount(&model.AssetRepresentation{}, 1)
|
||||
var job model.ResourceDeletionJob
|
||||
if err := db.First(&job).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if job.ResourceID != "batch-shared" {
|
||||
t.Fatalf("wrong physical object queued: %s", job.ResourceID)
|
||||
}
|
||||
for _, id := range []string{"keep-shared", "foreign-alias"} {
|
||||
var resource model.Resource
|
||||
if err := db.First(&resource, "id = ?", id).Error; err != nil {
|
||||
t.Fatalf("shared resource %s lost: %v", id, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -18,25 +18,54 @@ import (
|
||||
|
||||
qiniuAuth "github.com/qiniu/go-sdk/v7/auth"
|
||||
qiniuStorage "github.com/qiniu/go-sdk/v7/storage"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func (s *Service) deleteUserAssetWithResources(userID string, assetID string) error {
|
||||
asset, err := s.repo.AssetForUser(userID, assetID)
|
||||
func (s *Service) deleteUserAssetWithResources(userID string, assetID string, purge bool) error {
|
||||
return s.deleteUserAssetsWithResources(userID, []string{assetID}, purge)
|
||||
}
|
||||
|
||||
func (s *Service) deleteUserAssetsWithResources(userID string, ids []string, purge bool) error {
|
||||
if strings.TrimSpace(userID) == "" || len(ids) == 0 || len(ids) > 1000 {
|
||||
return BadAuthRequest("每次删除须提供 1–1000 个素材 ID 和有效用户")
|
||||
}
|
||||
assetIDs := make([]string, 0, len(ids))
|
||||
seen := make(map[string]struct{}, len(ids))
|
||||
for _, id := range ids {
|
||||
id = strings.TrimSpace(id)
|
||||
if id == "" {
|
||||
return BadAuthRequest("素材 ID 不能为空")
|
||||
}
|
||||
if _, exists := seen[id]; !exists {
|
||||
seen[id] = struct{}{}
|
||||
assetIDs = append(assetIDs, id)
|
||||
}
|
||||
}
|
||||
assetRecords, err := s.repo.AssetsForUserIDs(userID, assetIDs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
assetReferences, err := s.repo.AssetBusinessReferences(userID, assetID)
|
||||
if err != nil {
|
||||
return err
|
||||
if len(assetRecords) != len(assetIDs) {
|
||||
return NotFound("素材不存在或无权删除")
|
||||
}
|
||||
versions, representations, err := s.repo.AssetResourceRecords(assetID)
|
||||
deleteReferencedResources := purge
|
||||
if !purge {
|
||||
// 内部普通删除仍为单素材保护路径;用户显式删除统一走 purge。
|
||||
if len(assetRecords) != 1 {
|
||||
return BadAuthRequest("普通删除仅支持单个素材")
|
||||
}
|
||||
deleteReferencedResources = assetRecords[0].Status == model.AssetVersionStatusArchived
|
||||
}
|
||||
versions, representations, err := s.repo.AssetsResourceRecords(assetIDs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
resourceIDs := map[string]struct{}{}
|
||||
if err := collectOwnedAssetDocumentReferences(asset.PayloadJSON, resourceIDs); err != nil {
|
||||
return BadAuthRequest("素材数据无法解析,已停止删除以避免误删文件")
|
||||
for _, asset := range assetRecords {
|
||||
if err := collectOwnedAssetDocumentReferences(asset.PayloadJSON, resourceIDs); err != nil {
|
||||
return BadAuthRequest("素材数据无法解析,已停止删除以避免误删文件")
|
||||
}
|
||||
}
|
||||
for _, version := range versions {
|
||||
if err := collectOwnedAssetDocumentReferences(version.DefinitionJSON, resourceIDs); err != nil {
|
||||
@@ -64,12 +93,24 @@ func (s *Service) deleteUserAssetWithResources(userID string, assetID string) er
|
||||
ownedIDSet[resource.ID] = struct{}{}
|
||||
}
|
||||
|
||||
usages := make([]resourceUsage, 0, len(assetReferences))
|
||||
for _, reference := range assetReferences {
|
||||
usages = append(usages, resourceUsage{Kind: reference.Kind, ID: reference.ID, Title: reference.Title})
|
||||
usages := make([]resourceUsage, 0)
|
||||
if !deleteReferencedResources {
|
||||
assetReferences, referenceErr := s.repo.AssetBusinessReferences(userID, assetIDs[0])
|
||||
if referenceErr != nil {
|
||||
return referenceErr
|
||||
}
|
||||
for _, reference := range assetReferences {
|
||||
usages = append(usages, resourceUsage{Kind: reference.Kind, ID: reference.ID, Title: reference.Title})
|
||||
}
|
||||
}
|
||||
if len(ownedIDs) > 0 {
|
||||
snapshot, snapshotErr := s.repo.ResourceReferenceSnapshot(userID, assetID, ownedIDs)
|
||||
var snapshot repository.ResourceReferenceSnapshot
|
||||
var snapshotErr error
|
||||
if deleteReferencedResources {
|
||||
snapshot, snapshotErr = s.repo.OtherAssetResourceReferences(userID, assetIDs)
|
||||
} else {
|
||||
snapshot, snapshotErr = s.repo.ResourceReferenceSnapshot(userID, assetIDs[0], ownedIDs)
|
||||
}
|
||||
if snapshotErr != nil {
|
||||
return snapshotErr
|
||||
}
|
||||
@@ -80,7 +121,9 @@ func (s *Service) deleteUserAssetWithResources(userID string, assetID string) er
|
||||
sharedAssetResourceIDs[reference.ResourceID] = struct{}{}
|
||||
continue
|
||||
}
|
||||
usages = append(usages, resourceUsage{Kind: reference.Kind, ID: reference.ID, Title: reference.Title})
|
||||
if !deleteReferencedResources {
|
||||
usages = append(usages, resourceUsage{Kind: reference.Kind, ID: reference.ID, Title: reference.Title})
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, document := range snapshot.Documents {
|
||||
@@ -106,7 +149,9 @@ func (s *Service) deleteUserAssetWithResources(userID string, assetID string) er
|
||||
}
|
||||
continue
|
||||
}
|
||||
usages = append(usages, resourceUsage{Kind: document.Kind, ID: document.ID, Title: document.Title})
|
||||
if !deleteReferencedResources {
|
||||
usages = append(usages, resourceUsage{Kind: document.Kind, ID: document.ID, Title: document.Title})
|
||||
}
|
||||
}
|
||||
}
|
||||
if len(sharedAssetResourceIDs) > 0 {
|
||||
@@ -139,7 +184,10 @@ func (s *Service) deleteUserAssetWithResources(userID string, assetID string) er
|
||||
deletionJobs := resourceDeletionJobs(userID, physicalObjects)
|
||||
// 业务记录和 Outbox 必须在同一事务提交。事务失败时物理文件完全不动;
|
||||
// 提交成功后由幂等 worker 清理,进程退出或对象存储暂时失败都可继续重试。
|
||||
if err := s.repo.DeleteAssetAndResources(userID, assetID, ownedIDs, deletionJobs); err != nil {
|
||||
if err := s.repo.DeleteAssetsAndResources(userID, assetIDs, ownedIDs, deletionJobs, deleteReferencedResources); err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return NotFound("素材不存在或无权删除")
|
||||
}
|
||||
if errors.Is(err, repository.ErrCanvasHistoryResourceReferenced) {
|
||||
return BadAuthRequest("素材仍被画布历史版本引用,已保留文件")
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ func TestDeleteAssetDatabaseFailureLeavesPhysicalObjectAndNoOutbox(t *testing.T)
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if err := svc.deleteUserAssetWithResources("user-1", "asset-1"); err == nil {
|
||||
if err := svc.deleteUserAssetWithResources("user-1", "asset-1", false); err == nil {
|
||||
t.Fatal("forced database failure should be returned")
|
||||
}
|
||||
if _, err := os.Stat(resourcePath); err != nil {
|
||||
@@ -298,6 +298,49 @@ func TestDeleteGeneratedAssetTaskReferences(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestPurgeConfirmedAssetIgnoresTaskReferences(t *testing.T) {
|
||||
svc, db, _ := newResourceDeletionTestService(t)
|
||||
payload := `{"url":"/api/resources/purge-confirmed-resource/file"}`
|
||||
resource := model.Resource{
|
||||
ID: "purge-confirmed-resource", UserID: "user-1", Provider: "unsupported-test-provider",
|
||||
ObjectKey: "purge-confirmed.png", Status: model.ResourceStatusReady,
|
||||
}
|
||||
asset := model.Asset{
|
||||
ID: "purge-confirmed-asset", UserID: "user-1", Title: "本地已在回收站的素材",
|
||||
Status: model.AssetVersionStatusConfirmed, PayloadJSON: payload,
|
||||
}
|
||||
task := model.Task{
|
||||
ID: "purge-confirmed-task", UserID: "user-1", Prompt: "将图片拆分为可独立编辑的图层",
|
||||
Status: model.TaskStatusRunning, InputJSON: payload, ResultJSON: payload,
|
||||
}
|
||||
for _, item := range []any{&resource, &asset, &task} {
|
||||
if err := db.Create(item).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
if err := svc.PurgeUserAsset("user-1", asset.ID); err != nil {
|
||||
t.Fatalf("PurgeUserAsset() error = %v", err)
|
||||
}
|
||||
for _, check := range []struct {
|
||||
model any
|
||||
want int64
|
||||
}{
|
||||
{&model.Asset{}, 0},
|
||||
{&model.Resource{}, 0},
|
||||
{&model.ResourceDeletionJob{}, 1},
|
||||
{&model.Task{}, 1},
|
||||
} {
|
||||
var count int64
|
||||
if err := db.Model(check.model).Count(&count).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if count != check.want {
|
||||
t.Fatalf("%T count=%d, want %d", check.model, count, check.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestResourceDeletionWorkerRemovesObjectAndCompletesOutbox(t *testing.T) {
|
||||
svc, db, dataDir := newResourceDeletionTestService(t)
|
||||
objectKey := "users/user-1/image/queued.png"
|
||||
@@ -330,7 +373,7 @@ func TestResourceDeletionWorkerRemovesObjectAndCompletesOutbox(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestExpiredArchivedAssetCleanupRespectsCanvasReferencesAndUsesDeletionOutbox(t *testing.T) {
|
||||
func TestExpiredArchivedAssetCleanupDeletesReferencedAssetAndUsesDeletionOutbox(t *testing.T) {
|
||||
svc, db, _ := newResourceDeletionTestService(t)
|
||||
old := time.Now().Add(-45 * 24 * time.Hour)
|
||||
resource := model.Resource{
|
||||
@@ -363,25 +406,8 @@ func TestExpiredArchivedAssetCleanupRespectsCanvasReferencesAndUsesDeletionOutbo
|
||||
if err := db.Model(&model.ResourceDeletionJob{}).Where("resource_id = ?", resource.ID).Count(&jobCount).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if assetCount != 1 || resourceCount != 1 || jobCount != 0 {
|
||||
t.Fatalf("referenced archived asset cleanup changed data: asset=%d resource=%d jobs=%d", assetCount, resourceCount, jobCount)
|
||||
}
|
||||
|
||||
if err := db.Delete(&model.CanvasProject{}, "id = ? AND user_id = ?", canvas.ID, canvas.UserID).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
svc.cleanupExpiredArchivedAssets()
|
||||
if err := db.Model(&model.Asset{}).Where("id = ?", asset.ID).Count(&assetCount).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Model(&model.Resource{}).Where("id = ?", resource.ID).Count(&resourceCount).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := db.Model(&model.ResourceDeletionJob{}).Where("resource_id = ?", resource.ID).Count(&jobCount).Error; err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if assetCount != 0 || resourceCount != 0 || jobCount != 1 {
|
||||
t.Fatalf("unreferenced archived asset did not use deletion outbox: asset=%d resource=%d jobs=%d", assetCount, resourceCount, jobCount)
|
||||
t.Fatalf("referenced archived asset was not force deleted through outbox: asset=%d resource=%d jobs=%d", assetCount, resourceCount, jobCount)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user