Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor deleteSite function and update schema for improved data integrity

Bill Yangff78d5a9f4cb
diff --git a/server/src/api/sites/deleteSite.ts b/server/src/api/sites/deleteSite.ts
index eea108d1a..874595d44 100644
--- a/server/src/api/sites/deleteSite.ts
+++ b/server/src/api/sites/deleteSite.ts
@@ -1,5 +1,8 @@
import { FastifyReply, FastifyRequest } from "fastify";
+import { eq } from "drizzle-orm";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
+import { db } from "../../db/postgres/postgres.js";
+import { sites } from "../../db/postgres/schema.js";
import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
import { siteConfig } from "../../lib/siteConfig.js";
@@ -11,9 +14,13 @@ export async function deleteSite(request: FastifyRequest<{ Params: { id: string
return reply.status(403).send({ error: "Forbidden" });
}
- await clickhouse.command({
- query: `DELETE FROM events WHERE site_id = ${id}`,
- });
+ // await clickhouse.command({
+ // query: "DELETE FROM events WHERE site_id = {id:UInt32}",
+ // query_params: { id: Number(id) },
+ // });
+
+ // Delete the site from the sites table (related records will cascade delete automatically)
+ await db.delete(sites).where(eq(sites.siteId, Number(id)));
siteConfig.removeSite(Number(id));
diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.ts
index 6fa2e61ec..262ed48e4 100644
--- a/server/src/db/postgres/schema.ts
+++ b/server/src/db/postgres/schema.ts
@@ -91,7 +91,7 @@ export const activeSessions = pgTable("active_sessions", {
export const funnels = pgTable("funnels", {
reportId: serial("report_id").primaryKey().notNull(),
- siteId: integer("site_id").references(() => sites.siteId),
+ siteId: integer("site_id").references(() => sites.siteId, { onDelete: "cascade" }),
userId: text("user_id").references(() => user.id, { onDelete: "set null" }),
data: jsonb(),
createdAt: timestamp("created_at", { mode: "string" }).defaultNow(),
@@ -231,7 +231,7 @@ export const goals = pgTable(
columns: [table.siteId],
foreignColumns: [sites.siteId],
name: "goals_site_id_sites_site_id_fk",
- }),
+ }).onDelete("cascade"),
]
);