diff --git a/apps/desktop/src/main/data/workspace/migrations.ts b/apps/desktop/src/main/data/workspace/migrations.ts index d38823d9..4471e99d 100644 --- a/apps/desktop/src/main/data/workspace/migrations.ts +++ b/apps/desktop/src/main/data/workspace/migrations.ts @@ -56,31 +56,6 @@ const createNodeTransactionsTable: Migration = { }, }; -const createCollaborationsTable: Migration = { - up: async (db) => { - await db.schema - .createTable('collaborations') - .addColumn('user_id', 'text', (col) => col.notNull()) - .addColumn('node_id', 'text', (col) => col.notNull()) - .addColumn('type', 'text', (col) => - col - .notNull() - .generatedAlwaysAs(sql`json_extract(attributes, '$.type')`) - .stored() - ) - .addColumn('attributes', 'text', (col) => col.notNull()) - .addColumn('state', 'blob', (col) => col.notNull()) - .addColumn('created_at', 'text', (col) => col.notNull()) - .addColumn('updated_at', 'text') - .addColumn('number', 'integer') - .addPrimaryKeyConstraint('collaborations_pk', ['user_id', 'node_id']) - .execute(); - }, - down: async (db) => { - await db.schema.dropTable('collaborations').execute(); - }, -}; - const createDownloadsTable: Migration = { up: async (db) => { await db.schema @@ -261,12 +236,11 @@ const createNodeDeleteNameTrigger: Migration = { export const workspaceDatabaseMigrations: Record = { '00001_create_nodes_table': createNodesTable, '00002_create_node_transactions_table': createNodeTransactionsTable, - '00003_create_collaborations_table': createCollaborationsTable, - '00004_create_uploads_table': createUploadsTable, - '00005_create_downloads_table': createDownloadsTable, - '00006_create_node_paths_table': createNodePathsTable, - '00007_create_node_names_table': createNodeNamesTable, - '00008_create_node_insert_name_trigger': createNodeInsertNameTrigger, - '00009_create_node_update_name_trigger': createNodeUpdateNameTrigger, - '00010_create_node_delete_name_trigger': createNodeDeleteNameTrigger, + '00003_create_uploads_table': createUploadsTable, + '00004_create_downloads_table': createDownloadsTable, + '00005_create_node_paths_table': createNodePathsTable, + '00006_create_node_names_table': createNodeNamesTable, + '00007_create_node_insert_name_trigger': createNodeInsertNameTrigger, + '00008_create_node_update_name_trigger': createNodeUpdateNameTrigger, + '00009_create_node_delete_name_trigger': createNodeDeleteNameTrigger, }; diff --git a/apps/desktop/src/main/data/workspace/schema.ts b/apps/desktop/src/main/data/workspace/schema.ts index c3d8e434..d1e22fdd 100644 --- a/apps/desktop/src/main/data/workspace/schema.ts +++ b/apps/desktop/src/main/data/workspace/schema.ts @@ -42,21 +42,6 @@ export type SelectNodeTransaction = Selectable; export type CreateNodeTransaction = Insertable; export type UpdateNodeTransaction = Updateable; -interface CollaborationTable { - user_id: ColumnType; - node_id: ColumnType; - type: ColumnType; - attributes: ColumnType; - state: ColumnType; - created_at: ColumnType; - updated_at: ColumnType; - number: ColumnType; -} - -export type SelectCollaboration = Selectable; -export type CreateCollaboration = Insertable; -export type UpdateCollaboration = Updateable; - interface UploadTable { node_id: ColumnType; upload_id: ColumnType; @@ -88,7 +73,6 @@ export interface WorkspaceDatabaseSchema { nodes: NodeTable; node_transactions: NodeTransactionTable; node_paths: NodePathTable; - collaborations: CollaborationTable; uploads: UploadTable; downloads: DownloadTable; } diff --git a/apps/desktop/src/main/services/collaboration-service.ts b/apps/desktop/src/main/services/collaboration-service.ts index 632f42d0..cb06be8d 100644 --- a/apps/desktop/src/main/services/collaboration-service.ts +++ b/apps/desktop/src/main/services/collaboration-service.ts @@ -15,12 +15,6 @@ class CollaborationService { .where('id', '=', revocation.nodeId) .execute(); - await tx - .deleteFrom('collaborations') - .where('user_id', '=', userId) - .where('node_id', '=', revocation.nodeId) - .execute(); - await tx .deleteFrom('node_transactions') .where('node_id', '=', revocation.nodeId) diff --git a/apps/server/src/services/synapse-service.ts b/apps/server/src/services/synapse-service.ts index 72c1cd51..968cab40 100644 --- a/apps/server/src/services/synapse-service.ts +++ b/apps/server/src/services/synapse-service.ts @@ -235,7 +235,7 @@ class SynapseService { .where('cr.user_id', '=', userId) .where('cr.version', '>', BigInt(state.cursor)) .orderBy('cr.version', 'asc') - .limit(20) + .limit(50) .execute(); if (unsyncedRevocations.length === 0) { diff --git a/apps/server/src/types/events.ts b/apps/server/src/types/events.ts index f7a92b60..e5fd8a87 100644 --- a/apps/server/src/types/events.ts +++ b/apps/server/src/types/events.ts @@ -5,21 +5,4 @@ export type NodeTransactionCreatedEvent = { workspaceId: string; }; -export type CollaborationCreatedEvent = { - type: 'collaboration_created'; - userId: string; - nodeId: string; - workspaceId: string; -}; - -export type CollaborationUpdatedEvent = { - type: 'collaboration_updated'; - userId: string; - nodeId: string; - workspaceId: string; -}; - -export type Event = - | NodeTransactionCreatedEvent - | CollaborationCreatedEvent - | CollaborationUpdatedEvent; +export type Event = NodeTransactionCreatedEvent;