Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

fix: avoid restamping deletedAt + skip Redis DEL for already-soft-deleted slugs

Stanislaw71ee000f2137
diff --git a/src/queries/prisma/team.ts b/src/queries/prisma/team.ts
index b24d65227..38215335b 100644
--- a/src/queries/prisma/team.ts
+++ b/src/queries/prisma/team.ts
@@ -146,13 +146,20 @@ export async function deleteTeam(teamId: string) {
const cloudMode = !!process.env.CLOUD_MODE;
const [links, pixels, boards] = await Promise.all([
- client.link.findMany({ where: { teamId }, select: { id: true, slug: true } }),
- client.pixel.findMany({ where: { teamId }, select: { id: true, slug: true } }),
+ client.link.findMany({
+ where: { teamId },
+ select: { id: true, slug: true, deletedAt: true },
+ }),
+ client.pixel.findMany({
+ where: { teamId },
+ select: { id: true, slug: true, deletedAt: true },
+ }),
client.board.findMany({ where: { teamId }, select: { id: true } }),
]);
const entityIds = [...links.map(l => l.id), ...pixels.map(p => p.id), ...boards.map(b => b.id)];
- const linkSlugs = links.map(l => l.slug);
- const pixelSlugs = pixels.map(p => p.slug);
+ // Only invalidate Redis cache for slugs that are still live (not already soft-deleted).
+ const linkSlugs = links.filter(l => !l.deletedAt).map(l => l.slug);
+ const pixelSlugs = pixels.filter(p => !p.deletedAt).map(p => p.slug);
const invalidateRedis = async () => {
if (redis.enabled && (linkSlugs.length || pixelSlugs.length)) {
@@ -174,8 +181,15 @@ export async function deleteTeam(teamId: string) {
},
}),
client.share.deleteMany({ where: { entityId: { in: entityIds } } }),
- client.link.updateMany({ data: { deletedAt: new Date() }, where: { teamId } }),
- client.pixel.updateMany({ data: { deletedAt: new Date() }, where: { teamId } }),
+ // deletedAt: null avoids restamping rows that were already soft-deleted earlier.
+ client.link.updateMany({
+ data: { deletedAt: new Date() },
+ where: { teamId, deletedAt: null },
+ }),
+ client.pixel.updateMany({
+ data: { deletedAt: new Date() },
+ where: { teamId, deletedAt: null },
+ }),
client.board.deleteMany({ where: { teamId } }),
]).then(async result => {
await invalidateRedis();
diff --git a/src/queries/prisma/user.ts b/src/queries/prisma/user.ts
index c527e6026..21870036c 100644
--- a/src/queries/prisma/user.ts
+++ b/src/queries/prisma/user.ts
@@ -135,13 +135,20 @@ export async function deleteUser(userId: string) {
: { OR: [{ userId }, { teamId: { in: teamIds } }] };
const [links, pixels, boards] = await Promise.all([
- client.link.findMany({ where: ownedFilter, select: { id: true, slug: true } }),
- client.pixel.findMany({ where: ownedFilter, select: { id: true, slug: true } }),
+ client.link.findMany({
+ where: ownedFilter,
+ select: { id: true, slug: true, deletedAt: true },
+ }),
+ client.pixel.findMany({
+ where: ownedFilter,
+ select: { id: true, slug: true, deletedAt: true },
+ }),
client.board.findMany({ where: ownedFilter, select: { id: true } }),
]);
const entityIds = [...links.map(l => l.id), ...pixels.map(p => p.id), ...boards.map(b => b.id)];
- const linkSlugs = links.map(l => l.slug);
- const pixelSlugs = pixels.map(p => p.slug);
+ // Only invalidate Redis cache for slugs that are still live (not already soft-deleted).
+ const linkSlugs = links.filter(l => !l.deletedAt).map(l => l.slug);
+ const pixelSlugs = pixels.filter(p => !p.deletedAt).map(p => p.slug);
const invalidateRedis = async () => {
if (redis.enabled && (linkSlugs.length || pixelSlugs.length)) {
@@ -170,8 +177,15 @@ export async function deleteUser(userId: string) {
},
}),
client.share.deleteMany({ where: { entityId: { in: entityIds } } }),
- client.link.updateMany({ data: { deletedAt: new Date() }, where: { userId } }),
- client.pixel.updateMany({ data: { deletedAt: new Date() }, where: { userId } }),
+ // deletedAt: null avoids restamping rows that were already soft-deleted earlier.
+ client.link.updateMany({
+ data: { deletedAt: new Date() },
+ where: { userId, deletedAt: null },
+ }),
+ client.pixel.updateMany({
+ data: { deletedAt: new Date() },
+ where: { userId, deletedAt: null },
+ }),
client.board.deleteMany({ where: { userId } }),
]).then(async result => {
await invalidateRedis();