update

internal/service/ingest_image_count_test.go

@@ -19,10 +19,14 @@ type captureIngestRepo struct {
 	repository.IngestRepository
 	createdRW     *model.BrandRunway
 	createdImages []model.BrandRunwayImage
+	deletedEntity bool // 模拟实体键已软删（删除即永久：应跳过重爬，不重新写入）
 }
 
-func (c *captureIngestRepo) RunwayEntityState(ctx context.Context, brandID uint32, seasonCode, collectionType string) (uint32, string, bool, error) {
-	return 0, "", false, nil // 实体键未命中 → 新建分支
+func (c *captureIngestRepo) RunwayEntityState(ctx context.Context, brandID uint32, seasonCode, collectionType string) (uint32, string, bool, bool, error) {
+	if c.deletedEntity {
+		return 1, model.StatusPending, true, true, nil // 命中但已软删
+	}
+	return 0, "", false, false, nil // 实体键未命中 → 新建分支
 }
 
 func (c *captureIngestRepo) CreateRunwayWithImages(ctx context.Context, rw *model.BrandRunway, imgs []model.BrandRunwayImage) (uint32, error) {
@@ -120,3 +124,45 @@ func TestProcessRunwayImageCountEqualsAliveMainRows(t *testing.T) {
 			repo.createdRW.ImageCount, len(p.Looks))
 	}
 }
+
+// TestProcessRunwaySkipsSoftDeletedEntity 回归「删除即永久」：
+// 实体键已软删（is_deleted=1）的走秀，重爬时不应被重新写入正式表，仅置任务 done。
+func TestProcessRunwaySkipsSoftDeletedEntity(t *testing.T) {
+	dir := t.TempDir()
+	local := storage.NewLocalUploader(dir, "/uploads")
+
+	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "image/jpeg")
+		_, _ = w.Write([]byte("fake-bytes-for" + r.URL.Path))
+	}))
+	defer srv.Close()
+
+	// deletedEntity=true：模拟实体键已软删，processRunway 应跳过重爬。
+	repo := &captureIngestRepo{deletedEntity: true}
+	s := &IngestService{
+		repo:       repo,
+		brandRepo:  fakeBrandRepo{},
+		uploader:   local,
+		local:      local,
+		httpClient: srv.Client(),
+	}
+
+	p := dto.RunwayIngest{
+		Kind:           dto.IngestKindRunway,
+		BrandUID:       hashid.Encode(1),
+		TitleEn:        "deleted-entity-test",
+		Year:           2027,
+		Season:         "spring",
+		CollectionType: "rtw",
+		Looks:          []dto.RunwayLook{{Main: srv.URL + "/img/a.jpg"}},
+	}
+	job := model.IngestJob{ID: 2, Kind: model.IngestKindCrawl}
+	s.processRunway(context.Background(), job, p)
+
+	if repo.createdRW != nil {
+		t.Fatal("已软删的实体不应被重新写入正式表")
+	}
+	if len(repo.createdImages) != 0 {
+		t.Fatalf("已软删的实体不应写入任何图片行，实际 %d 张", len(repo.createdImages))
+	}
+}