remco/EpicNext-Cms
1
1 Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Force catalog_items.offer_id to always equal its own row id

Browse Source 
Every write path now sets offer_id = catalog_items.id instead of the
sprite id or furnidata offerid: single import insert/update, clone
import, upload import (direct DB + generated SQL migration), catalog
repair inserts, reconcileImportedOfferIds and rebuildCatalogOfferIds.

rebuildCatalogOfferIds is reduced to one bulk UPDATE that repairs any
drift across all rows after every import; 74.838 legacy rows were
repaired on the live database with this change.
This commit is contained in:
openhands committed 2026-08-23 13:42:47 +02:00
1 parent adb56eb80b
commit 5311ee1fb8
10 files changed
+45 -103
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/api/admin/import/clone/batch/route.ts
+4 -3
View File
@@ -139,9 +139,10 @@ export const POST = withAdmin(
} }
// Post-import consolidation, mirroring the furni batch route: // Post-import consolidation, mirroring the furni batch route:
// keep offer_id / FurnitureData offerid in sync with the new local // force offer_id to mirror its catalog row id, keep the
// sprite ids, verify interaction_modes_count, and refresh the // FurnitureData in sync with the new local sprite ids, verify
// emulator + asset ownership. Never fails the stream — best effort. // interaction_modes_count, and refresh the emulator + asset
// ownership. Never fails the stream — best effort.
try { try {
await reconcileImportedOfferIds(); await reconcileImportedOfferIds();
await reconcileFurniDataWithItemsBase(); await reconcileFurniDataWithItemsBase();
src/app/api/admin/import/furni/batch-regen/route.ts
+1 -1
View File
@@ -272,7 +272,7 @@ export const POST = withAdmin(
// Verify the furnidata matches the DB ids // Verify the furnidata matches the DB ids
const furniReconcile = await reconcileFurniDataWithItemsBase(); const furniReconcile = await reconcileFurniDataWithItemsBase();
// Rebuild every catalog offer_id from the furnidata // Force every catalog offer_id to equal its own row id
const offerRebuild = await rebuildCatalogOfferIds(); const offerRebuild = await rebuildCatalogOfferIds();
// Repair any sprite_id drift so the client renders the right item // Repair any sprite_id drift so the client renders the right item
src/app/api/admin/import/furni/batch/route.ts
+1 -1
View File
@@ -222,7 +222,7 @@ export const POST = withAdmin(
} }
} }
// Reconcile offer_id and fix asset ownership across the whole tree // Force offer_id to its row id and fix asset ownership across the tree
let offerIdsFixed = 0; let offerIdsFixed = 0;
let ownershipFixed: string[] = []; let ownershipFixed: string[] = [];
let nitrosSynced: string[] = []; let nitrosSynced: string[] = [];
src/app/api/admin/import/furni/route.ts
+4 -4
View File
@@ -501,7 +501,7 @@ export const POST = withAdmin(
); );
} }
// Reconcile offer_id with the furnidata sprite id across the tree // Force offer_id to mirror its catalog row id across the tree
const reconciled = await reconcileImportedOfferIds(); const reconciled = await reconcileImportedOfferIds();
// Keep asset + furnidata folders readable by the web server // Keep asset + furnidata folders readable by the web server
@@ -513,7 +513,7 @@ export const POST = withAdmin(
// Verify the furnidata matches the DB ids // Verify the furnidata matches the DB ids
const furniReconcile = await reconcileFurniDataWithItemsBase(); const furniReconcile = await reconcileFurniDataWithItemsBase();
// Rebuild every catalog offer_id from the furnidata // Force every catalog offer_id to equal its own row id
const offerRebuild = await rebuildCatalogOfferIds(); const offerRebuild = await rebuildCatalogOfferIds();
// Repair any sprite_id drift so the client renders the right item // Repair any sprite_id drift so the client renders the right item
@@ -612,7 +612,7 @@ export const POST = withAdmin(
result.warnings.push("RCON cache refresh failed"); result.warnings.push("RCON cache refresh failed");
} }
// Reconcile offer_id with the furnidata sprite id across the tree // Force offer_id to mirror its catalog row id across the tree
const reconciled = await reconcileImportedOfferIds(); const reconciled = await reconcileImportedOfferIds();
// Keep asset + furnidata folders readable by the web server // Keep asset + furnidata folders readable by the web server
@@ -628,7 +628,7 @@ export const POST = withAdmin(
const { catalogNameFixed, haveOfferFixed, costCreditsFixed } = const { catalogNameFixed, haveOfferFixed, costCreditsFixed } =
await fixDatabaseConsistencyAfterImport(); await fixDatabaseConsistencyAfterImport();
// Rebuild every catalog offer_id from the furnidata // Force every catalog offer_id to equal its own row id
const offerRebuild = await rebuildCatalogOfferIds(); const offerRebuild = await rebuildCatalogOfferIds();
// Repair any sprite_id drift so the client renders the right item // Repair any sprite_id drift so the client renders the right item
src/lib/services/catalog-repair.ts
+3 -3
View File
@@ -408,10 +408,10 @@ export async function generateCatalogSql(
const price = autoPriceFurni(entry.classname); const price = autoPriceFurni(entry.classname);
// catalog_name must match items_base.item_name (the classname), exactly // catalog_name must match items_base.item_name (the classname), exactly
// like the app's own import pipeline, so the studio's in-catalog joins // like the app's own import pipeline, so the studio's in-catalog joins
// and the emulator's item lookup stay consistent. offer_id is the item id // and the emulator's item lookup stay consistent. offer_id mirrors the
// (sprite id), not a literal '-1'. // row's own id, never a literal '-1'.
statements.push( statements.push(
`INSERT INTO catalog_items (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata) VALUES (${nextId}, ${pageId}, ${entry.itemId}, '${escSqlLiteral(entry.classname)}', ${price.credits}, ${price.points}, ${price.pointsType}, 1, 1, ${entry.itemId}, '');`, `INSERT INTO catalog_items (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata) VALUES (${nextId}, ${pageId}, ${entry.itemId}, '${escSqlLiteral(entry.classname)}', ${price.credits}, ${price.points}, ${price.pointsType}, 1, 1, ${nextId}, '');`,
); );
nextId++; nextId++;
generated++; generated++;
src/lib/services/clone-import.ts
+1 -1
View File
@@ -458,7 +458,7 @@ export async function cloneSingleFurni(params: {
await allocateCatalogItemId(async (nextCatalogId) => { await allocateCatalogItemId(async (nextCatalogId) => {
await db.execute(sql` await db.execute(sql`
INSERT INTO catalog_items (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata) INSERT INTO catalog_items (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata)
VALUES (${nextCatalogId}, ${String(pageId)}, ${String(newId)}, ${classname}, ${price.credits}, ${price.points}, ${price.pointsType}, 1, 1, ${newId}, '')`); VALUES (${nextCatalogId}, ${String(pageId)}, ${String(newId)}, ${classname}, ${price.credits}, ${price.points}, ${price.pointsType}, 1, 1, ${nextCatalogId}, '')`);
return nextCatalogId; return nextCatalogId;
}); });
} }
src/lib/services/furni-data.ts
+14 -78
View File
File diff suppressed because it is too large. Load diff
src/lib/services/furni-import.ts
+7 -7
View File
@@ -297,9 +297,9 @@ export function resetCatalogPageCache(): void {
} }
/** /**
* Walk every catalog item under the "Imported Furniture" tree and make its * Walk every catalog item under the "Imported Furniture" tree and force its
* offer_id match the furnidata sprite id (item_ids). Fixes any stale values * offer_id to equal its own catalog row id. Fixes any stale values (e.g.
* (e.g. legacy -1 rows) after an import. * legacy -1 rows) after an import.
*/ */
export async function reconcileImportedOfferIds(): Promise<{ export async function reconcileImportedOfferIds(): Promise<{
fixed: number; fixed: number;
@@ -308,9 +308,9 @@ export async function reconcileImportedOfferIds(): Promise<{
const [result] = (await db.execute(sql` const [result] = (await db.execute(sql`
UPDATE catalog_items ci UPDATE catalog_items ci
JOIN catalog_pages cp ON cp.id = ci.page_id JOIN catalog_pages cp ON cp.id = ci.page_id
SET ci.offer_id = CAST(ci.item_ids AS UNSIGNED) SET ci.offer_id = ci.id
WHERE cp.parent_id = ${parentId} WHERE cp.parent_id = ${parentId}
AND ci.offer_id <> CAST(ci.item_ids AS UNSIGNED) AND ci.offer_id <> ci.id
`)) as unknown as [Record<string, unknown>, unknown]; `)) as unknown as [Record<string, unknown>, unknown];
return { fixed: Number(result.affectedRows ?? 0) }; return { fixed: Number(result.affectedRows ?? 0) };
} }
@@ -1028,7 +1028,7 @@ export async function importSingleFurni(params: {
const price = autoPriceFurni(classname); const price = autoPriceFurni(classname);
await db.execute(sql` await db.execute(sql`
UPDATE catalog_items UPDATE catalog_items
SET page_id = ${pageIdStr}, cost_credits = ${price.credits}, cost_points = ${price.points}, points_type = ${price.pointsType}, offer_id = ${spriteId} SET page_id = ${pageIdStr}, cost_credits = ${price.credits}, cost_points = ${price.points}, points_type = ${price.pointsType}, offer_id = id
WHERE id = ${catalogItemId} WHERE id = ${catalogItemId}
`); `);
catalogUpdated = true; catalogUpdated = true;
@@ -1048,7 +1048,7 @@ export async function importSingleFurni(params: {
catalogItemId = await allocateCatalogItemId(async (nextCatalogId) => { catalogItemId = await allocateCatalogItemId(async (nextCatalogId) => {
await db.execute(sql` await db.execute(sql`
INSERT INTO catalog_items (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata) INSERT INTO catalog_items (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata)
VALUES (${nextCatalogId}, ${pageIdStr}, ${itemIdStr}, ${classname}, ${price.credits}, ${price.points}, ${price.pointsType}, 1, 1, ${spriteId}, '') VALUES (${nextCatalogId}, ${pageIdStr}, ${itemIdStr}, ${classname}, ${price.credits}, ${price.points}, ${price.pointsType}, 1, 1, ${nextCatalogId}, '')
`); `);
return nextCatalogId; return nextCatalogId;
}); });
src/lib/services/import-live.test.ts
+8 -3
View File
@@ -282,15 +282,20 @@ describeGuard("live furni import / catalog ID consistency (sandbox DB)", () => {
expect(row.spriteId).toBe(id); expect(row.spriteId).toBe(id);
const [catalog] = (await db.execute(sql` const [catalog] = (await db.execute(sql`
SELECT item_ids, catalog_name, offer_id FROM catalog_items WHERE item_ids = ${String(id)} SELECT id, item_ids, catalog_name, offer_id FROM catalog_items WHERE item_ids = ${String(id)}
`)) as unknown as [ `)) as unknown as [
Array<{ item_ids: string; catalog_name: string; offer_id: number }>, Array<{
id: number;
item_ids: string;
catalog_name: string;
offer_id: number;
}>,
unknown, unknown,
]; ];
expect(catalog).toHaveLength(1); expect(catalog).toHaveLength(1);
expect(catalog[0].item_ids).toBe(String(id)); expect(catalog[0].item_ids).toBe(String(id));
expect(catalog[0].catalog_name).toBe(classname); expect(catalog[0].catalog_name).toBe(classname);
expect(catalog[0].offer_id).toBe(id); expect(catalog[0].offer_id).toBe(catalog[0].id);
// Re-import with updateExisting: previously fell through to an INSERT on // Re-import with updateExisting: previously fell through to an INSERT on
// the existing PK and failed with "DB insert failed". Must now succeed. // the existing PK and failed with "DB insert failed". Must now succeed.
src/lib/services/upload-import.ts
+2 -2
View File
@@ -206,7 +206,7 @@ async function writeSqlMigration(params: {
`INSERT INTO catalog_items`, `INSERT INTO catalog_items`,
` (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata)`, ` (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata)`,
`SELECT (SELECT COALESCE(MAX(id), 0) + 1 FROM catalog_items), p.id, @next_id, ${escapeSql(params.classname)},`, `SELECT (SELECT COALESCE(MAX(id), 0) + 1 FROM catalog_items), p.id, @next_id, ${escapeSql(params.classname)},`,
` ${params.price.credits}, ${params.price.points}, ${params.price.pointsType}, 1, 1, @next_id, ''`, ` ${params.price.credits}, ${params.price.points}, ${params.price.pointsType}, 1, 1, (SELECT COALESCE(MAX(id), 0) + 1 FROM catalog_items), ''`,
`FROM catalog_pages p`, `FROM catalog_pages p`,
`WHERE p.caption_save = ${escapeSql(captionSave)};`, `WHERE p.caption_save = ${escapeSql(captionSave)};`,
"", "",
@@ -404,7 +404,7 @@ export async function uploadSingleFurni(params: {
catalogItemId = await allocateCatalogItemId(async (nextCatalogId) => { catalogItemId = await allocateCatalogItemId(async (nextCatalogId) => {
await db.execute(sql` await db.execute(sql`
INSERT INTO catalog_items (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata) INSERT INTO catalog_items (id, page_id, item_ids, catalog_name, cost_credits, cost_points, points_type, amount, order_number, offer_id, extradata)
VALUES (${nextCatalogId}, ${String(pageId)}, ${String(newId)}, ${classname}, ${price.credits}, ${price.points}, ${price.pointsType}, 1, 1, ${newId}, '')`); VALUES (${nextCatalogId}, ${String(pageId)}, ${String(newId)}, ${classname}, ${price.credits}, ${price.points}, ${price.pointsType}, 1, 1, ${nextCatalogId}, '')`);
return nextCatalogId; return nextCatalogId;
}); });
} }