Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Delete interaction events if they fail to sync for more than 20 times

Hakan Shehudcb4bc5bd881
diff --git a/apps/desktop/src/main/data/workspace/migrations.ts b/apps/desktop/src/main/data/workspace/migrations.ts
index 0e4736d7..01fed804 100644
--- a/apps/desktop/src/main/data/workspace/migrations.ts
+++ b/apps/desktop/src/main/data/workspace/migrations.ts
@@ -153,6 +153,7 @@ const createInteractionEventsTable: Migration = {
.addColumn('value', 'text', (col) => col.notNull())
.addColumn('created_at', 'text', (col) => col.notNull())
.addColumn('sent_at', 'text')
+ .addColumn('sent_count', 'integer', (col) => col.defaultTo(0))
.addColumn('event_id', 'text', (col) => col.notNull())
.addPrimaryKeyConstraint('interaction_events_pkey', [
'node_id',
diff --git a/apps/desktop/src/main/data/workspace/schema.ts b/apps/desktop/src/main/data/workspace/schema.ts
index 6630300f..ae61bf46 100644
--- a/apps/desktop/src/main/data/workspace/schema.ts
+++ b/apps/desktop/src/main/data/workspace/schema.ts
@@ -111,6 +111,7 @@ interface InteractionEventTable {
value: ColumnType<string, string, string>;
created_at: ColumnType<string, string, never>;
sent_at: ColumnType<string | null, string | null, string | null>;
+ sent_count: ColumnType<number, number, number>;
event_id: ColumnType<string, string, string>;
}
diff --git a/apps/desktop/src/main/services/interaction-service.ts b/apps/desktop/src/main/services/interaction-service.ts
index 9c87fa78..0a545ad0 100644
--- a/apps/desktop/src/main/services/interaction-service.ts
+++ b/apps/desktop/src/main/services/interaction-service.ts
@@ -96,6 +96,7 @@ class InteractionService {
value: input.value,
created_at: new Date().toISOString(),
event_id: generateId(IdType.Event),
+ sent_count: 0,
});
}
}
@@ -135,6 +136,7 @@ class InteractionService {
b.columns(['node_id', 'attribute']).doUpdateSet({
value: sql`excluded.value`,
sent_at: null,
+ sent_count: 0,
event_id: sql`excluded.event_id`,
})
)
@@ -190,6 +192,7 @@ class InteractionService {
b.columns(['node_id', 'attribute']).doUpdateSet({
value: sql`excluded.value`,
sent_at: null,
+ sent_count: 0,
event_id: sql`excluded.event_id`,
})
)
diff --git a/apps/desktop/src/main/services/sync-service.ts b/apps/desktop/src/main/services/sync-service.ts
index 8d1ac721..fa7d23bf 100644
--- a/apps/desktop/src/main/services/sync-service.ts
+++ b/apps/desktop/src/main/services/sync-service.ts
@@ -827,9 +827,17 @@ class SyncService {
await workspaceDatabase
.updateTable('interaction_events')
- .set({ sent_at: new Date().toISOString() })
+ .set({
+ sent_at: new Date().toISOString(),
+ sent_count: sql`sent_count + 1`,
+ })
.where('event_id', 'in', sentEventIds)
.execute();
+
+ await workspaceDatabase
+ .deleteFrom('interaction_events')
+ .where('sent_count', '>', 20)
+ .execute();
}
}
}