fix
This commit is contained in:
@@ -261,6 +261,8 @@ func (p *Pipeline) LoadV1ProcessJobItems(ctx context.Context, companyID, jobID u
|
||||
); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_ = processedID
|
||||
_ = rawProductID
|
||||
if processedID == nil {
|
||||
st := MapV1JobItemStatus(itemStatus, false)
|
||||
if st == "processed" || st == "processing" || st == "pending" {
|
||||
@@ -274,7 +276,6 @@ func (p *Pipeline) LoadV1ProcessJobItems(ctx context.Context, companyID, jobID u
|
||||
if itemError != nil && *itemError != "" {
|
||||
item["error"] = *itemError
|
||||
}
|
||||
applyV1ProcessItemIDs(item, nil, rawProductID)
|
||||
full = append(full, item)
|
||||
continue
|
||||
}
|
||||
@@ -428,9 +429,9 @@ func (p *Pipeline) LoadV1ProcessJobItems(ctx context.Context, companyID, jobID u
|
||||
catIDOut = catStr
|
||||
}
|
||||
|
||||
var titleOut any
|
||||
var nameOut any
|
||||
if titleStr != "" {
|
||||
titleOut = titleStr
|
||||
nameOut = titleStr
|
||||
}
|
||||
item := V1ProcessJobItem{
|
||||
"ean": ean,
|
||||
@@ -438,8 +439,7 @@ func (p *Pipeline) LoadV1ProcessJobItems(ctx context.Context, companyID, jobID u
|
||||
"category": catNameOut,
|
||||
"category_id": catIDOut,
|
||||
"category_name": catNameOut,
|
||||
"title": titleOut,
|
||||
"name": titleOut,
|
||||
"name": nameOut,
|
||||
"description": description,
|
||||
"attributes": nil,
|
||||
"main_image": nil,
|
||||
@@ -450,7 +450,8 @@ func (p *Pipeline) LoadV1ProcessJobItems(ctx context.Context, companyID, jobID u
|
||||
item["meta_title"] = metaTitleOut
|
||||
item["meta_description"] = metaDescOut
|
||||
}
|
||||
applyV1ProcessItemIDs(item, processedID, rawProductID)
|
||||
// Internal ids (id / processed_product_id / raw_product_id) are omitted from
|
||||
// the public V1 process item shape — use catalog APIs when a UUID is needed.
|
||||
if itemError != nil && *itemError != "" {
|
||||
item["error"] = *itemError
|
||||
}
|
||||
@@ -483,20 +484,41 @@ func nullIfEmptyPtr(s *string) any {
|
||||
return *s
|
||||
}
|
||||
|
||||
// companyOmitsSEOMeta is true for the A1 cohort (no meta_title / meta_description).
|
||||
// companyOmitsSEOMeta is true when V1/process must omit meta_title / meta_description:
|
||||
// A1 cohort (legacy id), Platform Demo (A1-cloned prompts, no legacy id), or any
|
||||
// company whose categories store A1-style role-section enhance prompts.
|
||||
func companyOmitsSEOMeta(ctx context.Context, p *Pipeline, companyID uuid.UUID) bool {
|
||||
if p == nil || p.Pool == nil {
|
||||
return false
|
||||
}
|
||||
var legacy string
|
||||
var legacy, name string
|
||||
err := p.Pool.QueryRow(ctx, `
|
||||
SELECT COALESCE(legacy_company_id, '')
|
||||
SELECT COALESCE(legacy_company_id, ''), COALESCE(name, '')
|
||||
FROM companies
|
||||
WHERE id = $1`, companyID).Scan(&legacy)
|
||||
WHERE id = $1`, companyID).Scan(&legacy, &name)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return billing.IsA1CohortCompany(legacy, "")
|
||||
if billing.IsA1CohortCompany(legacy, "") {
|
||||
return true
|
||||
}
|
||||
if strings.EqualFold(strings.TrimSpace(name), "Platform Demo") {
|
||||
return true
|
||||
}
|
||||
var hasA1Prompts bool
|
||||
err = p.Pool.QueryRow(ctx, `
|
||||
SELECT EXISTS (
|
||||
SELECT 1 FROM categories
|
||||
WHERE company_id = $1
|
||||
AND prompt ILIKE '%--- Title ---%'
|
||||
AND prompt ILIKE '%--- Description ---%'
|
||||
AND prompt ILIKE '%--- Meta ---%'
|
||||
LIMIT 1
|
||||
)`, companyID).Scan(&hasA1Prompts)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
return hasA1Prompts
|
||||
}
|
||||
|
||||
func derefStringPtr(s *string) string {
|
||||
@@ -724,10 +746,14 @@ func ProjectV1ProcessJobItems(storedType string, items []V1ProcessJobItem) []V1P
|
||||
projected["category_id"] = item["category_id"]
|
||||
projected["category_name"] = item["category_name"]
|
||||
case "title":
|
||||
projected["title"] = item["title"]
|
||||
projected["name"] = item["name"]
|
||||
if projected["name"] == nil {
|
||||
projected["name"] = item["title"]
|
||||
name := item["name"]
|
||||
if name == nil {
|
||||
name = item["title"]
|
||||
}
|
||||
projected["name"] = name
|
||||
// Omit duplicate title when it matches name (name is primary).
|
||||
if title := item["title"]; title != nil && title != name {
|
||||
projected["title"] = title
|
||||
}
|
||||
if _, ok := item["meta_title"]; ok {
|
||||
projected["meta_title"] = item["meta_title"]
|
||||
@@ -747,7 +773,7 @@ func ProjectV1ProcessJobItems(storedType string, items []V1ProcessJobItem) []V1P
|
||||
}
|
||||
|
||||
func withItemMeta(dst, src V1ProcessJobItem) V1ProcessJobItem {
|
||||
for _, k := range []string{"status", "error", "id", "processed_product_id", "raw_product_id"} {
|
||||
for _, k := range []string{"status", "error"} {
|
||||
if v, ok := src[k]; ok {
|
||||
dst[k] = v
|
||||
}
|
||||
@@ -755,17 +781,13 @@ func withItemMeta(dst, src V1ProcessJobItem) V1ProcessJobItem {
|
||||
return dst
|
||||
}
|
||||
|
||||
// applyV1ProcessItemIDs sets legacy id (= processed UUID) plus additive dual-mode aliases.
|
||||
// id is preserved for existing integrators; processed_product_id mirrors it; raw_product_id is raw_products.id.
|
||||
// applyV1ProcessItemIDs formerly stamped id / processed_product_id / raw_product_id onto
|
||||
// V1 process items. Those fields are omitted from the public contract; kept as a no-op
|
||||
// so older call sites/tests compile until removed.
|
||||
func applyV1ProcessItemIDs(item V1ProcessJobItem, processedID, rawProductID *uuid.UUID) {
|
||||
if processedID != nil {
|
||||
s := processedID.String()
|
||||
item["id"] = s
|
||||
item["processed_product_id"] = s
|
||||
}
|
||||
if rawProductID != nil {
|
||||
item["raw_product_id"] = rawProductID.String()
|
||||
}
|
||||
_ = item
|
||||
_ = processedID
|
||||
_ = rawProductID
|
||||
}
|
||||
|
||||
func withAlwaysIncluded(item V1ProcessJobItem, main string, more []string, eprel any) V1ProcessJobItem {
|
||||
|
||||
Reference in New Issue
Block a user