Skip to content

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

Remove not needed columns from collaborations table in desktop

Hakan Shehuec6c774877f8
diff --git a/apps/desktop/src/main/data/workspace/migrations.ts b/apps/desktop/src/main/data/workspace/migrations.ts
index 8509472c..11fbb61f 100644
--- a/apps/desktop/src/main/data/workspace/migrations.ts
+++ b/apps/desktop/src/main/data/workspace/migrations.ts
@@ -60,14 +60,12 @@ 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('workspace_id', 'text', (col) => col.notNull())
.addColumn('roles', 'text')
.addColumn('created_at', 'text', (col) => col.notNull())
.addColumn('updated_at', 'text')
.addColumn('version', 'integer')
- .addPrimaryKeyConstraint('collaborations_pkey', ['user_id', 'node_id'])
+ .addPrimaryKeyConstraint('collaborations_pkey', ['node_id'])
.execute();
},
down: async (db) => {
diff --git a/apps/desktop/src/main/data/workspace/schema.ts b/apps/desktop/src/main/data/workspace/schema.ts
index 3dd064e0..f9de76af 100644
--- a/apps/desktop/src/main/data/workspace/schema.ts
+++ b/apps/desktop/src/main/data/workspace/schema.ts
@@ -48,9 +48,7 @@ export type CreateTransaction = Insertable<TransactionTable>;
export type UpdateTransaction = Updateable<TransactionTable>;
interface CollaborationTable {
- user_id: ColumnType<string, string, never>;
node_id: ColumnType<string, string, never>;
- workspace_id: ColumnType<string, string, never>;
roles: ColumnType<string, string, string>;
created_at: ColumnType<string, string, never>;
updated_at: ColumnType<string | null, string | null, string | null>;
diff --git a/apps/desktop/src/main/services/collaboration-service.ts b/apps/desktop/src/main/services/collaboration-service.ts
index 84558689..30b9943c 100644
--- a/apps/desktop/src/main/services/collaboration-service.ts
+++ b/apps/desktop/src/main/services/collaboration-service.ts
@@ -24,16 +24,14 @@ class CollaborationService {
await workspaceDatabase
.insertInto('collaborations')
.values({
- user_id: userId,
node_id: collaboration.nodeId,
- workspace_id: collaboration.workspaceId,
roles: JSON.stringify(collaboration.roles),
created_at: collaboration.createdAt,
version: BigInt(collaboration.version),
})
.onConflict((oc) =>
oc
- .columns(['user_id', 'node_id'])
+ .columns(['node_id'])
.doUpdateSet({
roles: JSON.stringify(collaboration.roles),
version: BigInt(collaboration.version),
@@ -47,7 +45,6 @@ class CollaborationService {
type: 'collaboration_synced',
userId,
nodeId: collaboration.nodeId,
- workspaceId: collaboration.workspaceId,
});
}
diff --git a/apps/desktop/src/shared/types/events.ts b/apps/desktop/src/shared/types/events.ts
index d8953e81..a5eb999a 100644
--- a/apps/desktop/src/shared/types/events.ts
+++ b/apps/desktop/src/shared/types/events.ts
@@ -126,7 +126,6 @@ export type CollaborationCreatedEvent = {
type: 'collaboration_synced';
userId: string;
nodeId: string;
- workspaceId: string;
};
export type ServerAvailabilityChangedEvent = {