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 prisma session race condition error

Kristofor Carleb088a2ee6edb
diff --git a/src/queries/sql/sessions/saveSessionData.ts b/src/queries/sql/sessions/saveSessionData.ts
index 740931777..cce6cd28c 100644
--- a/src/queries/sql/sessions/saveSessionData.ts
+++ b/src/queries/sql/sessions/saveSessionData.ts
@@ -46,31 +46,23 @@ export async function relationalQuery({
createdAt,
}));
- const existing = await client.sessionData.findMany({
- where: {
- sessionId,
- },
- select: {
- id: true,
- sessionId: true,
- dataKey: true,
- },
- });
-
for (const data of flattenedData) {
const { sessionId, dataKey, ...props } = data;
- const record = existing.find(e => e.sessionId === sessionId && e.dataKey === dataKey);
- if (record) {
- await client.sessionData.update({
- where: {
- id: record.id,
- },
- data: {
- ...props,
- },
- });
- } else {
+ // Try to update existing record using compound where clause
+ // This is safer than using id from a previous query due to race conditions
+ const updateResult = await client.sessionData.updateMany({
+ where: {
+ sessionId,
+ dataKey,
+ },
+ data: {
+ ...props,
+ },
+ });
+
+ // If no record was updated, create a new one
+ if (updateResult.count === 0) {
await client.sessionData.create({
data,
});