diff --git a/desktop/src/main.ts b/desktop/src/main.ts index d02942dd..fba26b46 100644 --- a/desktop/src/main.ts +++ b/desktop/src/main.ts @@ -4,7 +4,7 @@ import { eventBus } from '@/lib/event-bus'; import { MutationInput, MutationMap } from '@/types/mutations'; import { QueryInput, QueryMap } from '@/types/queries'; import { mediator } from '@/main/mediator'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { socketManager } from '@/main/sockets/socket-manager'; import { synchronizer } from '@/main/synchronizer'; @@ -16,7 +16,7 @@ if (require('electron-squirrel-startup')) { } const createWindow = async () => { - await databaseContext.init(); + await databaseManager.init(); socketManager.init(); synchronizer.init(); diff --git a/desktop/src/main/data/database-context.ts b/desktop/src/main/data/database-manager.ts similarity index 97% rename from desktop/src/main/data/database-context.ts rename to desktop/src/main/data/database-manager.ts index 2fd93843..a583a1ac 100644 --- a/desktop/src/main/data/database-context.ts +++ b/desktop/src/main/data/database-manager.ts @@ -7,7 +7,7 @@ import { buildSqlite } from '@/main/data/utils'; import { appDatabaseMigrations } from '@/main/data/app/migrations'; import { workspaceDatabaseMigrations } from '@/main/data/workspace/migrations'; -class DatabaseContext { +class DatabaseManager { private readonly appPath: string; private initPromise: Promise | null = null; private readonly workspaceDatabases: Map< @@ -131,4 +131,4 @@ class DatabaseContext { } } -export const databaseContext = new DatabaseContext(); +export const databaseManager = new DatabaseManager(); diff --git a/desktop/src/main/mutations/board-view-create.ts b/desktop/src/main/mutations/board-view-create.ts index f47ced81..5fafce1a 100644 --- a/desktop/src/main/mutations/board-view-create.ts +++ b/desktop/src/main/mutations/board-view-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes, ViewNodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -12,7 +12,7 @@ export class BoardViewCreateMutationHandler async handleMutation( input: BoardViewCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/calendar-view-create.ts b/desktop/src/main/mutations/calendar-view-create.ts index 779a85c0..d0002d4f 100644 --- a/desktop/src/main/mutations/calendar-view-create.ts +++ b/desktop/src/main/mutations/calendar-view-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes, ViewNodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -12,7 +12,7 @@ export class CalendarViewCreateMutationHandler async handleMutation( input: CalendarViewCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/channel-create.ts b/desktop/src/main/mutations/channel-create.ts index 2713436e..f151045f 100644 --- a/desktop/src/main/mutations/channel-create.ts +++ b/desktop/src/main/mutations/channel-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes, ViewNodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -12,7 +12,7 @@ export class ChannelCreateMutationHandler async handleMutation( input: ChannelCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/chat-create.ts b/desktop/src/main/mutations/chat-create.ts index 2510da1c..ad267fec 100644 --- a/desktop/src/main/mutations/chat-create.ts +++ b/desktop/src/main/mutations/chat-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode } from '@/lib/nodes'; @@ -11,7 +11,7 @@ export class ChatCreateMutationHandler public async handleMutation( input: ChatCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/database-create.ts b/desktop/src/main/mutations/database-create.ts index e3243990..95aa2935 100644 --- a/desktop/src/main/mutations/database-create.ts +++ b/desktop/src/main/mutations/database-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -12,7 +12,7 @@ export class DatabaseCreateMutationHandler async handleMutation( input: DatabaseCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/email-login.ts b/desktop/src/main/mutations/email-login.ts index 821d98f9..1f68944e 100644 --- a/desktop/src/main/mutations/email-login.ts +++ b/desktop/src/main/mutations/email-login.ts @@ -1,5 +1,5 @@ import { LoginOutput } from '@/types/accounts'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { buildAxiosInstance } from '@/lib/servers'; import { EmailLoginMutationInput } from '@/types/mutations/email-login'; import { @@ -14,7 +14,7 @@ export class EmailLoginMutationHandler async handleMutation( input: EmailLoginMutationInput, ): Promise> { - const server = await databaseContext.appDatabase + const server = await databaseManager.appDatabase .selectFrom('servers') .selectAll() .where('domain', '=', input.server) @@ -35,7 +35,7 @@ export class EmailLoginMutationHandler }); const changedTables: MutationChange[] = []; - await databaseContext.appDatabase.transaction().execute(async (trx) => { + await databaseManager.appDatabase.transaction().execute(async (trx) => { await trx .insertInto('accounts') .values({ diff --git a/desktop/src/main/mutations/email-register.ts b/desktop/src/main/mutations/email-register.ts index 7560298b..07a2627c 100644 --- a/desktop/src/main/mutations/email-register.ts +++ b/desktop/src/main/mutations/email-register.ts @@ -1,5 +1,5 @@ import { LoginOutput } from '@/types/accounts'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { buildAxiosInstance } from '@/lib/servers'; import { EmailRegisterMutationInput } from '@/types/mutations/email-register'; import { @@ -14,7 +14,7 @@ export class EmailRegisterMutationHandler handleMutation = async ( input: EmailRegisterMutationInput, ): Promise> => { - const server = await databaseContext.appDatabase + const server = await databaseManager.appDatabase .selectFrom('servers') .selectAll() .where('domain', '=', input.server) @@ -39,7 +39,7 @@ export class EmailRegisterMutationHandler ); const changedTables: MutationChange[] = []; - await databaseContext.appDatabase.transaction().execute(async (trx) => { + await databaseManager.appDatabase.transaction().execute(async (trx) => { await trx .insertInto('accounts') .values({ diff --git a/desktop/src/main/mutations/field-create.ts b/desktop/src/main/mutations/field-create.ts index a7888976..c36569fe 100644 --- a/desktop/src/main/mutations/field-create.ts +++ b/desktop/src/main/mutations/field-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes, ViewNodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -12,7 +12,7 @@ export class FieldCreateMutationHandler async handleMutation( input: FieldCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/message-create.ts b/desktop/src/main/mutations/message-create.ts index ef2663e8..4c0be136 100644 --- a/desktop/src/main/mutations/message-create.ts +++ b/desktop/src/main/mutations/message-create.ts @@ -1,5 +1,5 @@ import { mapContentsToEditorNodes } from '@/renderer/editor/mappers'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode } from '@/lib/nodes'; @@ -14,7 +14,7 @@ export class MessageCreateMutationHandler async handleMutation( input: MessageCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/node-attribute-delete.ts b/desktop/src/main/mutations/node-attribute-delete.ts index 8347aa65..56bbe7f2 100644 --- a/desktop/src/main/mutations/node-attribute-delete.ts +++ b/desktop/src/main/mutations/node-attribute-delete.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NeuronId } from '@/lib/id'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeAttributeDeleteMutationInput } from '@/types/mutations/node-attribute-delete'; @@ -11,7 +11,7 @@ export class NodeAttributeDeleteMutationHandler async handleMutation( input: NodeAttributeDeleteMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/node-attribute-set.ts b/desktop/src/main/mutations/node-attribute-set.ts index b5705737..53cb766c 100644 --- a/desktop/src/main/mutations/node-attribute-set.ts +++ b/desktop/src/main/mutations/node-attribute-set.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NeuronId } from '@/lib/id'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeAttributeSetMutationInput } from '@/types/mutations/node-attribute-set'; @@ -11,7 +11,7 @@ export class NodeAttributeSetMutationHandler async handleMutation( input: NodeAttributeSetMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/node-collaborator-create.ts b/desktop/src/main/mutations/node-collaborator-create.ts index 91ef13b2..8d638769 100644 --- a/desktop/src/main/mutations/node-collaborator-create.ts +++ b/desktop/src/main/mutations/node-collaborator-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NeuronId } from '@/lib/id'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeCollaboratorCreateMutationInput } from '@/types/mutations/node-collaborator-create'; @@ -9,7 +9,7 @@ export class NodeCollaboratorCreateMutationHandler async handleMutation( input: NodeCollaboratorCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/node-collaborator-delete.ts b/desktop/src/main/mutations/node-collaborator-delete.ts index 83c920b3..90c34b1c 100644 --- a/desktop/src/main/mutations/node-collaborator-delete.ts +++ b/desktop/src/main/mutations/node-collaborator-delete.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeCollaboratorDeleteMutationInput } from '@/types/mutations/node-collaborator-delete'; @@ -8,7 +8,7 @@ export class NodeCollaboratorDeleteMutationHandler async handleMutation( input: NodeCollaboratorDeleteMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/node-collaborator-sync.ts b/desktop/src/main/mutations/node-collaborator-sync.ts index c1fde91e..7b6b465d 100644 --- a/desktop/src/main/mutations/node-collaborator-sync.ts +++ b/desktop/src/main/mutations/node-collaborator-sync.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeCollaboratorSyncMutationInput } from '@/types/mutations/node-collaborator-sync'; import { ServerNodeCollaborator, ServerNodeReaction } from '@/types/nodes'; @@ -9,7 +9,7 @@ export class NodeCollaboratorSyncMutationHandler public async handleMutation( input: NodeCollaboratorSyncMutationInput, ): Promise> { - const workspace = await databaseContext.appDatabase + const workspace = await databaseManager.appDatabase .selectFrom('workspaces') .selectAll() .where((eb) => @@ -56,7 +56,7 @@ export class NodeCollaboratorSyncMutationHandler nodeCollaborator: ServerNodeCollaborator, ): Promise { const workspaceDatabase = - await databaseContext.getWorkspaceDatabase(userId); + await databaseManager.getWorkspaceDatabase(userId); await workspaceDatabase .insertInto('node_collaborators') @@ -90,7 +90,7 @@ export class NodeCollaboratorSyncMutationHandler nodeCollaborator: ServerNodeCollaborator, ): Promise { const workspaceDatabase = - await databaseContext.getWorkspaceDatabase(userId); + await databaseManager.getWorkspaceDatabase(userId); const existingNodeCollaborator = await workspaceDatabase .selectFrom('node_collaborators') @@ -145,7 +145,7 @@ export class NodeCollaboratorSyncMutationHandler nodeCollaborator: ServerNodeCollaborator, ): Promise { const workspaceDatabase = - await databaseContext.getWorkspaceDatabase(userId); + await databaseManager.getWorkspaceDatabase(userId); await workspaceDatabase .deleteFrom('node_collaborators') diff --git a/desktop/src/main/mutations/node-collaborator-update.ts b/desktop/src/main/mutations/node-collaborator-update.ts index 63c43c9b..b738ec0a 100644 --- a/desktop/src/main/mutations/node-collaborator-update.ts +++ b/desktop/src/main/mutations/node-collaborator-update.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NeuronId } from '@/lib/id'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeCollaboratorUpdateMutationInput } from '@/types/mutations/node-collaborator-update'; @@ -9,7 +9,7 @@ export class NodeCollaboratorUpdateMutationHandler async handleMutation( input: NodeCollaboratorUpdateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/node-delete.ts b/desktop/src/main/mutations/node-delete.ts index 93d1d9ca..cbf79073 100644 --- a/desktop/src/main/mutations/node-delete.ts +++ b/desktop/src/main/mutations/node-delete.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeDeleteMutationInput } from '@/types/mutations/node-delete'; @@ -8,7 +8,7 @@ export class NodeDeleteMutationHandler async handleMutation( input: NodeDeleteMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/node-reaction-create.ts b/desktop/src/main/mutations/node-reaction-create.ts index ebbd144b..defba0fd 100644 --- a/desktop/src/main/mutations/node-reaction-create.ts +++ b/desktop/src/main/mutations/node-reaction-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeReactionCreateMutationInput } from '@/types/mutations/node-reaction-create'; @@ -9,7 +9,7 @@ export class NodeReactionCreateMutationHandler input: NodeReactionCreateMutationInput, ): Promise> { console.log('create node reaction', input); - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/node-reaction-delete.ts b/desktop/src/main/mutations/node-reaction-delete.ts index c0b37100..e387e1ab 100644 --- a/desktop/src/main/mutations/node-reaction-delete.ts +++ b/desktop/src/main/mutations/node-reaction-delete.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeReactionDeleteMutationInput } from '@/types/mutations/node-reaction-delete'; @@ -8,7 +8,7 @@ export class NodeReactionDeleteMutationHandler async handleMutation( input: NodeReactionDeleteMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/node-reaction-sync.ts b/desktop/src/main/mutations/node-reaction-sync.ts index 7453d5f2..4f77246d 100644 --- a/desktop/src/main/mutations/node-reaction-sync.ts +++ b/desktop/src/main/mutations/node-reaction-sync.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeReactionSyncMutationInput } from '@/types/mutations/node-reaction-sync'; import { ServerNodeReaction } from '@/types/nodes'; @@ -9,7 +9,7 @@ export class NodeReactionSyncMutationHandler public async handleMutation( input: NodeReactionSyncMutationInput, ): Promise> { - const workspace = await databaseContext.appDatabase + const workspace = await databaseManager.appDatabase .selectFrom('workspaces') .selectAll() .where((eb) => @@ -54,7 +54,7 @@ export class NodeReactionSyncMutationHandler nodeReaction: ServerNodeReaction, ): Promise { const workspaceDatabase = - await databaseContext.getWorkspaceDatabase(userId); + await databaseManager.getWorkspaceDatabase(userId); await workspaceDatabase .insertInto('node_reactions') @@ -78,7 +78,7 @@ export class NodeReactionSyncMutationHandler nodeReaction: ServerNodeReaction, ): Promise { const workspaceDatabase = - await databaseContext.getWorkspaceDatabase(userId); + await databaseManager.getWorkspaceDatabase(userId); await workspaceDatabase .deleteFrom('node_reactions') diff --git a/desktop/src/main/mutations/node-sync.ts b/desktop/src/main/mutations/node-sync.ts index 608f1e16..a1d57fbd 100644 --- a/desktop/src/main/mutations/node-sync.ts +++ b/desktop/src/main/mutations/node-sync.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { NodeSyncMutationInput } from '@/types/mutations/node-sync'; import { ServerNode } from '@/types/nodes'; @@ -11,7 +11,7 @@ export class NodeSyncMutationHandler public async handleMutation( input: NodeSyncMutationInput, ): Promise> { - const workspace = await databaseContext.appDatabase + const workspace = await databaseManager.appDatabase .selectFrom('workspaces') .selectAll() .where((eb) => @@ -55,7 +55,7 @@ export class NodeSyncMutationHandler private async insertNode(userId: string, node: ServerNode): Promise { const workspaceDatabase = - await databaseContext.getWorkspaceDatabase(userId); + await databaseManager.getWorkspaceDatabase(userId); await workspaceDatabase .insertInto('nodes') @@ -86,7 +86,7 @@ export class NodeSyncMutationHandler private async updateNode(userId: string, node: ServerNode): Promise { const workspaceDatabase = - await databaseContext.getWorkspaceDatabase(userId); + await databaseManager.getWorkspaceDatabase(userId); const existingNode = await workspaceDatabase .selectFrom('nodes') @@ -127,7 +127,7 @@ export class NodeSyncMutationHandler private async deleteNode(userId: string, node: ServerNode): Promise { const workspaceDatabase = - await databaseContext.getWorkspaceDatabase(userId); + await databaseManager.getWorkspaceDatabase(userId); await workspaceDatabase .deleteFrom('nodes') diff --git a/desktop/src/main/mutations/page-create.ts b/desktop/src/main/mutations/page-create.ts index e17a33d2..95d730ce 100644 --- a/desktop/src/main/mutations/page-create.ts +++ b/desktop/src/main/mutations/page-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes, ViewNodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -12,7 +12,7 @@ export class PageCreateMutationHandler async handleMutation( input: PageCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/record-create.ts b/desktop/src/main/mutations/record-create.ts index 1fcaf868..86397873 100644 --- a/desktop/src/main/mutations/record-create.ts +++ b/desktop/src/main/mutations/record-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -11,7 +11,7 @@ export class RecordCreateMutationHandler async handleMutation( input: RecordCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/select-option-create.ts b/desktop/src/main/mutations/select-option-create.ts index 1c5e67da..3090a9b3 100644 --- a/desktop/src/main/mutations/select-option-create.ts +++ b/desktop/src/main/mutations/select-option-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -11,7 +11,7 @@ export class SelectOptionCreateMutationHandler async handleMutation( input: SelectOptionCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/server-create.ts b/desktop/src/main/mutations/server-create.ts index 71acb73c..2a99aef3 100644 --- a/desktop/src/main/mutations/server-create.ts +++ b/desktop/src/main/mutations/server-create.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { MutationHandler, MutationResult } from '@/types/mutations'; import { ServerCreateMutationInput } from '@/types/mutations/server-create'; import { ServerConfig } from '@/types/servers'; @@ -14,7 +14,7 @@ export class ServerCreateMutationHandler `http://${input.domain}/v1/config`, ); - await databaseContext.appDatabase + await databaseManager.appDatabase .insertInto('servers') .values({ domain: input.domain, diff --git a/desktop/src/main/mutations/space-create.ts b/desktop/src/main/mutations/space-create.ts index 97080240..3d10e572 100644 --- a/desktop/src/main/mutations/space-create.ts +++ b/desktop/src/main/mutations/space-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -11,7 +11,7 @@ export class SpaceCreateMutationHandler async handleMutation( input: SpaceCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/table-view-create.ts b/desktop/src/main/mutations/table-view-create.ts index b2a6c440..e3a0d7ae 100644 --- a/desktop/src/main/mutations/table-view-create.ts +++ b/desktop/src/main/mutations/table-view-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { NodeTypes, ViewNodeTypes } from '@/lib/constants'; import { NeuronId } from '@/lib/id'; import { buildCreateNode, generateNodeIndex } from '@/lib/nodes'; @@ -12,7 +12,7 @@ export class TableViewCreateMutationHandler async handleMutation( input: TableViewCreateMutationInput, ): Promise> { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/workspace-account-role-update.ts b/desktop/src/main/mutations/workspace-account-role-update.ts index 41df130c..c708d67a 100644 --- a/desktop/src/main/mutations/workspace-account-role-update.ts +++ b/desktop/src/main/mutations/workspace-account-role-update.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { buildAxiosInstance } from '@/lib/servers'; import { WorkspaceAccountRoleUpdateMutationInput } from '@/types/mutations/workspace-account-role-update'; import { @@ -14,7 +14,7 @@ export class WorkspaceAccountRoleUpdateMutationHandler async handleMutation( input: WorkspaceAccountRoleUpdateMutationInput, ): Promise> { - const workspace = await databaseContext.appDatabase + const workspace = await databaseManager.appDatabase .selectFrom('workspaces') .selectAll() .where('user_id', '=', input.userId) @@ -28,7 +28,7 @@ export class WorkspaceAccountRoleUpdateMutationHandler }; } - const account = await databaseContext.appDatabase + const account = await databaseManager.appDatabase .selectFrom('accounts') .selectAll() .where('id', '=', workspace.account_id) @@ -42,7 +42,7 @@ export class WorkspaceAccountRoleUpdateMutationHandler }; } - const server = await databaseContext.appDatabase + const server = await databaseManager.appDatabase .selectFrom('servers') .selectAll() .where('domain', '=', account.server) @@ -68,7 +68,7 @@ export class WorkspaceAccountRoleUpdateMutationHandler }, ); - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/workspace-accounts-invite.ts b/desktop/src/main/mutations/workspace-accounts-invite.ts index 4f3a600d..17767045 100644 --- a/desktop/src/main/mutations/workspace-accounts-invite.ts +++ b/desktop/src/main/mutations/workspace-accounts-invite.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { buildAxiosInstance } from '@/lib/servers'; import { WorkspaceAccountsInviteMutationInput } from '@/types/mutations/workspace-accounts-invite'; import { @@ -15,7 +15,7 @@ export class WorkspaceAccountsInviteMutationHandler async handleMutation( input: WorkspaceAccountsInviteMutationInput, ): Promise> { - const workspace = await databaseContext.appDatabase + const workspace = await databaseManager.appDatabase .selectFrom('workspaces') .selectAll() .where('user_id', '=', input.userId) @@ -29,7 +29,7 @@ export class WorkspaceAccountsInviteMutationHandler }; } - const account = await databaseContext.appDatabase + const account = await databaseManager.appDatabase .selectFrom('accounts') .selectAll() .where('id', '=', workspace.account_id) @@ -43,7 +43,7 @@ export class WorkspaceAccountsInviteMutationHandler }; } - const server = await databaseContext.appDatabase + const server = await databaseManager.appDatabase .selectFrom('servers') .selectAll() .where('domain', '=', account.server) @@ -69,7 +69,7 @@ export class WorkspaceAccountsInviteMutationHandler }, ); - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/mutations/workspace-create.ts b/desktop/src/main/mutations/workspace-create.ts index ff775478..ee8722ae 100644 --- a/desktop/src/main/mutations/workspace-create.ts +++ b/desktop/src/main/mutations/workspace-create.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { buildAxiosInstance } from '@/lib/servers'; import { WorkspaceCreateMutationInput } from '@/types/mutations/workspace-create'; import { @@ -14,7 +14,7 @@ export class WorkspaceCreateMutationHandler async handleMutation( input: WorkspaceCreateMutationInput, ): Promise> { - const account = await databaseContext.appDatabase + const account = await databaseManager.appDatabase .selectFrom('accounts') .selectAll() .where('id', '=', input.accountId) @@ -24,7 +24,7 @@ export class WorkspaceCreateMutationHandler throw new Error('Account not found!'); } - const server = await databaseContext.appDatabase + const server = await databaseManager.appDatabase .selectFrom('servers') .selectAll() .where('domain', '=', account.server) @@ -44,7 +44,7 @@ export class WorkspaceCreateMutationHandler description: input.description, }); - await databaseContext.appDatabase + await databaseManager.appDatabase .insertInto('workspaces') .values({ workspace_id: data.id ?? data.id, diff --git a/desktop/src/main/mutations/workspace-update.ts b/desktop/src/main/mutations/workspace-update.ts index d5a3a90c..4b47b14c 100644 --- a/desktop/src/main/mutations/workspace-update.ts +++ b/desktop/src/main/mutations/workspace-update.ts @@ -1,4 +1,4 @@ -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { buildAxiosInstance } from '@/lib/servers'; import { WorkspaceUpdateMutationInput } from '@/types/mutations/workspace-update'; import { @@ -14,7 +14,7 @@ export class WorkspaceUpdateMutationHandler async handleMutation( input: WorkspaceUpdateMutationInput, ): Promise> { - const account = await databaseContext.appDatabase + const account = await databaseManager.appDatabase .selectFrom('accounts') .selectAll() .where('id', '=', input.accountId) @@ -24,7 +24,7 @@ export class WorkspaceUpdateMutationHandler throw new Error('Account not found!'); } - const server = await databaseContext.appDatabase + const server = await databaseManager.appDatabase .selectFrom('servers') .selectAll() .where('domain', '=', account.server) @@ -44,7 +44,7 @@ export class WorkspaceUpdateMutationHandler description: input.description, }); - await databaseContext.appDatabase + await databaseManager.appDatabase .updateTable('workspaces') .set({ name: data.name, diff --git a/desktop/src/main/queries/accounts-list.ts b/desktop/src/main/queries/accounts-list.ts index 0ebd4acc..4f2a72f7 100644 --- a/desktop/src/main/queries/accounts-list.ts +++ b/desktop/src/main/queries/accounts-list.ts @@ -1,5 +1,5 @@ import { AccountListQueryInput } from '@/types/queries/account-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { Account } from '@/types/accounts'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { SelectAccount } from '@/main/data/app/schema'; @@ -55,7 +55,7 @@ export class AccountListQueryHandler } private fetchAccounts(): Promise { - return databaseContext.appDatabase + return databaseManager.appDatabase .selectFrom('accounts') .selectAll() .where('status', '=', 'active') diff --git a/desktop/src/main/queries/breadcrumb-list.ts b/desktop/src/main/queries/breadcrumb-list.ts index 16b3ebce..489b6d8d 100644 --- a/desktop/src/main/queries/breadcrumb-list.ts +++ b/desktop/src/main/queries/breadcrumb-list.ts @@ -1,5 +1,5 @@ import { BreadcrumbListQueryInput } from '@/types/queries/breadcrumb-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -62,7 +62,7 @@ export class BreadcrumbListQueryHandler private async fetchNodes( input: BreadcrumbListQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/database-get.ts b/desktop/src/main/queries/database-get.ts index a00c6f0a..e4d1515c 100644 --- a/desktop/src/main/queries/database-get.ts +++ b/desktop/src/main/queries/database-get.ts @@ -1,5 +1,5 @@ import { DatabaseGetQueryInput } from '@/types/queries/database-get'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -69,7 +69,7 @@ export class DatabaseGetQueryHandler private async fetchNodes( input: DatabaseGetQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/database-view-list.ts b/desktop/src/main/queries/database-view-list.ts index 1f452781..1a97d450 100644 --- a/desktop/src/main/queries/database-view-list.ts +++ b/desktop/src/main/queries/database-view-list.ts @@ -1,5 +1,5 @@ import { DatabaseViewListQueryInput } from '@/types/queries/database-view-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { SelectNode } from '@/main/data/workspace/schema'; import { mapNode } from '@/lib/nodes'; @@ -68,7 +68,7 @@ export class DatabaseViewListQueryHandler private async fetchNodes( input: DatabaseViewListQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/document-get.ts b/desktop/src/main/queries/document-get.ts index e2e8cb89..ce0c2ac8 100644 --- a/desktop/src/main/queries/document-get.ts +++ b/desktop/src/main/queries/document-get.ts @@ -1,5 +1,5 @@ import { DocumentGetQueryInput } from '@/types/queries/document-get'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -67,7 +67,7 @@ export class DocumentGetQueryHandler private async fetchNodes( input: DocumentGetQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/message-list.ts b/desktop/src/main/queries/message-list.ts index 77173804..9679d409 100644 --- a/desktop/src/main/queries/message-list.ts +++ b/desktop/src/main/queries/message-list.ts @@ -1,5 +1,5 @@ import { MessageListQueryInput } from '@/types/queries/message-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { MutationChange } from '@/types/mutations'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -71,7 +71,7 @@ export class MessageListQueryHandler private async fetchMesssages( input: MessageListQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/node-collaborator-list.tsx b/desktop/src/main/queries/node-collaborator-list.tsx index 1f0d2af4..2bcdcd9d 100644 --- a/desktop/src/main/queries/node-collaborator-list.tsx +++ b/desktop/src/main/queries/node-collaborator-list.tsx @@ -1,5 +1,5 @@ import { NodeCollaboratorListQueryInput } from '@/types/queries/node-collaborator-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { sql } from 'kysely'; import { NodeTypes } from '@/lib/constants'; @@ -75,7 +75,7 @@ export class NodeCollaboratorListQueryHandler private async fetchCollaborators( input: NodeCollaboratorListQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/node-collaborator-search.ts b/desktop/src/main/queries/node-collaborator-search.ts index ed09d59d..24565297 100644 --- a/desktop/src/main/queries/node-collaborator-search.ts +++ b/desktop/src/main/queries/node-collaborator-search.ts @@ -1,5 +1,5 @@ import { NodeCollaboratorSearchQueryInput } from '@/types/queries/node-collaborator-search'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -71,7 +71,7 @@ export class NodeCollaboratorSearchQueryHandler private async fetchNodes( input: NodeCollaboratorSearchQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/node-get.ts b/desktop/src/main/queries/node-get.ts index d9716a94..c63c45d2 100644 --- a/desktop/src/main/queries/node-get.ts +++ b/desktop/src/main/queries/node-get.ts @@ -1,5 +1,5 @@ import { NodeGetQueryInput } from '@/types/queries/node-get'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { mapNode } from '@/lib/nodes'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -56,7 +56,7 @@ export class NodeGetQueryHandler implements QueryHandler { } private async fetchNode(input: NodeGetQueryInput): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/record-get.ts b/desktop/src/main/queries/record-get.ts index bf3d2703..1d92538f 100644 --- a/desktop/src/main/queries/record-get.ts +++ b/desktop/src/main/queries/record-get.ts @@ -1,5 +1,5 @@ import { RecordGetQueryInput } from '@/types/queries/record-get'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { mapNode } from '@/lib/nodes'; import { sql } from 'kysely'; @@ -61,7 +61,7 @@ export class RecordGetQueryHandler } private async fetchNodes(input: RecordGetQueryInput): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/record-list.ts b/desktop/src/main/queries/record-list.ts index 2059c28e..6b9b9490 100644 --- a/desktop/src/main/queries/record-list.ts +++ b/desktop/src/main/queries/record-list.ts @@ -1,5 +1,5 @@ import { RecordListQueryInput } from '@/types/queries/record-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { MutationChange } from '@/types/mutations'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -84,7 +84,7 @@ export class RecordListQueryHandler private async fetchRecords( input: RecordListQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/server-list.ts b/desktop/src/main/queries/server-list.ts index 24c92ac2..f1079b62 100644 --- a/desktop/src/main/queries/server-list.ts +++ b/desktop/src/main/queries/server-list.ts @@ -1,5 +1,5 @@ import { ServerListQueryInput } from '@/types/queries/server-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { SelectServer } from '@/main/data/app/schema'; import { MutationChange } from '@/types/mutations'; @@ -55,7 +55,7 @@ export class ServerListQueryHandler } private fetchServers(): Promise { - return databaseContext.appDatabase + return databaseManager.appDatabase .selectFrom('servers') .selectAll() .execute(); diff --git a/desktop/src/main/queries/sidebar-chat-list.ts b/desktop/src/main/queries/sidebar-chat-list.ts index ea2bfed8..8bbd0e08 100644 --- a/desktop/src/main/queries/sidebar-chat-list.ts +++ b/desktop/src/main/queries/sidebar-chat-list.ts @@ -1,5 +1,5 @@ import { SidebarChatListQueryInput } from '@/types/queries/sidebar-chat-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -67,7 +67,7 @@ export class SidebarChatListQueryHandler private async fetchChats( input: SidebarChatListQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/sidebar-space-list.ts b/desktop/src/main/queries/sidebar-space-list.ts index b1e67fdd..e52e5739 100644 --- a/desktop/src/main/queries/sidebar-space-list.ts +++ b/desktop/src/main/queries/sidebar-space-list.ts @@ -1,5 +1,5 @@ import { SidebarSpaceListQueryInput } from '@/types/queries/sidebar-space-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -64,7 +64,7 @@ export class SidebarSpaceListQueryHandler private async fetchNodes( input: SidebarSpaceListQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/user-search.ts b/desktop/src/main/queries/user-search.ts index 38872c30..cfbe190d 100644 --- a/desktop/src/main/queries/user-search.ts +++ b/desktop/src/main/queries/user-search.ts @@ -1,5 +1,5 @@ import { UserSearchQueryInput } from '@/types/queries/user-search'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { sql } from 'kysely'; import { SelectNode } from '@/main/data/workspace/schema'; @@ -69,7 +69,7 @@ export class UserSearchQueryHandler } private async fetchNodes(input: UserSearchQueryInput): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/queries/workspace-list.ts b/desktop/src/main/queries/workspace-list.ts index 53031f48..9ce64399 100644 --- a/desktop/src/main/queries/workspace-list.ts +++ b/desktop/src/main/queries/workspace-list.ts @@ -1,5 +1,5 @@ import { WorkspaceListQueryInput } from '@/types/queries/workspace-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { Workspace, WorkspaceRole } from '@/types/workspaces'; import { SelectWorkspace } from '@/main/data/app/schema'; @@ -56,13 +56,13 @@ export class WorkspaceListQueryHandler } private fetchWorkspaces(): Promise { - return databaseContext.appDatabase + return databaseManager.appDatabase .selectFrom('workspaces') .selectAll() .where( 'account_id', 'in', - databaseContext.appDatabase + databaseManager.appDatabase .selectFrom('accounts') .where('status', '=', 'active') .select('id'), diff --git a/desktop/src/main/queries/workspace-user-list.ts b/desktop/src/main/queries/workspace-user-list.ts index 048fcedb..4ea817ff 100644 --- a/desktop/src/main/queries/workspace-user-list.ts +++ b/desktop/src/main/queries/workspace-user-list.ts @@ -1,5 +1,5 @@ import { WorkspaceUserListQueryInput } from '@/types/queries/workspace-user-list'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ChangeCheckResult, QueryHandler, QueryResult } from '@/types/queries'; import { NodeTypes } from '@/lib/constants'; import { mapNode } from '@/lib/nodes'; @@ -62,7 +62,7 @@ export class WorkspaceUserListQueryHandler private async fetchNodes( input: WorkspaceUserListQueryInput, ): Promise { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( input.userId, ); diff --git a/desktop/src/main/sockets/socket-manager.ts b/desktop/src/main/sockets/socket-manager.ts index 832a5fd5..1f440920 100644 --- a/desktop/src/main/sockets/socket-manager.ts +++ b/desktop/src/main/sockets/socket-manager.ts @@ -1,5 +1,5 @@ import { SocketConnection } from '@/main/sockets/socket-connection'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; const EVENT_LOOP_INTERVAL = 5000; @@ -29,12 +29,12 @@ class SocketManager { } private async checkAccounts() { - const servers = await databaseContext.appDatabase + const servers = await databaseManager.appDatabase .selectFrom('servers') .selectAll() .execute(); - const accounts = await databaseContext.appDatabase + const accounts = await databaseManager.appDatabase .selectFrom('accounts') .selectAll() .where('status', '=', 'active') diff --git a/desktop/src/main/synchronizer.ts b/desktop/src/main/synchronizer.ts index cb945b45..3b013fda 100644 --- a/desktop/src/main/synchronizer.ts +++ b/desktop/src/main/synchronizer.ts @@ -1,6 +1,6 @@ import { buildAxiosInstance } from '@/lib/servers'; import { SelectWorkspace } from '@/main/data/app/schema'; -import { databaseContext } from '@/main/data/database-context'; +import { databaseManager } from '@/main/data/database-manager'; import { ServerSyncResponse, WorkspaceSyncData } from '@/types/sync'; const EVENT_LOOP_INTERVAL = 100; @@ -33,7 +33,7 @@ class Synchronizer { } private async checkForWorkspaceSyncs(): Promise { - const unsyncedWorkspaces = await databaseContext.appDatabase + const unsyncedWorkspaces = await databaseManager.appDatabase .selectFrom('workspaces') .selectAll() .where('synced', '=', 0) @@ -49,7 +49,7 @@ class Synchronizer { } private async checkForWorkspaceChanges() { - const workspaces = await databaseContext.appDatabase + const workspaces = await databaseManager.appDatabase .selectFrom('workspaces') .innerJoin('accounts', 'workspaces.account_id', 'accounts.id') .innerJoin('servers', 'accounts.server', 'servers.domain') @@ -64,7 +64,7 @@ class Synchronizer { .execute(); for (const workspace of workspaces) { - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( workspace.user_id, ); @@ -127,7 +127,7 @@ class Synchronizer { } private async syncWorkspace(workspace: SelectWorkspace): Promise { - const credentials = await databaseContext.appDatabase + const credentials = await databaseManager.appDatabase .selectFrom('accounts') .innerJoin('servers', 'accounts.server', 'servers.domain') .select(['domain', 'attributes', 'token']) @@ -147,7 +147,7 @@ class Synchronizer { `/v1/sync/${workspace.workspace_id}`, ); - const workspaceDatabase = await databaseContext.getWorkspaceDatabase( + const workspaceDatabase = await databaseManager.getWorkspaceDatabase( workspace.user_id, ); @@ -197,7 +197,7 @@ class Synchronizer { } }); - await databaseContext.appDatabase + await databaseManager.appDatabase .updateTable('workspaces') .set({ synced: 1,