🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
fix delete
Edward Cuic31804713344
diff --git a/server/src/api/sites/deleteSite.ts b/server/src/api/sites/deleteSite.tsindex eea108d1a..49c31d33d 100644--- a/server/src/api/sites/deleteSite.ts+++ b/server/src/api/sites/deleteSite.ts@@ -12,7 +12,10 @@ export async function deleteSite(request: FastifyRequest<{ Params: { id: string}await clickhouse.command({- query: `DELETE FROM events WHERE site_id = ${id}`,+ query: `DELETE FROM events WHERE site_id = {siteId:UInt16}`,+ query_params: {+ siteId: Number(id),+ },});siteConfig.removeSite(Number(id));diff --git a/server/src/api/sites/deleteSiteImport.ts b/server/src/api/sites/deleteSiteImport.tsindex 0b76160e4..d321aa170 100644--- a/server/src/api/sites/deleteSiteImport.ts+++ b/server/src/api/sites/deleteSiteImport.ts@@ -5,6 +5,7 @@ import { ImportStatusManager } from "../../services/import/importStatusManager.jimport { deleteImportFile } from "../../services/import/utils.js";import { IS_CLOUD } from "../../lib/const.js";import { r2Storage } from "../../services/storage/r2StorageService.js";+import { clickhouse } from "../../db/clickhouse/clickhouse.js";const deleteImportRequestSchema = z.object({params: z.object({@@ -37,26 +38,21 @@ export async function deleteSiteImport(return reply.status(403).send({ error: "Forbidden" });}- // Get the import to verify it exists and belongs to this siteconst importRecord = await ImportStatusManager.getImportById(importId);if (!importRecord) {return reply.status(404).send({ error: "Import not found" });}- // Verify the import belongs to this siteif (importRecord.siteId !== Number(site)) {return reply.status(403).send({ error: "Import does not belong to this site" });}- // Don't allow deletion of active importsif (importRecord.status === "pending" || importRecord.status === "processing") {return reply.status(400).send({ error: "Cannot delete active import" });}// Delete the import file if it existstry {- // For completed/failed imports, try to delete the file- // We construct the storage location based on whether it's R2 or locallet storageLocation: string;if (IS_CLOUD && r2Storage.isEnabled()) {storageLocation = `imports/${importId}/${importRecord.fileName}`;@@ -70,6 +66,24 @@ export async function deleteSiteImport(console.warn(`Failed to delete import file for ${importId}:`, fileError);}+ // Delete events from ClickHouse that were imported with this importId+ // This is a critical operation - if it fails, we fail the entire deletion+ try {+ await clickhouse.command({+ query: `DELETE FROM events WHERE import_id = {importId:String} AND site_id = {siteId:UInt16}`,+ query_params: {+ importId: importId,+ siteId: Number(site),+ },+ });+ console.log(`Deleted events for import ${importId} from ClickHouse`);+ } catch (chError) {+ console.error(`Failed to delete ClickHouse events for ${importId}:`, chError);+ return reply.status(500).send({+ error: "Failed to delete imported events from database"+ });+ }+// Delete the import record from the databaseawait ImportStatusManager.deleteImport(importId);