refactor(publish): 审核侧切到正式表，通过即改状态不再晋升
This commit is contained in:
toom1996
@ -67,11 +67,12 @@ const articleDetailColumns = `brand_runways.id, brand_runways.title_en, brand_ru
|
||||
brand_runways.cover, b.name_en AS brand_name_en, b.name_cn AS brand_name_cn`
|
||||
|
||||
// articleAdminColumns 后台管理列表投影列：在列表列基础上补回 season / year /
|
||||
// collection_type / season_code 等管理字段（前端列表不展示这些）。
|
||||
// collection_type / season_code / status 等管理字段（前端列表不展示这些）。
|
||||
const articleAdminColumns = `brand_runways.id, brand_runways.brand_id,
|
||||
brand_runways.title_en, brand_runways.title_cn,
|
||||
brand_runways.cover, brand_runways.image_count, brand_runways.year,
|
||||
brand_runways.collection_type, brand_runways.season, brand_runways.season_code,
|
||||
brand_runways.status,
|
||||
b.name_en AS brand_name_en, b.name_cn AS brand_name_cn`
|
||||
|
||||
// brandJoin 关联品牌表取品牌名；LEFT JOIN 保证品牌被软删时文章依然可见。
|
||||
|
||||
@ -11,49 +11,44 @@ import (
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// ReviewRepository 审核草稿的数据访问接口。
|
||||
// ReviewRepository 审核数据访问接口。
|
||||
//
|
||||
// 草稿由爬虫 worker 写入（见 IngestRepository），本接口负责「读 + 晋升」：
|
||||
// 列出待审草稿、查看详情、审核前微调字段、通过时晋升到正式表、驳回时标记状态。
|
||||
// 单表发布模型下，审核对象就是正式表里的记录本身（不再有草稿表）：
|
||||
// 列出待审记录、查看详情、审核前微调字段、通过（置 published）/ 驳回（置 rejected）。
|
||||
type ReviewRepository interface {
|
||||
// ListDrafts 分页列出草稿；status 为空表示全部，否则按状态过滤。
|
||||
// 排序：pending 优先，其次按 id 倒序（最新在前）。
|
||||
ListDrafts(ctx context.Context, status string, page, size int) ([]model.BrandRunwayDraft, int64, error)
|
||||
// DraftDetail 查单条草稿（不含图片）。
|
||||
DraftDetail(ctx context.Context, id uint32) (*model.BrandRunwayDraft, error)
|
||||
// DraftImages 查草稿的全部图片，按排序值升序。
|
||||
DraftImages(ctx context.Context, draftID uint32) ([]model.BrandRunwayDraftImage, error)
|
||||
// UpdateDraft 审核前微调草稿字段（白名单，杜绝任意列注入）。
|
||||
UpdateDraft(ctx context.Context, id uint32, fields map[string]any) error
|
||||
// SetDraftStatus 设置草稿状态（通过/驳回）与审核人/驳回理由。
|
||||
SetDraftStatus(ctx context.Context, id uint32, status, reviewer, reason string) error
|
||||
// SaveRunwayFromDraft 晋升：按实体键（brand_id + season_code + collection_type）幂等 upsert 到 brand_runways 正式表并替换图片，返回正式表主键。
|
||||
SaveRunwayFromDraft(ctx context.Context, draftID uint32) (uint32, error)
|
||||
// 街拍草稿镜像方法（与 runway 同构，但对象为 street_snap_drafts / street_snaps）。
|
||||
ListStreetDrafts(ctx context.Context, status string, page, size int) ([]model.StreetSnapDraft, int64, error)
|
||||
StreetDraftDetail(ctx context.Context, id uint32) (*model.StreetSnapDraft, error)
|
||||
StreetDraftImages(ctx context.Context, draftID uint32) ([]model.StreetSnapDraftImage, error)
|
||||
// SoftDeleteRunwayDraftImage 软删单张走秀草稿图片（审核阶段剔除坏图），并同步 image_count。
|
||||
SoftDeleteRunwayDraftImage(ctx context.Context, draftID, imgID uint32) error
|
||||
// SoftDeleteStreetDraftImage 软删单张街拍草稿图片，并同步 image_count。
|
||||
SoftDeleteStreetDraftImage(ctx context.Context, draftID, imgID uint32) error
|
||||
// AttachStreetDraftImages 把 imgIDs 变成 mainImgID 的副图（批量并入）。
|
||||
// mainImgID 必须属于同一草稿、未被软删、且自身是主图（is_detail=0），否则返回 ErrInvalidImageGroup。
|
||||
// 若某个被并入的图自身还带着副图，则它原有的副图一并改挂到 mainImgID ——
|
||||
// 避免出现「副图的副图」破坏不变量（见计划「实现裁决」第 1 条）。
|
||||
// ListRecords 分页列出记录；status 为空表示全部，否则按状态过滤。排序：pending 优先，其次 id 倒序。
|
||||
ListRecords(ctx context.Context, status string, page, size int) ([]model.BrandRunway, int64, error)
|
||||
// RecordDetail 查单条走秀记录（不含图片）。
|
||||
RecordDetail(ctx context.Context, id uint32) (*model.BrandRunway, error)
|
||||
// RecordImages 查走秀记录的全部未删图片，按排序值升序。
|
||||
RecordImages(ctx context.Context, recordID uint32) ([]model.BrandRunwayImage, error)
|
||||
// UpdateRecord 审核前微调字段（白名单，杜绝任意列注入）。
|
||||
UpdateRecord(ctx context.Context, id uint32, fields map[string]any) error
|
||||
// SetRecordStatus 设置状态（通过/驳回）与审核人/驳回理由。
|
||||
SetRecordStatus(ctx context.Context, id uint32, status, reviewer, reason string) error
|
||||
|
||||
// 街拍镜像方法（对象为 street_snaps / street_snap_images）。
|
||||
ListStreetRecords(ctx context.Context, status string, page, size int) ([]model.StreetSnap, int64, error)
|
||||
StreetRecordDetail(ctx context.Context, id uint32) (*model.StreetSnap, error)
|
||||
StreetRecordImages(ctx context.Context, recordID uint32) ([]model.StreetSnapImage, error)
|
||||
UpdateStreetRecord(ctx context.Context, id uint32, fields map[string]any) error
|
||||
SetStreetRecordStatus(ctx context.Context, id uint32, status, reviewer, reason string) error
|
||||
|
||||
// SoftDeleteRunwayImage 软删单张走秀图片（审核阶段剔除坏图），并同步 image_count。
|
||||
SoftDeleteRunwayImage(ctx context.Context, recordID, imgID uint32) error
|
||||
// SoftDeleteStreetImage 软删单张街拍图片，并同步 image_count。
|
||||
SoftDeleteStreetImage(ctx context.Context, recordID, imgID uint32) error
|
||||
// AttachStreetSnapImages 把 imgIDs 变成 mainImgID 的副图（批量并入）。
|
||||
// mainImgID 必须属于同一记录、未被软删、且自身是主图（is_detail=0），否则返回 ErrInvalidImageGroup。
|
||||
// 若某个被并入的图自身还带着副图，则它原有的副图一并改挂到 mainImgID —— 避免「副图的副图」。
|
||||
// 幂等：已是 mainImgID 副图的行重复并入不报错。
|
||||
AttachStreetDraftImages(ctx context.Context, draftID, mainImgID uint32, imgIDs []uint32) error
|
||||
// DetachStreetDraftImage 把副图恢复为主图（is_detail=0, parent_image_id=0）。
|
||||
// 对主图调用是幂等成功（无副作用）。
|
||||
DetachStreetDraftImage(ctx context.Context, draftID, imgID uint32) error
|
||||
// GetDraftImageKey 取单张草稿图片的S4 key（删除前清理用）；不存在返回空串。
|
||||
GetDraftImageKey(ctx context.Context, kind string, draftID, imgID uint32) (string, error)
|
||||
UpdateStreetDraft(ctx context.Context, id uint32, fields map[string]any) error
|
||||
SetStreetDraftStatus(ctx context.Context, id uint32, status, reviewer, reason string) error
|
||||
SaveStreetSnapFromDraft(ctx context.Context, draftID uint32) (uint32, error)
|
||||
// CountDraftPending 统计某草稿表（dest 传表对应的零值指针，如 &model.BrandRunwayDraft{}）中指定状态的草稿数。
|
||||
// 供各 ReviewModule 复用，新增模块无需再单独写计数方法。
|
||||
CountDraftPending(ctx context.Context, status string, dest any) (int64, error)
|
||||
AttachStreetSnapImages(ctx context.Context, snapID, mainImgID uint32, imgIDs []uint32) error
|
||||
// DetachStreetSnapImage 把副图恢复为主图（is_detail=0, parent_image_id=0）。对主图调用是幂等成功。
|
||||
DetachStreetSnapImage(ctx context.Context, snapID, imgID uint32) error
|
||||
// GetImageKey 取单张图片的S4 key（删除前清理用）；不存在返回空串。
|
||||
GetImageKey(ctx context.Context, kind string, recordID, imgID uint32) (string, error)
|
||||
// CountByStatus 统计某表（dest 传表对应的零值指针，如 &model.BrandRunway{}）中指定状态的行数。
|
||||
CountByStatus(ctx context.Context, status string, dest any) (int64, error)
|
||||
}
|
||||
|
||||
type reviewRepository struct {
|
||||
@ -65,14 +60,14 @@ func NewReviewRepository(db *gorm.DB) ReviewRepository {
|
||||
return &reviewRepository{db: db}
|
||||
}
|
||||
|
||||
func (r *reviewRepository) ListDrafts(ctx context.Context, status string, page, size int) ([]model.BrandRunwayDraft, int64, error) {
|
||||
func (r *reviewRepository) ListRecords(ctx context.Context, status string, page, size int) ([]model.BrandRunway, int64, error) {
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
if size < 1 || size > 100 {
|
||||
size = 20
|
||||
}
|
||||
q := r.db.WithContext(ctx).Model(&model.BrandRunwayDraft{}).Where("is_deleted = 0")
|
||||
q := r.db.WithContext(ctx).Model(&model.BrandRunway{}).Where("is_deleted = 0")
|
||||
if status != "" {
|
||||
q = q.Where("status = ?", status)
|
||||
}
|
||||
@ -81,11 +76,11 @@ func (r *reviewRepository) ListDrafts(ctx context.Context, status string, page,
|
||||
return nil, 0, err
|
||||
}
|
||||
if total == 0 {
|
||||
return []model.BrandRunwayDraft{}, 0, nil
|
||||
return []model.BrandRunway{}, 0, nil
|
||||
}
|
||||
var rows []model.BrandRunwayDraft
|
||||
var rows []model.BrandRunway
|
||||
if err := q.
|
||||
Order("CASE status WHEN '" + model.DraftStatusPending + "' THEN 0 ELSE 1 END ASC, id DESC").
|
||||
Order("CASE status WHEN '" + model.StatusPending + "' THEN 0 ELSE 1 END ASC, id DESC").
|
||||
Offset((page - 1) * size).
|
||||
Limit(size).
|
||||
Find(&rows).Error; err != nil {
|
||||
@ -94,8 +89,8 @@ func (r *reviewRepository) ListDrafts(ctx context.Context, status string, page,
|
||||
return rows, total, nil
|
||||
}
|
||||
|
||||
func (r *reviewRepository) DraftDetail(ctx context.Context, id uint32) (*model.BrandRunwayDraft, error) {
|
||||
var d model.BrandRunwayDraft
|
||||
func (r *reviewRepository) RecordDetail(ctx context.Context, id uint32) (*model.BrandRunway, error) {
|
||||
var d model.BrandRunway
|
||||
if err := r.db.WithContext(ctx).Where("id = ? AND is_deleted = 0", id).First(&d).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, ErrNotFound
|
||||
@ -105,17 +100,17 @@ func (r *reviewRepository) DraftDetail(ctx context.Context, id uint32) (*model.B
|
||||
return &d, nil
|
||||
}
|
||||
|
||||
func (r *reviewRepository) DraftImages(ctx context.Context, draftID uint32) ([]model.BrandRunwayDraftImage, error) {
|
||||
var imgs []model.BrandRunwayDraftImage
|
||||
func (r *reviewRepository) RecordImages(ctx context.Context, recordID uint32) ([]model.BrandRunwayImage, error) {
|
||||
var imgs []model.BrandRunwayImage
|
||||
err := r.db.WithContext(ctx).
|
||||
Where("draft_id = ? AND is_deleted = 0", draftID).
|
||||
Where("runway_id = ? AND is_deleted = 0", recordID).
|
||||
Order("sort_order ASC, id ASC").
|
||||
Find(&imgs).Error
|
||||
return imgs, err
|
||||
}
|
||||
|
||||
// draftEditable 审核前可微调的字段白名单（键即列名）。
|
||||
var draftEditable = map[string]bool{
|
||||
// recordEditable 审核前可微调的字段白名单（键即列名）。
|
||||
var recordEditable = map[string]bool{
|
||||
"title_en": true,
|
||||
"title_cn": true,
|
||||
"description_en": true,
|
||||
@ -126,11 +121,11 @@ var draftEditable = map[string]bool{
|
||||
"season_code": true,
|
||||
}
|
||||
|
||||
// UpdateDraft 只更新白名单内的字段，其余忽略，杜绝任意列注入。
|
||||
func (r *reviewRepository) UpdateDraft(ctx context.Context, id uint32, fields map[string]any) error {
|
||||
// UpdateRecord 只更新白名单内的字段，其余忽略，杜绝任意列注入。
|
||||
func (r *reviewRepository) UpdateRecord(ctx context.Context, id uint32, fields map[string]any) error {
|
||||
clean := map[string]any{}
|
||||
for k, v := range fields {
|
||||
if draftEditable[k] {
|
||||
if recordEditable[k] {
|
||||
clean[k] = v
|
||||
}
|
||||
}
|
||||
@ -139,14 +134,14 @@ func (r *reviewRepository) UpdateDraft(ctx context.Context, id uint32, fields ma
|
||||
}
|
||||
clean["updated_at"] = uint32(time.Now().Unix())
|
||||
return r.db.WithContext(ctx).
|
||||
Model(&model.BrandRunwayDraft{}).
|
||||
Model(&model.BrandRunway{}).
|
||||
Where("id = ?", id).
|
||||
Updates(clean).Error
|
||||
}
|
||||
|
||||
func (r *reviewRepository) SetDraftStatus(ctx context.Context, id uint32, status, reviewer, reason string) error {
|
||||
func (r *reviewRepository) SetRecordStatus(ctx context.Context, id uint32, status, reviewer, reason string) error {
|
||||
return r.db.WithContext(ctx).
|
||||
Model(&model.BrandRunwayDraft{}).
|
||||
Model(&model.BrandRunway{}).
|
||||
Where("id = ?", id).
|
||||
Updates(map[string]any{
|
||||
"status": status,
|
||||
@ -156,132 +151,8 @@ func (r *reviewRepository) SetDraftStatus(ctx context.Context, id uint32, status
|
||||
}).Error
|
||||
}
|
||||
|
||||
// SaveRunwayFromDraft 晋升草稿到正式表：
|
||||
// 1. 按实体键（brand_id + season_code + collection_type）查找已存在的正式走秀（幂等：重审同一草稿只更新，不重复建行）；
|
||||
// 2. 存在则更新全部可编辑字段 + 图片数；不存在则新建；
|
||||
// 3. 替换图片：软删旧图（is_deleted=1）+ 按草稿图片重建；
|
||||
// 4. 返回正式表主键。
|
||||
//
|
||||
// 在事务内完成，保证草稿与正式表一致性。
|
||||
func (r *reviewRepository) SaveRunwayFromDraft(ctx context.Context, draftID uint32) (uint32, error) {
|
||||
var draft model.BrandRunwayDraft
|
||||
if err := r.db.WithContext(ctx).Where("id = ? AND is_deleted = 0", draftID).First(&draft).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return 0, ErrNotFound
|
||||
}
|
||||
return 0, err
|
||||
}
|
||||
// 多来源聚合：当前草稿图 + 同实体已 approved 的其他草稿图（按 image URL 去重，
|
||||
// S4 key 已是 sha1，同图 URL 必相同）。当前正被审核的草稿强制纳入，其余只取已审核来源。
|
||||
curImgs, err := r.DraftImages(ctx, draftID)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
sibImgs, err := r.runwayApprovedSiblingImages(ctx, draftID, draft.BrandID, draft.SeasonCode, draft.CollectionType)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
imgs := unionRunwayDraftImages(curImgs, sibImgs)
|
||||
|
||||
// image_count 仅计主图（is_detail=0）：对外列表卡片「N 张」与详情默认画廊都只展示主图，
|
||||
// 细节图作为主图的附属按需展开，不计入主图数。
|
||||
mainCount := 0
|
||||
for _, im := range imgs {
|
||||
if im.IsDetail == 0 {
|
||||
mainCount++
|
||||
}
|
||||
}
|
||||
|
||||
now := uint32(time.Now().Unix())
|
||||
var runwayID uint32
|
||||
err = r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
// 1) 按实体键查找既有正式走秀
|
||||
var existing model.BrandRunway
|
||||
if eErr := tx.Where("brand_id = ? AND season_code = ? AND collection_type = ? AND is_deleted = 0", draft.BrandID, draft.SeasonCode, draft.CollectionType).
|
||||
Limit(1).Find(&existing).Error; eErr != nil {
|
||||
return eErr
|
||||
}
|
||||
|
||||
common := map[string]any{
|
||||
"title_en": draft.TitleEn,
|
||||
"title_cn": draft.TitleCn,
|
||||
"description_en": draft.DescriptionEn,
|
||||
"description_cn": draft.DescriptionCn,
|
||||
"year": draft.Year,
|
||||
"season": draft.Season,
|
||||
"collection_type": draft.CollectionType,
|
||||
"season_code": draft.SeasonCode,
|
||||
"cover": draft.Cover,
|
||||
"image_count": uint16(mainCount),
|
||||
"updated_at": now,
|
||||
}
|
||||
|
||||
if existing.ID != 0 {
|
||||
runwayID = existing.ID
|
||||
common["brand_id"] = existing.BrandID // 保留正式表的品牌归属
|
||||
if uErr := tx.Model(&model.BrandRunway{}).Where("id = ?", runwayID).Updates(common).Error; uErr != nil {
|
||||
return uErr
|
||||
}
|
||||
} else {
|
||||
rw := &model.BrandRunway{
|
||||
BrandID: draft.BrandID,
|
||||
TitleEn: draft.TitleEn,
|
||||
TitleCn: draft.TitleCn,
|
||||
DescriptionEn: draft.DescriptionEn,
|
||||
DescriptionCn: draft.DescriptionCn,
|
||||
Year: draft.Year,
|
||||
Season: draft.Season,
|
||||
CollectionType: draft.CollectionType,
|
||||
SeasonCode: draft.SeasonCode,
|
||||
Cover: draft.Cover,
|
||||
ImageCount: uint16(mainCount),
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
}
|
||||
if cErr := tx.Create(rw).Error; cErr != nil {
|
||||
return cErr
|
||||
}
|
||||
runwayID = rw.ID
|
||||
}
|
||||
|
||||
// 2) 替换图片：软删旧 + 重建
|
||||
if dErr := tx.Model(&model.BrandRunwayImage{}).
|
||||
Where("runway_id = ? AND is_deleted = 0", runwayID).
|
||||
Updates(map[string]any{"is_deleted": 1, "updated_at": now}).Error; dErr != nil {
|
||||
return dErr
|
||||
}
|
||||
if len(imgs) > 0 {
|
||||
rows := make([]model.BrandRunwayImage, 0, len(imgs))
|
||||
for i, im := range imgs {
|
||||
rows = append(rows, model.BrandRunwayImage{
|
||||
RunwayID: runwayID,
|
||||
BrandID: draft.BrandID,
|
||||
Image: im.Image,
|
||||
Name: im.Name,
|
||||
SortOrder: uint32(i + 1),
|
||||
LookIndex: im.LookIndex,
|
||||
IsDetail: im.IsDetail,
|
||||
Phash: im.Phash,
|
||||
IsDuplicate: im.IsDuplicate,
|
||||
DupOf: im.DupOf,
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
})
|
||||
}
|
||||
if cErr := tx.Create(&rows).Error; cErr != nil {
|
||||
return cErr
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return runwayID, nil
|
||||
}
|
||||
|
||||
// CountDraftPending 统计传入表（dest 零值指针）中指定状态的草稿数；供各 ReviewModule 复用。
|
||||
func (r *reviewRepository) CountDraftPending(ctx context.Context, status string, dest any) (int64, error) {
|
||||
// CountByStatus 统计传入表（dest 零值指针）中指定状态的行数；供各 ReviewModule 复用。
|
||||
func (r *reviewRepository) CountByStatus(ctx context.Context, status string, dest any) (int64, error) {
|
||||
var n int64
|
||||
if err := r.db.WithContext(ctx).
|
||||
Model(dest).
|
||||
@ -292,16 +163,16 @@ func (r *reviewRepository) CountDraftPending(ctx context.Context, status string,
|
||||
return n, nil
|
||||
}
|
||||
|
||||
// ---- 街拍草稿镜像实现（与 runway 同构） ----
|
||||
// ---- 街拍镜像实现（与 runway 同构） ----
|
||||
|
||||
func (r *reviewRepository) ListStreetDrafts(ctx context.Context, status string, page, size int) ([]model.StreetSnapDraft, int64, error) {
|
||||
func (r *reviewRepository) ListStreetRecords(ctx context.Context, status string, page, size int) ([]model.StreetSnap, int64, error) {
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
if size < 1 || size > 100 {
|
||||
size = 20
|
||||
}
|
||||
q := r.db.WithContext(ctx).Model(&model.StreetSnapDraft{}).Where("is_deleted = 0")
|
||||
q := r.db.WithContext(ctx).Model(&model.StreetSnap{}).Where("is_deleted = 0")
|
||||
if status != "" {
|
||||
q = q.Where("status = ?", status)
|
||||
}
|
||||
@ -310,11 +181,11 @@ func (r *reviewRepository) ListStreetDrafts(ctx context.Context, status string,
|
||||
return nil, 0, err
|
||||
}
|
||||
if total == 0 {
|
||||
return []model.StreetSnapDraft{}, 0, nil
|
||||
return []model.StreetSnap{}, 0, nil
|
||||
}
|
||||
var rows []model.StreetSnapDraft
|
||||
var rows []model.StreetSnap
|
||||
if err := q.
|
||||
Order("CASE status WHEN '" + model.DraftStatusPending + "' THEN 0 ELSE 1 END ASC, id DESC").
|
||||
Order("CASE status WHEN '" + model.StatusPending + "' THEN 0 ELSE 1 END ASC, id DESC").
|
||||
Offset((page - 1) * size).
|
||||
Limit(size).
|
||||
Find(&rows).Error; err != nil {
|
||||
@ -323,8 +194,8 @@ func (r *reviewRepository) ListStreetDrafts(ctx context.Context, status string,
|
||||
return rows, total, nil
|
||||
}
|
||||
|
||||
func (r *reviewRepository) StreetDraftDetail(ctx context.Context, id uint32) (*model.StreetSnapDraft, error) {
|
||||
var d model.StreetSnapDraft
|
||||
func (r *reviewRepository) StreetRecordDetail(ctx context.Context, id uint32) (*model.StreetSnap, error) {
|
||||
var d model.StreetSnap
|
||||
if err := r.db.WithContext(ctx).Where("id = ? AND is_deleted = 0", id).First(&d).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, ErrNotFound
|
||||
@ -334,26 +205,26 @@ func (r *reviewRepository) StreetDraftDetail(ctx context.Context, id uint32) (*m
|
||||
return &d, nil
|
||||
}
|
||||
|
||||
func (r *reviewRepository) StreetDraftImages(ctx context.Context, draftID uint32) ([]model.StreetSnapDraftImage, error) {
|
||||
var imgs []model.StreetSnapDraftImage
|
||||
func (r *reviewRepository) StreetRecordImages(ctx context.Context, recordID uint32) ([]model.StreetSnapImage, error) {
|
||||
var imgs []model.StreetSnapImage
|
||||
err := r.db.WithContext(ctx).
|
||||
Where("draft_id = ? AND is_deleted = 0", draftID).
|
||||
Where("snap_id = ? AND is_deleted = 0", recordID).
|
||||
Order("sort_order ASC, id ASC").
|
||||
Find(&imgs).Error
|
||||
return imgs, err
|
||||
}
|
||||
|
||||
// streetDraftEditable 街拍草稿可微调字段白名单（title / year / city）。
|
||||
var streetDraftEditable = map[string]bool{
|
||||
// streetRecordEditable 街拍记录可微调字段白名单（title / year / city）。
|
||||
var streetRecordEditable = map[string]bool{
|
||||
"title": true,
|
||||
"year": true,
|
||||
"city": true,
|
||||
}
|
||||
|
||||
func (r *reviewRepository) UpdateStreetDraft(ctx context.Context, id uint32, fields map[string]any) error {
|
||||
func (r *reviewRepository) UpdateStreetRecord(ctx context.Context, id uint32, fields map[string]any) error {
|
||||
clean := map[string]any{}
|
||||
for k, v := range fields {
|
||||
if streetDraftEditable[k] {
|
||||
if streetRecordEditable[k] {
|
||||
clean[k] = v
|
||||
}
|
||||
}
|
||||
@ -362,14 +233,14 @@ func (r *reviewRepository) UpdateStreetDraft(ctx context.Context, id uint32, fie
|
||||
}
|
||||
clean["updated_at"] = uint32(time.Now().Unix())
|
||||
return r.db.WithContext(ctx).
|
||||
Model(&model.StreetSnapDraft{}).
|
||||
Model(&model.StreetSnap{}).
|
||||
Where("id = ?", id).
|
||||
Updates(clean).Error
|
||||
}
|
||||
|
||||
func (r *reviewRepository) SetStreetDraftStatus(ctx context.Context, id uint32, status, reviewer, reason string) error {
|
||||
func (r *reviewRepository) SetStreetRecordStatus(ctx context.Context, id uint32, status, reviewer, reason string) error {
|
||||
return r.db.WithContext(ctx).
|
||||
Model(&model.StreetSnapDraft{}).
|
||||
Model(&model.StreetSnap{}).
|
||||
Where("id = ?", id).
|
||||
Updates(map[string]any{
|
||||
"status": status,
|
||||
@ -379,266 +250,40 @@ func (r *reviewRepository) SetStreetDraftStatus(ctx context.Context, id uint32,
|
||||
}).Error
|
||||
}
|
||||
|
||||
// SaveStreetSnapFromDraft 晋升街拍草稿到正式表 street_snaps（按实体键 city+year 幂等 upsert，替换图片）。
|
||||
// 逻辑与 SaveRunwayFromDraft 同构，但无 brand_id、有 city，图片明细落到 street_snap_images。
|
||||
// 在事务内完成，保证草稿与正式表一致性。
|
||||
func (r *reviewRepository) SaveStreetSnapFromDraft(ctx context.Context, draftID uint32) (uint32, error) {
|
||||
var draft model.StreetSnapDraft
|
||||
if err := r.db.WithContext(ctx).Where("id = ? AND is_deleted = 0", draftID).First(&draft).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return 0, ErrNotFound
|
||||
}
|
||||
return 0, err
|
||||
}
|
||||
curImgs, err := r.StreetDraftImages(ctx, draftID)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
sibImgs, err := r.streetApprovedSiblingImages(ctx, draftID, draft.City, draft.Year)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
imgs := unionStreetDraftImages(curImgs, sibImgs)
|
||||
// ── 图片软删 ────────────────────────────────────────────────────────────────
|
||||
|
||||
now := uint32(time.Now().Unix())
|
||||
var snapID uint32
|
||||
err = r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var existing model.StreetSnap
|
||||
if eErr := tx.Where("city = ? AND year = ? AND is_deleted = 0", draft.City, draft.Year).
|
||||
Limit(1).Find(&existing).Error; eErr != nil {
|
||||
return eErr
|
||||
}
|
||||
|
||||
common := map[string]any{
|
||||
"title": draft.Title,
|
||||
"year": draft.Year,
|
||||
"city": draft.City,
|
||||
"cover": draft.Cover,
|
||||
"image_count": uint16(len(imgs)),
|
||||
"updated_at": now,
|
||||
}
|
||||
|
||||
if existing.ID != 0 {
|
||||
snapID = existing.ID
|
||||
if uErr := tx.Model(&model.StreetSnap{}).Where("id = ?", snapID).Updates(common).Error; uErr != nil {
|
||||
return uErr
|
||||
}
|
||||
} else {
|
||||
snap := &model.StreetSnap{
|
||||
Title: draft.Title,
|
||||
Year: draft.Year,
|
||||
City: draft.City,
|
||||
Cover: draft.Cover,
|
||||
ImageCount: uint16(len(imgs)),
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
}
|
||||
if cErr := tx.Create(snap).Error; cErr != nil {
|
||||
return cErr
|
||||
}
|
||||
snapID = snap.ID
|
||||
}
|
||||
|
||||
// 替换图片：软删旧 + 重建
|
||||
if dErr := tx.Model(&model.StreetSnapImage{}).
|
||||
Where("snap_id = ? AND is_deleted = 0", snapID).
|
||||
Updates(map[string]any{"is_deleted": 1, "updated_at": now}).Error; dErr != nil {
|
||||
return dErr
|
||||
}
|
||||
if len(imgs) > 0 {
|
||||
// 第一遍：插入主图（is_detail=0），并记下「草稿行 id → 新正式行 id」的映射。
|
||||
//
|
||||
// 必须两遍插入：副图的 parent_image_id 存的是**草稿表**的行 id，
|
||||
// 而这里插入的正式行拿到的是全新 id。若先插副图，父引用就会指向草稿表的旧 id，
|
||||
// 详情页折叠结构随之错乱（见计划「任务 2」标题下的说明）。
|
||||
newIDByDraftID := make(map[uint32]uint32, len(imgs))
|
||||
mains := make([]model.StreetSnapImage, 0, len(imgs))
|
||||
for _, im := range imgs {
|
||||
if im.IsDetail == 1 {
|
||||
continue
|
||||
}
|
||||
mains = append(mains, model.StreetSnapImage{
|
||||
SnapID: snapID,
|
||||
Image: im.Image,
|
||||
Name: im.Name,
|
||||
SortOrder: uint32(len(mains) + 1),
|
||||
IsDetail: 0,
|
||||
Phash: im.Phash,
|
||||
IsDuplicate: im.IsDuplicate,
|
||||
DupOf: im.DupOf,
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
})
|
||||
}
|
||||
for i := range mains {
|
||||
if cErr := tx.Create(&mains[i]).Error; cErr != nil {
|
||||
return cErr
|
||||
}
|
||||
}
|
||||
mainIdx := 0
|
||||
for _, im := range imgs {
|
||||
if im.IsDetail == 1 {
|
||||
continue
|
||||
}
|
||||
newIDByDraftID[im.ID] = mains[mainIdx].ID
|
||||
mainIdx++
|
||||
}
|
||||
|
||||
// 第二遍：插入副图，把父引用改写成新主图行 id。
|
||||
details := make([]model.StreetSnapImage, 0, len(imgs)-len(mains))
|
||||
for _, im := range imgs {
|
||||
if im.IsDetail != 1 {
|
||||
continue
|
||||
}
|
||||
newParent, ok := newIDByDraftID[im.ParentImageID]
|
||||
row := model.StreetSnapImage{
|
||||
SnapID: snapID,
|
||||
Image: im.Image,
|
||||
Name: im.Name,
|
||||
SortOrder: uint32(len(mains) + len(details) + 1),
|
||||
IsDetail: 1,
|
||||
Phash: im.Phash,
|
||||
IsDuplicate: im.IsDuplicate,
|
||||
DupOf: im.DupOf,
|
||||
CreatedAt: now,
|
||||
UpdatedAt: now,
|
||||
}
|
||||
if ok {
|
||||
row.ParentImageID = newParent
|
||||
} else {
|
||||
row.IsDetail = 0 // 父行缺失：按主图渲染，与读侧容错口径一致
|
||||
}
|
||||
details = append(details, row)
|
||||
}
|
||||
if len(details) > 0 {
|
||||
if cErr := tx.Create(&details).Error; cErr != nil {
|
||||
return cErr
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return snapID, nil
|
||||
}
|
||||
|
||||
// runwayApprovedSiblingImages 返回同实体（品牌+季节码+系列）且已 approved 的其他草稿的图片，
|
||||
// 用于多来源聚合：当前正被审核的草稿强制纳入，其余仅合并已审核来源，避免未审图泄露进正式表。
|
||||
func (r *reviewRepository) runwayApprovedSiblingImages(ctx context.Context, excludeDraftID, brandID uint32, seasonCode, collectionType string) ([]model.BrandRunwayDraftImage, error) {
|
||||
var drafts []model.BrandRunwayDraft
|
||||
// SoftDeleteRunwayImage 软删单张走秀图片（审核阶段剔除坏图），并同步记录 image_count。
|
||||
// 不删S4文件（与正式表既有删除行为一致：仅 DB 标记，避免误删被引用文件）。
|
||||
func (r *reviewRepository) SoftDeleteRunwayImage(ctx context.Context, recordID, imgID uint32) error {
|
||||
if err := r.db.WithContext(ctx).
|
||||
Where("brand_id = ? AND season_code = ? AND collection_type = ? AND status = ? AND is_deleted = 0 AND id <> ?", brandID, seasonCode, collectionType, model.DraftStatusApproved, excludeDraftID).
|
||||
Find(&drafts).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out := make([]model.BrandRunwayDraftImage, 0)
|
||||
for _, d := range drafts {
|
||||
imgs, err := r.DraftImages(ctx, d.ID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, imgs...)
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// unionRunwayDraftImages 按 image URL 去重合并（S4 key 已是 sha1，同图 URL 必相同）。当前草稿图优先。
|
||||
func unionRunwayDraftImages(a, b []model.BrandRunwayDraftImage) []model.BrandRunwayDraftImage {
|
||||
seen := make(map[string]struct{}, len(a)+len(b))
|
||||
out := make([]model.BrandRunwayDraftImage, 0, len(a)+len(b))
|
||||
for _, im := range a {
|
||||
if _, ok := seen[im.Image]; ok {
|
||||
continue
|
||||
}
|
||||
seen[im.Image] = struct{}{}
|
||||
out = append(out, im)
|
||||
}
|
||||
for _, im := range b {
|
||||
if _, ok := seen[im.Image]; ok {
|
||||
continue
|
||||
}
|
||||
seen[im.Image] = struct{}{}
|
||||
out = append(out, im)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// streetApprovedSiblingImages 同 city+year 已 approved 的其他街拍草稿图（多来源聚合）。
|
||||
func (r *reviewRepository) streetApprovedSiblingImages(ctx context.Context, excludeDraftID uint32, city string, year uint16) ([]model.StreetSnapDraftImage, error) {
|
||||
var drafts []model.StreetSnapDraft
|
||||
if err := r.db.WithContext(ctx).
|
||||
Where("city = ? AND year = ? AND status = ? AND is_deleted = 0 AND id <> ?", city, year, model.DraftStatusApproved, excludeDraftID).
|
||||
Find(&drafts).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out := make([]model.StreetSnapDraftImage, 0)
|
||||
for _, d := range drafts {
|
||||
imgs, err := r.StreetDraftImages(ctx, d.ID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
out = append(out, imgs...)
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// unionStreetDraftImages 按 image URL 去重合并。当前草稿图优先。
|
||||
func unionStreetDraftImages(a, b []model.StreetSnapDraftImage) []model.StreetSnapDraftImage {
|
||||
seen := make(map[string]struct{}, len(a)+len(b))
|
||||
out := make([]model.StreetSnapDraftImage, 0, len(a)+len(b))
|
||||
for _, im := range a {
|
||||
if _, ok := seen[im.Image]; ok {
|
||||
continue
|
||||
}
|
||||
seen[im.Image] = struct{}{}
|
||||
out = append(out, im)
|
||||
}
|
||||
for _, im := range b {
|
||||
if _, ok := seen[im.Image]; ok {
|
||||
continue
|
||||
}
|
||||
seen[im.Image] = struct{}{}
|
||||
out = append(out, im)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// ── 草稿图片删除 ────────────────────────────────────────────────────────────────
|
||||
|
||||
// SoftDeleteRunwayDraftImage 软删单张走秀草稿图片（审核阶段剔除坏图），并同步草稿 image_count。
|
||||
// 不删S4文件（与正式表 DeleteRunwayImage 行为一致：仅 DB 标记，避免误删被引用文件）。
|
||||
func (r *reviewRepository) SoftDeleteRunwayDraftImage(ctx context.Context, draftID, imgID uint32) error {
|
||||
if err := r.db.WithContext(ctx).
|
||||
Model(&model.BrandRunwayDraftImage{}).
|
||||
Where("id = ? AND draft_id = ? AND is_deleted = 0", imgID, draftID).
|
||||
Model(&model.BrandRunwayImage{}).
|
||||
Where("id = ? AND runway_id = ? AND is_deleted = 0", imgID, recordID).
|
||||
Updates(map[string]any{"is_deleted": 1, "updated_at": uint32(time.Now().Unix())}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return r.db.WithContext(ctx).
|
||||
Exec("UPDATE brand_runway_drafts SET image_count = GREATEST(image_count - 1, 0) WHERE id = ?", draftID).Error
|
||||
Exec("UPDATE brand_runways SET image_count = GREATEST(image_count - 1, 0) WHERE id = ?", recordID).Error
|
||||
}
|
||||
|
||||
// SoftDeleteStreetDraftImage 软删单张街拍草稿图片，并同步 image_count。
|
||||
func (r *reviewRepository) SoftDeleteStreetDraftImage(ctx context.Context, draftID, imgID uint32) error {
|
||||
// SoftDeleteStreetImage 软删单张街拍图片，并同步记录 image_count。
|
||||
func (r *reviewRepository) SoftDeleteStreetImage(ctx context.Context, recordID, imgID uint32) error {
|
||||
if err := r.db.WithContext(ctx).
|
||||
Model(&model.StreetSnapDraftImage{}).
|
||||
Where("id = ? AND draft_id = ? AND is_deleted = 0", imgID, draftID).
|
||||
Model(&model.StreetSnapImage{}).
|
||||
Where("id = ? AND snap_id = ? AND is_deleted = 0", imgID, recordID).
|
||||
Updates(map[string]any{"is_deleted": 1, "updated_at": uint32(time.Now().Unix())}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return r.db.WithContext(ctx).
|
||||
Exec("UPDATE street_snap_drafts SET image_count = GREATEST(image_count - 1, 0) WHERE id = ?", draftID).Error
|
||||
Exec("UPDATE street_snaps SET image_count = GREATEST(image_count - 1, 0) WHERE id = ?", recordID).Error
|
||||
}
|
||||
|
||||
// GetDraftImageKey 取单张草稿图片的S4 key（删除前清理用）；不存在返回空串。
|
||||
// kind 决定查哪张草稿图片表（runway / street）；未知 kind 返回 ErrNotFound。
|
||||
func (r *reviewRepository) GetDraftImageKey(ctx context.Context, kind string, draftID, imgID uint32) (string, error) {
|
||||
// GetImageKey 取单张图片的S4 key（删除前清理用）；不存在返回空串。
|
||||
// kind 决定查哪张图片表（runway / street）；未知 kind 返回 ErrNotFound。
|
||||
func (r *reviewRepository) GetImageKey(ctx context.Context, kind string, recordID, imgID uint32) (string, error) {
|
||||
switch kind {
|
||||
case dto.IngestKindRunway:
|
||||
var im model.BrandRunwayDraftImage
|
||||
err := r.db.WithContext(ctx).Where("id = ? AND draft_id = ?", imgID, draftID).First(&im).Error
|
||||
var im model.BrandRunwayImage
|
||||
err := r.db.WithContext(ctx).Where("id = ? AND runway_id = ?", imgID, recordID).First(&im).Error
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return "", nil
|
||||
}
|
||||
@ -647,8 +292,8 @@ func (r *reviewRepository) GetDraftImageKey(ctx context.Context, kind string, dr
|
||||
}
|
||||
return im.Image, nil
|
||||
case dto.IngestKindStreet:
|
||||
var im model.StreetSnapDraftImage
|
||||
err := r.db.WithContext(ctx).Where("id = ? AND draft_id = ?", imgID, draftID).First(&im).Error
|
||||
var im model.StreetSnapImage
|
||||
err := r.db.WithContext(ctx).Where("id = ? AND snap_id = ?", imgID, recordID).First(&im).Error
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return "", nil
|
||||
}
|
||||
@ -661,13 +306,13 @@ func (r *reviewRepository) GetDraftImageKey(ctx context.Context, kind string, dr
|
||||
}
|
||||
}
|
||||
|
||||
// ── 街拍草稿图片：主副图分组 ──────────────────────────────────────────────
|
||||
// ── 街拍主副图分组 ──────────────────────────────────────────────────────────
|
||||
|
||||
// AttachStreetDraftImages 把 imgIDs 变成 mainImgID 的副图（批量并入）。
|
||||
// AttachStreetSnapImages 把 imgIDs 变成 mainImgID 的副图（批量并入）。
|
||||
//
|
||||
// 事务内三步：1) 校验主图存在、未软删、本身是主图；2) 先「改挂孙辈」——被并入图原有的副图
|
||||
// 改挂到新主图（避免副图的副图）；3) 再把被并入图自身标为副图。第 2 步必须在第 3 步之前。
|
||||
func (r *reviewRepository) AttachStreetDraftImages(ctx context.Context, draftID, mainImgID uint32, imgIDs []uint32) error {
|
||||
func (r *reviewRepository) AttachStreetSnapImages(ctx context.Context, snapID, mainImgID uint32, imgIDs []uint32) error {
|
||||
ids := make([]uint32, 0, len(imgIDs))
|
||||
for _, id := range imgIDs {
|
||||
if id != 0 && id != mainImgID {
|
||||
@ -684,8 +329,8 @@ func (r *reviewRepository) AttachStreetDraftImages(ctx context.Context, draftID,
|
||||
}
|
||||
|
||||
return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
var main model.StreetSnapDraftImage
|
||||
if err := tx.Where("id = ? AND draft_id = ? AND is_deleted = 0 AND is_detail = 0", mainImgID, draftID).
|
||||
var main model.StreetSnapImage
|
||||
if err := tx.Where("id = ? AND snap_id = ? AND is_deleted = 0 AND is_detail = 0", mainImgID, snapID).
|
||||
First(&main).Error; err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return ErrInvalidImageGroup
|
||||
@ -694,23 +339,23 @@ func (r *reviewRepository) AttachStreetDraftImages(ctx context.Context, draftID,
|
||||
}
|
||||
|
||||
now := uint32(time.Now().Unix())
|
||||
if err := tx.Model(&model.StreetSnapDraftImage{}).
|
||||
Where("draft_id = ? AND is_deleted = 0 AND parent_image_id IN ?", draftID, ids).
|
||||
if err := tx.Model(&model.StreetSnapImage{}).
|
||||
Where("snap_id = ? AND is_deleted = 0 AND parent_image_id IN ?", snapID, ids).
|
||||
Updates(map[string]any{"parent_image_id": mainImgID, "updated_at": now}).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Model(&model.StreetSnapDraftImage{}).
|
||||
Where("draft_id = ? AND is_deleted = 0 AND id IN ?", draftID, ids).
|
||||
return tx.Model(&model.StreetSnapImage{}).
|
||||
Where("snap_id = ? AND is_deleted = 0 AND id IN ?", snapID, ids).
|
||||
Updates(map[string]any{"is_detail": 1, "parent_image_id": mainImgID, "updated_at": now}).Error
|
||||
})
|
||||
}
|
||||
|
||||
// DetachStreetDraftImage 把副图恢复为主图。对主图调用为幂等成功。
|
||||
// DetachStreetSnapImage 把副图恢复为主图。对主图调用为幂等成功。
|
||||
// 拆出的图若自身带着副图，那些副图保持挂在它下面——它重新成为主图，不变量依然成立。
|
||||
func (r *reviewRepository) DetachStreetDraftImage(ctx context.Context, draftID, imgID uint32) error {
|
||||
func (r *reviewRepository) DetachStreetSnapImage(ctx context.Context, snapID, imgID uint32) error {
|
||||
return r.db.WithContext(ctx).
|
||||
Model(&model.StreetSnapDraftImage{}).
|
||||
Where("id = ? AND draft_id = ? AND is_deleted = 0 AND is_detail = 1", imgID, draftID).
|
||||
Model(&model.StreetSnapImage{}).
|
||||
Where("id = ? AND snap_id = ? AND is_deleted = 0 AND is_detail = 1", imgID, snapID).
|
||||
Updates(map[string]any{"is_detail": 0, "parent_image_id": 0, "updated_at": uint32(time.Now().Unix())}).
|
||||
Error
|
||||
}
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
//go:build integration
|
||||
|
||||
// 集成测试：街拍草稿主副图分组需要真实 PostgreSQL。
|
||||
// 集成测试：街拍主副图分组需要真实 PostgreSQL。
|
||||
//
|
||||
// 单表发布模型下操作对象是正式表本身（street_snaps / street_snap_images），
|
||||
// 不再有草稿表；审核通过只改状态、不重建图片，故本文件不再覆盖「晋升重建父引用」。
|
||||
//
|
||||
// 运行方式（先起库并确保结构已就绪，见 README「数据库」一节）：
|
||||
//
|
||||
@ -13,61 +16,74 @@ package repository
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"testing"
|
||||
|
||||
"fashionapi/internal/model"
|
||||
)
|
||||
|
||||
// seedStreetDraft 插入一条街拍草稿并返回其 id。
|
||||
func seedStreetDraft(t *testing.T, repo ReviewRepository) uint32 {
|
||||
// mainDetailSeedSeq 让每次 seed 出来的实体键（city + year）互不相同。
|
||||
// 正式表上有部分唯一索引 uq_ss_entity (city, year) WHERE is_deleted = 0，
|
||||
// 若测试沿用同一 city/year，第二条记录会被唯一索引拒绝。
|
||||
var mainDetailSeedSeq int
|
||||
|
||||
// seedMainDetailSnap 插入一条街拍正式记录（status=pending）并返回其 id。
|
||||
// 命名加 MainDetail 前缀以避免与 publish_status_integration_test.go 的 seedStreetSnap 冲突。
|
||||
func seedMainDetailSnap(t *testing.T, repo ReviewRepository) uint32 {
|
||||
t.Helper()
|
||||
ctx := context.Background()
|
||||
db := repo.(*reviewRepository).db
|
||||
d := model.StreetSnapDraft{Title: "主副图测试", Year: 2026, City: "TestCity", Status: model.DraftStatusPending}
|
||||
if err := db.WithContext(ctx).Create(&d).Error; err != nil {
|
||||
t.Fatalf("插入草稿失败: %v", err)
|
||||
mainDetailSeedSeq++
|
||||
snap := model.StreetSnap{
|
||||
Title: "主副图测试",
|
||||
Year: 2026,
|
||||
City: fmt.Sprintf("TestCity-%d", mainDetailSeedSeq),
|
||||
Status: model.StatusPending,
|
||||
}
|
||||
if err := db.WithContext(ctx).Create(&snap).Error; err != nil {
|
||||
t.Fatalf("插入街拍记录失败: %v", err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
db.Exec("DELETE FROM street_snap_draft_images WHERE draft_id = ?", d.ID)
|
||||
db.Exec("DELETE FROM street_snap_drafts WHERE id = ?", d.ID)
|
||||
db.Exec("DELETE FROM street_snap_images WHERE snap_id = ?", snap.ID)
|
||||
db.Exec("DELETE FROM street_snaps WHERE id = ?", snap.ID)
|
||||
})
|
||||
return d.ID
|
||||
return snap.ID
|
||||
}
|
||||
|
||||
// seedStreetDraftImage 插入一张草稿图并返回其行 id。
|
||||
func seedStreetDraftImage(t *testing.T, repo ReviewRepository, draftID uint32, name string, order uint32) uint32 {
|
||||
// seedMainDetailImage 插入一张正式街拍图并返回其行 id。
|
||||
func seedMainDetailImage(t *testing.T, repo ReviewRepository, snapID uint32, name string, order uint32) uint32 {
|
||||
t.Helper()
|
||||
img := model.StreetSnapDraftImage{DraftID: draftID, Image: name + ".jpg", Name: name, SortOrder: order}
|
||||
img := model.StreetSnapImage{SnapID: snapID, Image: name + ".jpg", Name: name, SortOrder: order}
|
||||
if err := repo.(*reviewRepository).db.WithContext(context.Background()).Create(&img).Error; err != nil {
|
||||
t.Fatalf("插入草稿图失败: %v", err)
|
||||
t.Fatalf("插入街拍图失败: %v", err)
|
||||
}
|
||||
return img.ID
|
||||
}
|
||||
|
||||
// reloadStreetImages 取草稿的全部图（按 sort_order, id 升序），便于断言。
|
||||
func reloadStreetImages(t *testing.T, repo ReviewRepository, draftID uint32) []model.StreetSnapDraftImage {
|
||||
// reloadSnapImages 取记录的全部图（按 sort_order, id 升序），便于断言。
|
||||
func reloadSnapImages(t *testing.T, repo ReviewRepository, snapID uint32) []model.StreetSnapImage {
|
||||
t.Helper()
|
||||
imgs, err := repo.StreetDraftImages(context.Background(), draftID)
|
||||
imgs, err := repo.StreetRecordImages(context.Background(), snapID)
|
||||
if err != nil {
|
||||
t.Fatalf("读草稿图失败: %v", err)
|
||||
t.Fatalf("读街拍图失败: %v", err)
|
||||
}
|
||||
return imgs
|
||||
}
|
||||
|
||||
// TestStreetMainDetail 覆盖批量并入 / 并入上一张 / 拆出 / 跨草稿拦截四条主线。
|
||||
// TestStreetMainDetail 覆盖批量并入 / 拆出 / 跨记录拦截三条主线。
|
||||
func TestStreetMainDetail(t *testing.T) {
|
||||
repo := NewReviewRepository(testDB(t))
|
||||
ctx := context.Background()
|
||||
|
||||
draftID := seedStreetDraft(t, repo)
|
||||
m1 := seedStreetDraftImage(t, repo, draftID, "a", 1)
|
||||
d2 := seedStreetDraftImage(t, repo, draftID, "b", 2)
|
||||
d3 := seedStreetDraftImage(t, repo, draftID, "c", 3)
|
||||
snapID := seedMainDetailSnap(t, repo)
|
||||
m1 := seedMainDetailImage(t, repo, snapID, "a", 1)
|
||||
d2 := seedMainDetailImage(t, repo, snapID, "b", 2)
|
||||
d3 := seedMainDetailImage(t, repo, snapID, "c", 3)
|
||||
|
||||
if err := repo.AttachStreetDraftImages(ctx, draftID, m1, []uint32{d2, d3}); err != nil {
|
||||
if err := repo.AttachStreetSnapImages(ctx, snapID, m1, []uint32{d2, d3}); err != nil {
|
||||
t.Fatalf("并入失败: %v", err)
|
||||
}
|
||||
for _, im := range reloadStreetImages(t, repo, draftID) {
|
||||
for _, im := range reloadSnapImages(t, repo, snapID) {
|
||||
switch im.ID {
|
||||
case m1:
|
||||
if im.IsDetail != 0 || im.ParentImageID != 0 {
|
||||
@ -81,40 +97,40 @@ func TestStreetMainDetail(t *testing.T) {
|
||||
}
|
||||
|
||||
// 幂等：重复并入同一批不报错，结果不变。
|
||||
if err := repo.AttachStreetDraftImages(ctx, draftID, m1, []uint32{d2, d3}); err != nil {
|
||||
if err := repo.AttachStreetSnapImages(ctx, snapID, m1, []uint32{d2, d3}); err != nil {
|
||||
t.Fatalf("重复并入应幂等，实际报错: %v", err)
|
||||
}
|
||||
|
||||
// 传入主图自身：调用方过滤掉的语义由仓储兜住（id <> main 条件），不报错也不改动主图。
|
||||
if err := repo.AttachStreetDraftImages(ctx, draftID, m1, []uint32{m1}); err != nil {
|
||||
if err := repo.AttachStreetSnapImages(ctx, snapID, m1, []uint32{m1}); err != nil {
|
||||
t.Fatalf("并入集合含主图自身应被忽略而非报错: %v", err)
|
||||
}
|
||||
for _, im := range reloadStreetImages(t, repo, draftID) {
|
||||
for _, im := range reloadSnapImages(t, repo, snapID) {
|
||||
if im.ID == m1 && (im.IsDetail != 0 || im.ParentImageID != 0) {
|
||||
t.Fatalf("主图被自身并入后不应变化")
|
||||
}
|
||||
}
|
||||
|
||||
// 拆出：把 d3 恢复为主图。
|
||||
if err := repo.DetachStreetDraftImage(ctx, draftID, d3); err != nil {
|
||||
if err := repo.DetachStreetSnapImage(ctx, snapID, d3); err != nil {
|
||||
t.Fatalf("拆出失败: %v", err)
|
||||
}
|
||||
for _, im := range reloadStreetImages(t, repo, draftID) {
|
||||
for _, im := range reloadSnapImages(t, repo, snapID) {
|
||||
if im.ID == d3 && (im.IsDetail != 0 || im.ParentImageID != 0) {
|
||||
t.Fatalf("拆出后应为 is_detail=0/parent=0，实际 %d/%d", im.IsDetail, im.ParentImageID)
|
||||
}
|
||||
}
|
||||
if err := repo.DetachStreetDraftImage(ctx, draftID, m1); err != nil { // 对主图幂等成功
|
||||
if err := repo.DetachStreetSnapImage(ctx, snapID, m1); err != nil { // 对主图幂等成功
|
||||
t.Fatalf("对主图拆出应幂等成功: %v", err)
|
||||
}
|
||||
|
||||
// 跨草稿拦截：空集合 + 跨草稿主图。
|
||||
if err := repo.AttachStreetDraftImages(ctx, draftID, m1, nil); !errors.Is(err, ErrInvalidImageGroup) {
|
||||
// 跨记录拦截：空集合 + 跨记录主图。
|
||||
if err := repo.AttachStreetSnapImages(ctx, snapID, m1, nil); !errors.Is(err, ErrInvalidImageGroup) {
|
||||
t.Fatalf("空集合应返回 ErrInvalidImageGroup，实际 %v", err)
|
||||
}
|
||||
otherMain := seedStreetDraftImage(t, repo, seedStreetDraft(t, repo), "x", 1)
|
||||
if err := repo.AttachStreetDraftImages(ctx, draftID, otherMain, []uint32{d2}); !errors.Is(err, ErrInvalidImageGroup) {
|
||||
t.Fatalf("跨草稿主图应被拦截，实际 %v", err)
|
||||
otherMain := seedMainDetailImage(t, repo, seedMainDetailSnap(t, repo), "x", 1)
|
||||
if err := repo.AttachStreetSnapImages(ctx, snapID, otherMain, []uint32{d2}); !errors.Is(err, ErrInvalidImageGroup) {
|
||||
t.Fatalf("跨记录主图应被拦截，实际 %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
@ -123,18 +139,18 @@ func TestStreetMainDetailReparentGrandchildren(t *testing.T) {
|
||||
repo := NewReviewRepository(testDB(t))
|
||||
ctx := context.Background()
|
||||
|
||||
draftID := seedStreetDraft(t, repo)
|
||||
m1 := seedStreetDraftImage(t, repo, draftID, "m1", 1)
|
||||
m2 := seedStreetDraftImage(t, repo, draftID, "m2", 2)
|
||||
child := seedStreetDraftImage(t, repo, draftID, "child", 3)
|
||||
snapID := seedMainDetailSnap(t, repo)
|
||||
m1 := seedMainDetailImage(t, repo, snapID, "m1", 1)
|
||||
m2 := seedMainDetailImage(t, repo, snapID, "m2", 2)
|
||||
child := seedMainDetailImage(t, repo, snapID, "child", 3)
|
||||
|
||||
if err := repo.AttachStreetDraftImages(ctx, draftID, m2, []uint32{child}); err != nil {
|
||||
if err := repo.AttachStreetSnapImages(ctx, snapID, m2, []uint32{child}); err != nil {
|
||||
t.Fatalf("预置副图失败: %v", err)
|
||||
}
|
||||
if err := repo.AttachStreetDraftImages(ctx, draftID, m1, []uint32{m2}); err != nil {
|
||||
if err := repo.AttachStreetSnapImages(ctx, snapID, m1, []uint32{m2}); err != nil {
|
||||
t.Fatalf("并入整组失败: %v", err)
|
||||
}
|
||||
for _, im := range reloadStreetImages(t, repo, draftID) {
|
||||
for _, im := range reloadSnapImages(t, repo, snapID) {
|
||||
if im.ID == m2 && (im.IsDetail != 1 || im.ParentImageID != m1) {
|
||||
t.Fatalf("m2 应成为 m1 的副图，实际 %d/%d", im.IsDetail, im.ParentImageID)
|
||||
}
|
||||
@ -143,50 +159,3 @@ func TestStreetMainDetailReparentGrandchildren(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TestStreetPromoteRebuildsParentRef 晋升时必须把副图的父引用从「草稿行 id」改写为「新正式行 id」。
|
||||
func TestStreetPromoteRebuildsParentRef(t *testing.T) {
|
||||
repo := NewReviewRepository(testDB(t))
|
||||
ctx := context.Background()
|
||||
|
||||
draftID := seedStreetDraft(t, repo)
|
||||
m1 := seedStreetDraftImage(t, repo, draftID, "main", 1)
|
||||
d2 := seedStreetDraftImage(t, repo, draftID, "detail-a", 2)
|
||||
d3 := seedStreetDraftImage(t, repo, draftID, "detail-b", 3)
|
||||
if err := repo.AttachStreetDraftImages(ctx, draftID, m1, []uint32{d2, d3}); err != nil {
|
||||
t.Fatalf("预置主副图失败: %v", err)
|
||||
}
|
||||
|
||||
snapID, err := repo.SaveStreetSnapFromDraft(ctx, draftID)
|
||||
if err != nil {
|
||||
t.Fatalf("晋升失败: %v", err)
|
||||
}
|
||||
t.Cleanup(func() {
|
||||
db := repo.(*reviewRepository).db
|
||||
db.Exec("DELETE FROM street_snap_images WHERE snap_id = ?", snapID)
|
||||
db.Exec("DELETE FROM street_snaps WHERE id = ?", snapID)
|
||||
})
|
||||
|
||||
db := repo.(*reviewRepository).db
|
||||
var rows []model.StreetSnapImage
|
||||
if err := db.WithContext(ctx).Where("snap_id = ? AND is_deleted = 0", snapID).
|
||||
Order("sort_order ASC, id ASC").Find(&rows).Error; err != nil {
|
||||
t.Fatalf("读正式图失败: %v", err)
|
||||
}
|
||||
if len(rows) != 3 {
|
||||
t.Fatalf("期望 3 行正式图，实际 %d", len(rows))
|
||||
}
|
||||
|
||||
mainRow := rows[0]
|
||||
if mainRow.IsDetail != 0 || mainRow.ParentImageID != 0 {
|
||||
t.Fatalf("首行应是主图，实际 is_detail=%d parent=%d", mainRow.IsDetail, mainRow.ParentImageID)
|
||||
}
|
||||
for _, row := range rows[1:] {
|
||||
if row.IsDetail != 1 {
|
||||
t.Fatalf("第 %d 行应是副图", row.ID)
|
||||
}
|
||||
if row.ParentImageID != mainRow.ID {
|
||||
t.Fatalf("副图 parent 应指向新主图行 id %d，实际 %d", mainRow.ID, row.ParentImageID)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user