harden eventData delete. Add translations. Closes #4435.

This commit is contained in:
Francis Cao committed 2026-08-10 12:41:41 -07:00
1 parent e89956597b
commit 3e729bc0e4
56 files changed
+383 -138

No files matched your search

+192
View File
@@ -0,0 +1,192 @@
import { beforeEach, describe, expect, test, vi } from 'vitest';
import { deleteWebsite, resetWebsite } from './website';
const { transactionMock, redisDelMock, redisSetMock } = vi.hoisted(() => ({
transactionMock: vi.fn(),
redisDelMock: vi.fn(),
redisSetMock: vi.fn(),
}));
vi.mock('@/lib/prisma', () => ({
default: {
transaction: transactionMock,
},
getSchema: () => new URL(process.env.DATABASE_URL || '').searchParams.get('schema'),
}));
vi.mock('@/lib/redis', () => ({
default: {
client: {
del: redisDelMock,
set: redisSetMock,
},
},
}));
function createDeleteTx(calls: string[]) {
return {
sessionReplaySaved: {
deleteMany: vi.fn(async () => {
calls.push('sessionReplaySaved');
}),
},
sessionReplay: {
deleteMany: vi.fn(async () => {
calls.push('sessionReplay');
}),
},
heatmapEvent: {
deleteMany: vi.fn(async () => {
calls.push('heatmapEvent');
}),
},
revenue: {
deleteMany: vi.fn(async () => {
calls.push('revenue');
}),
},
eventData: {
deleteMany: vi.fn(async () => {
calls.push('eventData');
}),
},
$executeRawUnsafe: vi.fn(async () => {
calls.push('rawSql');
}),
sessionData: {
deleteMany: vi.fn(async () => {
calls.push('sessionData');
}),
},
sessionLink: {
deleteMany: vi.fn(async () => {
calls.push('sessionLink');
}),
},
websiteEvent: {
deleteMany: vi.fn(async () => {
calls.push('websiteEvent');
}),
},
session: {
deleteMany: vi.fn(async () => {
calls.push('session');
}),
},
report: {
deleteMany: vi.fn(async () => {
calls.push('report');
}),
},
segment: {
deleteMany: vi.fn(async () => {
calls.push('segment');
}),
},
share: {
deleteMany: vi.fn(async () => {
calls.push('share');
}),
},
website: {
delete: vi.fn(async () => {
calls.push('websiteDelete');
return { id: 'website-1' };
}),
update: vi.fn(async () => {
calls.push('websiteUpdate');
return { id: 'website-1' };
}),
},
};
}
describe('website delete dependencies', () => {
beforeEach(() => {
transactionMock.mockReset();
redisDelMock.mockReset();
redisSetMock.mockReset();
delete process.env.CLOUD_MODE;
process.env.DATABASE_URL = 'postgresql://user:pass@localhost:5432/umami?schema=public';
});
test('deleteWebsite runs fast event-data cleanup, a relational safety pass, and heatmap cleanup before deleting website events', async () => {
const calls: string[] = [];
const tx = createDeleteTx(calls);
transactionMock.mockImplementation(async callback => callback(tx));
await deleteWebsite('website-1');
expect(tx.eventData.deleteMany).toHaveBeenCalledWith({
where: { websiteId: 'website-1' },
});
expect(tx.heatmapEvent.deleteMany).toHaveBeenCalledWith({
where: { websiteId: 'website-1' },
});
expect(tx.$executeRawUnsafe).toHaveBeenNthCalledWith(1, 'SET search_path TO "public";');
expect(tx.$executeRawUnsafe).toHaveBeenNthCalledWith(
2,
expect.stringContaining('delete from event_data'),
'website-1',
);
expect(tx.$executeRawUnsafe).toHaveBeenNthCalledWith(
2,
expect.stringContaining('website_event.website_id = $1'),
'website-1',
);
expect(calls).toEqual([
'sessionReplaySaved',
'sessionReplay',
'heatmapEvent',
'revenue',
'eventData',
'rawSql',
'rawSql',
'sessionData',
'sessionLink',
'websiteEvent',
'session',
'report',
'segment',
'share',
'websiteDelete',
]);
});
test('resetWebsite uses the same two-pass event-data cleanup before resetting the website', async () => {
const calls: string[] = [];
const tx = createDeleteTx(calls);
transactionMock.mockImplementation(async callback => callback(tx));
await resetWebsite('website-1');
expect(tx.eventData.deleteMany).toHaveBeenCalledWith({
where: { websiteId: 'website-1' },
});
expect(tx.heatmapEvent.deleteMany).toHaveBeenCalledWith({
where: { websiteId: 'website-1' },
});
expect(tx.$executeRawUnsafe).toHaveBeenNthCalledWith(1, 'SET search_path TO "public";');
expect(tx.$executeRawUnsafe).toHaveBeenNthCalledWith(
2,
expect.stringContaining('website_event.website_id = $1'),
'website-1',
);
expect(calls).toEqual([
'sessionReplaySaved',
'sessionReplay',
'heatmapEvent',
'revenue',
'eventData',
'rawSql',
'rawSql',
'sessionData',
'sessionLink',
'websiteEvent',
'session',
'websiteUpdate',
]);
});
});
+59 -55
View File
@@ -1,6 +1,6 @@
import type { Prisma, Website } from '@/generated/prisma/client';
import { ROLES } from '@/lib/constants';
import prisma from '@/lib/prisma';
import prisma, { getSchema } from '@/lib/prisma';
import redis from '@/lib/redis';
import { sanitizeSortFilters } from '@/lib/sort';
import type { QueryFilters } from '@/lib/types';
@@ -8,6 +8,62 @@ import { z } from 'zod';
const WEBSITE_SORT_FIELDS = ['name', 'domain', 'createdAt'] as const;
async function deleteWebsiteDependentData(tx: any, websiteId: string) {
await tx.sessionReplaySaved.deleteMany({
where: { websiteId },
});
await tx.sessionReplay.deleteMany({
where: { websiteId },
});
await tx.heatmapEvent.deleteMany({
where: { websiteId },
});
await tx.revenue.deleteMany({
where: { websiteId },
});
await tx.eventData.deleteMany({
where: { websiteId },
});
// Follow the real EventData -> WebsiteEvent dependency to clean up any legacy rows
// whose duplicated websiteId drifted from the parent event row.
const schema = getSchema();
if (schema) {
await tx.$executeRawUnsafe(`SET search_path TO "${schema}";`);
}
await tx.$executeRawUnsafe(
`
delete from event_data
using website_event
where event_data.website_event_id = website_event.event_id
and website_event.website_id = $1
`,
websiteId,
);
await tx.sessionData.deleteMany({
where: { websiteId },
});
await tx.sessionLink.deleteMany({
where: { websiteId },
});
await tx.websiteEvent.deleteMany({
where: { websiteId },
});
await tx.session.deleteMany({
where: { websiteId },
});
}
export async function findWebsite(criteria: Prisma.WebsiteFindUniqueArgs) {
return prisma.client.website.findUnique(criteria);
}
@@ -142,33 +198,7 @@ export async function resetWebsite(websiteId: string) {
return transaction(
async tx => {
await tx.sessionReplaySaved.deleteMany({
where: { websiteId },
});
await tx.sessionReplay.deleteMany({
where: { websiteId },
});
await tx.revenue.deleteMany({
where: { websiteId },
});
await tx.eventData.deleteMany({
where: { websiteId },
});
await tx.sessionData.deleteMany({
where: { websiteId },
});
await tx.websiteEvent.deleteMany({
where: { websiteId },
});
await tx.session.deleteMany({
where: { websiteId },
});
await deleteWebsiteDependentData(tx, websiteId);
const website = await tx.website.update({
where: { id: websiteId },
@@ -197,33 +227,7 @@ export async function deleteWebsite(websiteId: string) {
return transaction(
async tx => {
await tx.sessionReplaySaved.deleteMany({
where: { websiteId },
});
await tx.sessionReplay.deleteMany({
where: { websiteId },
});
await tx.revenue.deleteMany({
where: { websiteId },
});
await tx.eventData.deleteMany({
where: { websiteId },
});
await tx.sessionData.deleteMany({
where: { websiteId },
});
await tx.websiteEvent.deleteMany({
where: { websiteId },
});
await tx.session.deleteMany({
where: { websiteId },
});
await deleteWebsiteDependentData(tx, websiteId);
await tx.report.deleteMany({
where: { websiteId },