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

Fix catalog items missing due to page_id VARCHAR mismatch.
Local Build and Deploy / deploy (push) Successful in 56s
Details

Browse Source 
Use raw SQL for counts/loads/creates/moves so Habbo DBs with VARCHAR page_id and no AUTO_INCREMENT still show and persist furni.

Co-authored-by: Cursor <[email protected]>
This commit is contained in:
SimoandCursor committed 2026-07-17 22:21:49 +02:00
1 parent 33a8a19820
commit 7bc0845932
6 files changed
+124 -64
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/actions/catalog-items.ts
+65 -13
View File
File diff suppressed because it is too large. Load diff
src/app/admin/catalog/page.tsx
+12 -29
View File
@@ -4,6 +4,7 @@ import { Prisma } from "@/generated/prisma/client";
import { calcPagination, parseListParams } from "@/lib/admin-helpers";
import { canAccess, getAdminContext, PERMS } from "@/lib/permissions";
import { prisma } from "@/lib/prisma";
import { getCatalogItemCounts } from "@/lib/services/catalog-tree";
import { CatalogActions } from "./catalog-actions";
import { CatalogManagerDialog } from "./catalog-manager-dialog-wrapper";
import { CatalogTable } from "./catalog-table";
@@ -238,7 +239,7 @@ export default async function CatalogPagesPage({
orderBy: { orderNum: "asc" },
});
const rootIds = rootPagesRaw.map((p) => p.id);
const [rootChildCounts, rootItemCounts] = await Promise.all([
const [rootChildCounts, rootItemCountMap] = await Promise.all([
rootIds.length > 0
? prisma.catalogPages.groupBy({
by: ["parentId"],
@@ -246,22 +247,12 @@ export default async function CatalogPagesPage({
_count: true,
})
: [],
rootIds.length > 0
? prisma.catalogItems
.groupBy({
by: ["pageId"],
where: { pageId: { in: rootIds } },
_count: true,
})
.catch(() => [])
: [],
getCatalogItemCounts(rootIds),
]);
const rootChildMap = Object.fromEntries(
rootChildCounts.map((c) => [c.parentId, c._count]),
);
const rootItemMap = Object.fromEntries(
rootItemCounts.map((c) => [c.pageId, c._count]),
);
const rootItemMap = Object.fromEntries(rootItemCountMap);
const rootPages: TreeNodeShape[] = rootPagesRaw.map((p) => ({
id: p.id,
caption: p.caption,
@@ -301,16 +292,16 @@ export default async function CatalogPagesPage({
if (search) {
const searchPattern = `%${search}%`;
const parentClause = hasParent
? Prisma.sql`AND cp.parentId = ${parentId}`
? Prisma.sql`AND cp.parent_id = ${parentId}`
: Prisma.empty;
const matchedIds = await prisma.$queryRaw<{ id: number }[]>(Prisma.sql`
SELECT DISTINCT cp.id FROM catalog_pages cp
LEFT JOIN catalog_items ci ON ci.pageId = cp.id
LEFT JOIN items_base ib ON FIND_IN_SET(ib.id, REPLACE(ci.itemIds, ';', ','))
LEFT JOIN catalog_items ci ON CAST(ci.page_id AS CHAR) = CAST(cp.id AS CHAR)
LEFT JOIN items_base ib ON FIND_IN_SET(ib.id, REPLACE(ci.item_ids, ';', ','))
WHERE (cp.caption LIKE ${searchPattern}
OR cp.pageLayout LIKE ${searchPattern}
OR ci.catalogName LIKE ${searchPattern}
OR cp.page_layout LIKE ${searchPattern}
OR ci.catalog_name LIKE ${searchPattern}
OR ib.public_name LIKE ${searchPattern}
OR ib.item_name LIKE ${searchPattern})
${parentClause}
@@ -339,7 +330,7 @@ export default async function CatalogPagesPage({
const parentIds = [
...new Set(pages.map((p) => p.parentId).filter((id) => id > 0)),
];
const [childCounts, itemCounts, parentPages] = await Promise.all([
const [childCounts, itemCountMapRaw, parentPages] = await Promise.all([
pageIds.length > 0
? prisma.catalogPages.groupBy({
by: ["parentId"],
@@ -347,13 +338,7 @@ export default async function CatalogPagesPage({
_count: true,
})
: [],
pageIds.length > 0
? prisma.catalogItems.groupBy({
by: ["pageId"],
where: { pageId: { in: pageIds } },
_count: true,
})
: [],
getCatalogItemCounts(pageIds),
parentIds.length > 0
? prisma.catalogPages.findMany({
where: { id: { in: parentIds } },
@@ -364,9 +349,7 @@ export default async function CatalogPagesPage({
const childCountMap = Object.fromEntries(
childCounts.map((c) => [c.parentId, c._count]),
);
const itemCountMap = Object.fromEntries(
itemCounts.map((c) => [c.pageId, c._count]),
);
const itemCountMap = Object.fromEntries(itemCountMapRaw);
const parentNameMap = Object.fromEntries(
parentPages.map((p) => [p.id, p.caption]),
);
src/app/api/admin/catalog/items/route.ts
+7 -1
View File
@@ -3,6 +3,12 @@ import { apiError, apiOk } from "@/lib/api-response";
import { PERMS } from "@/lib/permissions";
import { loadCatalogItemsData } from "@/lib/services/catalog-items-loader";
function jsonSafe<T>(data: T): T {
return JSON.parse(
JSON.stringify(data, (_k, v) => (typeof v === "bigint" ? Number(v) : v)),
) as T;
}
export const GET = withAdmin(
{ permission: PERMS.CATALOG_VIEW },
async (request) => {
@@ -11,6 +17,6 @@ export const GET = withAdmin(
return apiError("Invalid pageId");
}
const data = await loadCatalogItemsData(pageId);
return apiOk(data as unknown as Record<string, unknown>);
return apiOk(jsonSafe(data) as unknown as Record<string, unknown>);
},
);
src/app/api/admin/catalog/tree/route.ts
+3 -3
View File
@@ -6,7 +6,7 @@ import {
deletePage,
getAncestors,
getTreeFlat,
safeItemCounts,
getCatalogItemCounts,
toInt,
} from "@/lib/services/catalog-tree";
import { rcon } from "@/lib/services/rcon";
@@ -158,7 +158,7 @@ async function getChildren(
_count: true,
})
: Promise.resolve([]),
safeItemCounts(ids),
getCatalogItemCounts(ids),
]);
const childMap = Object.fromEntries(
childCounts.map((c) => [toInt(c.parentId), c._count]),
@@ -234,7 +234,7 @@ async function searchPages(q: string, isBc: boolean): Promise<TreeNode[]> {
_count: true,
})
: Promise.resolve([]),
safeItemCounts(ids),
getCatalogItemCounts(ids),
]);
const childMap = Object.fromEntries(
childCounts.map((c) => [toInt(c.parentId), c._count]),
src/lib/services/catalog-items-loader.ts
+4 -1
View File
@@ -135,8 +135,11 @@ export async function loadCatalogItemsData(
): Promise<CatalogItemsData> {
// Load items via raw query to work around pageId Int vs VARCHAR mismatch
const pageIdStr = String(pageId);
// CAST: live Habbo DBs often store page_id as VARCHAR while Prisma maps Int.
const rawItems = await prisma.$queryRaw<Array<Record<string, unknown>>>`
SELECT * FROM catalog_items WHERE page_id = ${pageIdStr} ORDER BY id ASC
SELECT * FROM catalog_items
WHERE CAST(page_id AS CHAR) = ${pageIdStr}
ORDER BY order_number ASC, id ASC
`;
const items: RawItem[] = rawItems.map((r: Record<string, unknown>) => ({
id: Number(r.id),
src/lib/services/catalog-tree.ts
+33 -17
View File
@@ -1,3 +1,4 @@
import { Prisma } from "@/generated/prisma/client";
import { prisma } from "@/lib/prisma";
export type { NestedTreeNode, TreeNode } from "@/types/catalog";
@@ -9,27 +10,43 @@ function toInt(value: unknown, fallback = 0): number {
return Number.isFinite(n) ? n : fallback;
}
async function safeItemCounts(
/**
* Count catalog_items per page via raw SQL.
* Real Habbo DBs often store page_id as VARCHAR; Prisma Int groupBy fails or returns 0.
*/
export async function getCatalogItemCounts(
pageIds?: number[],
): Promise<Map<number, number>> {
const map = new Map<number, number>();
try {
if (pageIds && pageIds.length === 0) return map;
const itemCounts = pageIds
? await prisma.catalogItems.groupBy({
by: ["pageId"],
where: { pageId: { in: pageIds } },
_count: true,
})
: await prisma.catalogItems.groupBy({
by: ["pageId"],
_count: true,
});
for (const c of itemCounts) {
map.set(toInt(c.pageId), c._count);
if (pageIds) {
const idStrs = pageIds.map(String);
const rows = await prisma.$queryRaw<
Array<{ page_id: string | number; cnt: number | bigint }>
>`
SELECT page_id, COUNT(*) as cnt
FROM catalog_items
WHERE CAST(page_id AS CHAR) IN (${Prisma.join(idStrs)})
GROUP BY page_id
`;
for (const r of rows) {
map.set(toInt(r.page_id), toInt(r.cnt));
}
return map;
}
const rows = await prisma.$queryRaw<
Array<{ page_id: string | number; cnt: number | bigint }>
>`
SELECT page_id, COUNT(*) as cnt FROM catalog_items GROUP BY page_id
`;
for (const r of rows) {
map.set(toInt(r.page_id), toInt(r.cnt));
}
} catch {
// Some DBs store page_id as VARCHAR — ignore counts rather than failing the tree.
// Best-effort — never break the tree for count failures.
}
return map;
}
@@ -41,7 +58,7 @@ export async function getTreeFlat(): Promise<TreeNode[]> {
const allPages = await prisma.catalogPages.findMany({
orderBy: { orderNum: "asc" },
});
const itemCountMap = await safeItemCounts();
const itemCountMap = await getCatalogItemCounts();
const childCountMap = new Map<number, number>();
for (const p of allPages) {
@@ -261,5 +278,4 @@ export async function getAncestors(
return ancestors;
}
/** Safe item-count helper exported for the tree API route. */
export { safeItemCounts, toInt };
export { toInt };