🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Use zod coerce
Edward Cuie29756b1a16e
diff --git a/server/src/api/sites/createSiteImport.ts b/server/src/api/sites/createSiteImport.tsindex 5fe5bf7ab..fabe9a939 100644--- a/server/src/api/sites/createSiteImport.ts+++ b/server/src/api/sites/createSiteImport.ts@@ -11,7 +11,7 @@ import { eq } from "drizzle-orm";const createSiteImportRequestSchema = z.object({params: z.object({- site: z.string().min(1),+ site: z.coerce.number().int(),}),body: z.object({platform: z.enum(importPlatforms),@@ -37,7 +37,6 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportRconst { site } = parsed.data.params;const { platform } = parsed.data.body;- const siteId = Number(site);const userHasAccess = await getUserHasAdminAccessToSite(request, site);if (!userHasAccess) {@@ -47,7 +46,7 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportRconst [siteRecord] = await db.select({ organizationId: sites.organizationId }).from(sites)- .where(eq(sites.siteId, siteId))+ .where(eq(sites.siteId, site)).limit(1);if (!siteRecord || !siteRecord.organizationId) {@@ -70,7 +69,7 @@ export async function createSiteImport(request: FastifyRequest<CreateSiteImportRconst latestAllowedDate = DateTime.utc().toFormat("yyyy-MM-dd");const importRecord = await createImport({- siteId,+ siteId: site,organizationId,platform,});diff --git a/server/src/api/sites/deleteSiteImport.ts b/server/src/api/sites/deleteSiteImport.tsindex f18cfb691..f733b0dc0 100644--- a/server/src/api/sites/deleteSiteImport.ts+++ b/server/src/api/sites/deleteSiteImport.ts@@ -8,7 +8,7 @@ import { importQuotaManager } from "../../services/import/importQuotaManager.js"const deleteImportRequestSchema = z.object({params: z.object({- site: z.string().min(1),+ site: z.coerce.number().int(),importId: z.string().uuid(),}),})@@ -40,7 +40,7 @@ export async function deleteSiteImport(request: FastifyRequest<DeleteImportRequereturn reply.status(404).send({ error: "Import not found" });}- if (importRecord.siteId !== Number(site)) {+ if (importRecord.siteId !== site) {return reply.status(403).send({ error: "Import does not belong to this site" });}@@ -48,14 +48,12 @@ export async function deleteSiteImport(request: FastifyRequest<DeleteImportRequereturn reply.status(400).send({ error: "Cannot delete active import" });}- const siteId = Number(site);-try {await clickhouse.command({query: "DELETE FROM events WHERE import_id = {importId:UUID} AND site_id = {siteId:UInt16}",query_params: {importId: importId,- siteId: siteId,+ siteId: site,},});} catch (chError) {diff --git a/server/src/api/sites/getSiteImports.ts b/server/src/api/sites/getSiteImports.tsindex d5a7613b9..d9f6a25f7 100644--- a/server/src/api/sites/getSiteImports.ts+++ b/server/src/api/sites/getSiteImports.ts@@ -6,7 +6,7 @@ import { z } from "zod";const getSiteImportsRequestSchema = z.object({params: z.object({- site: z.string().min(1),+ site: z.coerce.number().int(),}),}).strict();@@ -26,14 +26,13 @@ export async function getSiteImports(request: FastifyRequest<GetSiteImportsReque}const { site } = parsed.data.params;- const siteId = Number(site);const userHasAccess = await getUserHasAdminAccessToSite(request, site);if (!userHasAccess) {return reply.status(403).send({ error: "Forbidden" });}- const imports = await getImportsForSite(siteId);+ const imports = await getImportsForSite(site);return reply.send({data: imports.map(