refactor(db): typed query helpers, shared test FormData helper
Replace raw db.execute tuple casts with queryRows/rowsFrom/execResult/ affectedRows helpers from lib/db, drop redundant mysql2 casts on typed query builders, and centralize per-test fakeForm into test/fake-form. Update db mocks in tests so helpers resolve against mocked execute.
This commit is contained in:
1 parent
2e25b39364
commit
8638e81444
116 files changed
+866
-897
No files matched your search
+11
-11
@@ -13,7 +13,7 @@ import {
|
||||
} from "@/features/catalog/server/page-commands";
|
||||
import { sendCatalogUpdate } from "@/features/catalog/server/sync-status";
|
||||
import { requirePermission } from "@/lib/admin/guard";
|
||||
import { db, ItemsBase } from "@/lib/db";
|
||||
import { db, ItemsBase, queryRows } from "@/lib/db";
|
||||
import { PERMS } from "@/lib/permissions";
|
||||
import type { ActionResult } from "@/lib/safe-action-shared";
|
||||
import { withCatalogExport } from "@/lib/services/catalog-git-queue";
|
||||
@@ -290,10 +290,10 @@ export async function createAutoCategory(input: {
|
||||
.where(inArray(ItemsBase.id, baseIds));
|
||||
const baseMap = new Map(bases.map((b) => [b.id, b]));
|
||||
|
||||
const [maxOrder] = (await db.execute(sql`
|
||||
const maxOrder = await queryRows<{ maxOrder: number }>(sql`
|
||||
SELECT COALESCE(MAX(order_number), 0) AS maxOrder FROM catalog_items WHERE page_id = ${String(pageId)}
|
||||
`)) as unknown as [{ maxOrder: number }, unknown];
|
||||
let nextOrder = Number(maxOrder?.maxOrder ?? 0) + 1;
|
||||
`);
|
||||
let nextOrder = Number(maxOrder[0]?.maxOrder ?? 0) + 1;
|
||||
|
||||
let created = 0;
|
||||
for (const row of rows) {
|
||||
@@ -455,9 +455,9 @@ export async function organizeImportFurni(input: {
|
||||
);
|
||||
let destinationCaption: string | null = null;
|
||||
if (destinationPageId) {
|
||||
const [captionRows] = (await db.execute(sql`
|
||||
const captionRows = await queryRows<{ caption: string }>(sql`
|
||||
SELECT caption FROM catalog_pages WHERE id = ${destinationPageId}
|
||||
`)) as unknown as [Array<{ caption: string }>, unknown];
|
||||
`);
|
||||
destinationCaption = captionRows[0]?.caption ?? null;
|
||||
}
|
||||
const caption =
|
||||
@@ -465,11 +465,11 @@ export async function organizeImportFurni(input: {
|
||||
|
||||
// Existing destinations append after their current offers; freshly
|
||||
// created pages start at order 1.
|
||||
const [maxOrder] = (await db.execute(sql`
|
||||
const maxOrder = await queryRows<{ maxOrder: number }>(sql`
|
||||
SELECT COALESCE(MAX(order_number), 0) AS maxOrder
|
||||
FROM catalog_items WHERE page_id = ${pageId}
|
||||
`)) as unknown as [{ maxOrder: number }, unknown];
|
||||
let nextOrder = Number(maxOrder?.maxOrder ?? 0) + 1;
|
||||
`);
|
||||
let nextOrder = Number(maxOrder[0]?.maxOrder ?? 0) + 1;
|
||||
|
||||
const baseIds = [...new Set(group.items.map((r) => r.itemId))];
|
||||
const bases = await db
|
||||
@@ -493,12 +493,12 @@ export async function organizeImportFurni(input: {
|
||||
];
|
||||
const validMoveIds = new Set<number>();
|
||||
if (moverIds.length > 0) {
|
||||
const [hostRows] = (await db.execute(sql`
|
||||
const hostRows = await queryRows<{ id: number; page_id: number }>(sql`
|
||||
SELECT id, page_id FROM catalog_items WHERE id IN (${sql.join(
|
||||
moverIds.map((id) => sql`${id}`),
|
||||
sql`, `,
|
||||
)})
|
||||
`)) as unknown as [Array<{ id: number; page_id: number }>, unknown];
|
||||
`);
|
||||
for (const row of hostRows) {
|
||||
if (importPageIds.has(Number(row.page_id))) {
|
||||
validMoveIds.add(Number(row.id));
|
||||
|
||||
Reference in new issue
Block a user