fix(canvas): 资源引用 - 校验递归素材并修复断链

This commit is contained in:
ddCat committed 2026-09-24 00:12:53 +08:00
1 parent 5bbd208bef
commit 117fa7d70b
24 files changed
+697 -218

No files matched your search

+4
View File
@@ -218,6 +218,10 @@ func (s *Service) UpsertUserCanvasProject(userID string, raw json.RawMessage) (U
return s.canvasDomain().UpsertUserCanvasProject(userID, raw)
}
func (s *Service) RepairUserCanvasProject(userID string, raw json.RawMessage) (UserDataSummary, error) {
return s.canvasDomain().RepairUserCanvasProject(userID, raw)
}
func (s *Service) DeleteUserCanvasProject(userID string, id string) error {
return s.canvasDomain().DeleteUserCanvasProject(userID, id)
}
@@ -67,7 +67,7 @@ func TestCanvasHistoryProtectsMediaAndDeletionWorker(t *testing.T) {
}
}
func TestArchivedAssetDeletionRemovesCanvasHistoryReference(t *testing.T) {
func TestArchivedAssetDeletionPreservesCanvasHistoryReference(t *testing.T) {
svc, db, _ := newResourceDeletionTestService(t)
resource := model.Resource{
ID: "archived-history-resource", UserID: "user-1", Provider: "unsupported-test-provider",
@@ -88,18 +88,18 @@ func TestArchivedAssetDeletionRemovesCanvasHistoryReference(t *testing.T) {
}
}
if err := svc.DeleteUserAsset("user-1", asset.ID); err != nil {
t.Fatalf("archived asset deletion failed: %v", err)
if err := svc.DeleteUserAsset("user-1", asset.ID); err == nil || !strings.Contains(err.Error(), "画布历史版本") {
t.Fatalf("archived asset bypassed history protection: %v", err)
}
for _, check := range []struct {
model any
want int64
}{
{&model.Asset{}, 0},
{&model.Resource{}, 0},
{&model.CanvasSnapshotResource{}, 0},
{&model.Asset{}, 1},
{&model.Resource{}, 1},
{&model.CanvasSnapshotResource{}, 1},
{&model.CanvasSnapshot{}, 1},
{&model.ResourceDeletionJob{}, 1},
{&model.ResourceDeletionJob{}, 0},
} {
var count int64
if err := db.Model(check.model).Count(&count).Error; err != nil {
+1 -5
View File
@@ -36,11 +36,7 @@ func (s *Service) ResourceAccessBatch(userID string, requests []ResourceAccessRe
results := make([]ResourceAccessResult, 0, len(requests))
for _, request := range requests {
item := ResourceAccessResult{ResourceID: request.ResourceID}
// The caller has already been authenticated and each item is resolved through
// ResourceForUser below. Provider input is therefore safe to expose here and
// keeps browser-side model adapters on the same access contract as every
// other resource consumer.
options, err := assets.NormalizeAccessOptions(request.AccessOptions, true)
options, err := assets.NormalizeAccessOptions(request.AccessOptions, false)
if err == nil {
var resource *model.Resource
resource, err = s.repo.ResourceForUser(userID, request.ResourceID)
+6 -19
View File
@@ -43,13 +43,10 @@ func (s *Service) deleteUserAssetsWithResources(userID string, ids []string, pur
if len(assetRecords) != len(assetIDs) {
return NotFound("素材不存在或无权删除")
}
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 {
@@ -89,8 +86,8 @@ func (s *Service) deleteUserAssetsWithResources(userID string, ids []string, pur
}
usages := make([]resourceUsage, 0)
if !deleteReferencedResources {
assetReferences, referenceErr := s.repo.AssetBusinessReferences(userID, assetIDs[0])
for _, assetID := range assetIDs {
assetReferences, referenceErr := s.repo.AssetBusinessReferences(userID, assetID)
if referenceErr != nil {
return referenceErr
}
@@ -99,13 +96,7 @@ func (s *Service) deleteUserAssetsWithResources(userID string, ids []string, pur
}
}
if len(ownedIDs) > 0 {
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)
}
snapshot, snapshotErr := s.repo.ResourceReferenceSnapshotExcludingAssets(userID, assetIDs, ownedIDs)
if snapshotErr != nil {
return snapshotErr
}
@@ -116,9 +107,7 @@ func (s *Service) deleteUserAssetsWithResources(userID string, ids []string, pur
sharedAssetResourceIDs[reference.ResourceID] = struct{}{}
continue
}
if !deleteReferencedResources {
usages = append(usages, resourceUsage{Kind: reference.Kind, ID: reference.ID, Title: reference.Title})
}
usages = append(usages, resourceUsage{Kind: reference.Kind, ID: reference.ID, Title: reference.Title})
}
}
for _, document := range snapshot.Documents {
@@ -144,9 +133,7 @@ func (s *Service) deleteUserAssetsWithResources(userID string, ids []string, pur
}
continue
}
if !deleteReferencedResources {
usages = append(usages, resourceUsage{Kind: document.Kind, ID: document.ID, Title: document.Title})
}
usages = append(usages, resourceUsage{Kind: document.Kind, ID: document.ID, Title: document.Title})
}
}
if len(sharedAssetResourceIDs) > 0 {
@@ -179,7 +166,7 @@ func (s *Service) deleteUserAssetsWithResources(userID string, ids []string, pur
deletionJobs := resourceDeletionJobs(userID, physicalObjects)
// 业务记录和 Outbox 必须在同一事务提交。事务失败时物理文件完全不动;
// 提交成功后由幂等 worker 清理,进程退出或对象存储暂时失败都可继续重试。
if err := s.repo.DeleteAssetsAndResources(userID, assetIDs, ownedIDs, deletionJobs, deleteReferencedResources); err != nil {
if err := s.repo.DeleteAssetsAndResources(userID, assetIDs, ownedIDs, deletionJobs, false); err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return NotFound("素材不存在或无权删除")
}
+9 -9
View File
@@ -298,7 +298,7 @@ func TestDeleteGeneratedAssetTaskReferences(t *testing.T) {
}
}
func TestPurgeConfirmedAssetIgnoresTaskReferences(t *testing.T) {
func TestPurgeConfirmedAssetPreservesTaskReferences(t *testing.T) {
svc, db, _ := newResourceDeletionTestService(t)
payload := `{"url":"/api/resources/purge-confirmed-resource/file"}`
resource := model.Resource{
@@ -319,16 +319,16 @@ func TestPurgeConfirmedAssetIgnoresTaskReferences(t *testing.T) {
}
}
if err := svc.PurgeUserAsset("user-1", asset.ID); err != nil {
t.Fatalf("PurgeUserAsset() error = %v", err)
if err := svc.PurgeUserAsset("user-1", asset.ID); err == nil || !strings.Contains(err.Error(), "任务") {
t.Fatalf("PurgeUserAsset() ignored active task: %v", err)
}
for _, check := range []struct {
model any
want int64
}{
{&model.Asset{}, 0},
{&model.Resource{}, 0},
{&model.ResourceDeletionJob{}, 1},
{&model.Asset{}, 1},
{&model.Resource{}, 1},
{&model.ResourceDeletionJob{}, 0},
{&model.Task{}, 1},
} {
var count int64
@@ -373,7 +373,7 @@ func TestResourceDeletionWorkerRemovesObjectAndCompletesOutbox(t *testing.T) {
}
}
func TestExpiredArchivedAssetCleanupDeletesReferencedAssetAndUsesDeletionOutbox(t *testing.T) {
func TestExpiredArchivedAssetCleanupPreservesReferencedAsset(t *testing.T) {
svc, db, _ := newResourceDeletionTestService(t)
old := time.Now().Add(-45 * 24 * time.Hour)
resource := model.Resource{
@@ -406,8 +406,8 @@ func TestExpiredArchivedAssetCleanupDeletesReferencedAssetAndUsesDeletionOutbox(
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("referenced archived asset was not force deleted through outbox: asset=%d resource=%d jobs=%d", assetCount, resourceCount, jobCount)
if assetCount != 1 || resourceCount != 1 || jobCount != 0 {
t.Fatalf("referenced archived asset was removed: asset=%d resource=%d jobs=%d", assetCount, resourceCount, jobCount)
}
}