Add workspacePreQueryHook module (#3879)

* rebase

* reorganise messaging folders

* fix

* fix after review

* fix yarn lock

packages/twenty-server/src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job.ts

@@ -11,7 +11,7 @@ import {
 } from 'src/core/feature-flag/feature-flag.entity';
 import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { ConnectedAccountService } from 'src/workspace/messaging/connected-account/connected-account.service';
+import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
 import {
   GmailPartialSyncJobData,
   GmailPartialSyncJob,

packages/twenty-server/src/workspace/messaging/commands/fetch-workspace-messages-commands.module.ts

@@ -6,7 +6,7 @@ import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
 import { DataSourceModule } from 'src/metadata/data-source/data-source.module';
 import { GmailFullSyncCommand } from 'src/workspace/messaging/commands/gmail-full-sync.command';
 import { GmailPartialSyncCommand } from 'src/workspace/messaging/commands/gmail-partial-sync.command';
-import { ConnectedAccountModule } from 'src/workspace/messaging/connected-account/connected-account.module';
+import { ConnectedAccountModule } from 'src/workspace/messaging/repositories/connected-account/connected-account.module';
 import { StartFetchAllWorkspacesMessagesCronCommand } from 'src/workspace/messaging/commands/start-fetch-all-workspaces-messages.cron.command';
 import { StopFetchAllWorkspacesMessagesCronCommand } from 'src/workspace/messaging/commands/stop-fetch-all-workspaces-messages.cron.command';
 

packages/twenty-server/src/workspace/messaging/commands/gmail-full-sync.command.ts

@@ -14,7 +14,7 @@ import {
   GmailFullSyncJobData,
   GmailFullSyncJob,
 } from 'src/workspace/messaging/jobs/gmail-full-sync.job';
-import { ConnectedAccountService } from 'src/workspace/messaging/connected-account/connected-account.service';
+import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
 
 interface GmailFullSyncOptions {
   workspaceId: string;

packages/twenty-server/src/workspace/messaging/commands/gmail-partial-sync.command.ts

@@ -14,7 +14,7 @@ import {
   GmailPartialSyncJob,
   GmailPartialSyncJobData,
 } from 'src/workspace/messaging/jobs/gmail-partial-sync.job';
-import { ConnectedAccountService } from 'src/workspace/messaging/connected-account/connected-account.service';
+import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
 
 interface GmailPartialSyncOptions {
   workspaceId: string;

packages/twenty-server/src/workspace/messaging/commands/start-fetch-all-workspaces-messages.cron.command.ts

@@ -4,8 +4,8 @@ import { Command, CommandRunner } from 'nest-commander';
 
 import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { fetchAllWorkspacesMessagesCronPattern } from 'src/workspace/messaging/crons/fetch-all-workspaces-messages.cron.pattern';
-import { FetchAllWorkspacesMessagesJob } from 'src/workspace/messaging/crons/fetch-all-workspaces-messages.job';
+import { fetchAllWorkspacesMessagesCronPattern } from 'src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.cron.pattern';
+import { FetchAllWorkspacesMessagesJob } from 'src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job';
 
 @Command({
   name: 'fetch-all-workspaces-messages:cron:start',

packages/twenty-server/src/workspace/messaging/commands/stop-fetch-all-workspaces-messages.cron.command.ts

@@ -4,8 +4,8 @@ import { Command, CommandRunner } from 'nest-commander';
 
 import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
-import { fetchAllWorkspacesMessagesCronPattern } from 'src/workspace/messaging/crons/fetch-all-workspaces-messages.cron.pattern';
-import { FetchAllWorkspacesMessagesJob } from 'src/workspace/messaging/crons/fetch-all-workspaces-messages.job';
+import { fetchAllWorkspacesMessagesCronPattern } from 'src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.cron.pattern';
+import { FetchAllWorkspacesMessagesJob } from 'src/workspace/messaging/commands/crons/fetch-all-workspaces-messages.job';
 
 @Command({
   name: 'fetch-all-workspaces-messages:cron:stop',

packages/twenty-server/src/workspace/messaging/jobs/delete-message-channel-message-association.job.ts

@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
 
 import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
 
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/message-channel-message-association/message-channel-message-association.service';
+import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
 
 export type DeleteMessageChannelMessageAssociationJobData = {
   workspaceId: string;

packages/twenty-server/src/workspace/messaging/jobs/match-message-participant.job.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
 
 import { MessageQueueJob } from 'src/integrations/message-queue/interfaces/message-queue-job.interface';
 
-import { MessageParticipantService } from 'src/workspace/messaging/message-participant/message-participant.service';
+import { MessageParticipantService } from 'src/workspace/messaging/repositories/message-participant/message-participant.service';
 
 export type MatchMessageParticipantsJobData = {
   workspaceId: string;

packages/twenty-server/src/workspace/messaging/messaging.module.ts

@@ -1,25 +1,25 @@
 import { Module } from '@nestjs/common';
 
-import { ConnectedAccountModule } from 'src/workspace/messaging/connected-account/connected-account.module';
-import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/message-channel-message-association/message-channel-message-assocation.module';
-import { MessageChannelModule } from 'src/workspace/messaging/message-channel/message-channel.module';
-import { MessageThreadModule } from 'src/workspace/messaging/message-thread/message-thread.module';
+import { ConnectedAccountModule } from 'src/workspace/messaging/repositories/connected-account/connected-account.module';
+import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module';
+import { MessageChannelModule } from 'src/workspace/messaging/repositories/message-channel/message-channel.module';
+import { MessageThreadModule } from 'src/workspace/messaging/repositories/message-thread/message-thread.module';
 import { EnvironmentModule } from 'src/integrations/environment/environment.module';
 import { MessagingPersonListener } from 'src/workspace/messaging/listeners/messaging-person.listener';
-import { MessageModule } from 'src/workspace/messaging/message/message.module';
-import { GmailClientProvider } from 'src/workspace/messaging/providers/gmail/gmail-client.provider';
-import { CreateContactService } from 'src/workspace/messaging/create-contact/create-contact.service';
-import { CreateCompanyService } from 'src/workspace/messaging/create-company/create-company.service';
+import { MessageModule } from 'src/workspace/messaging/repositories/message/message.module';
+import { GmailClientProvider } from 'src/workspace/messaging/services/providers/gmail/gmail-client.provider';
+import { CreateContactService } from 'src/workspace/messaging/services/create-contact/create-contact.service';
+import { CreateCompanyService } from 'src/workspace/messaging/services/create-company/create-company.service';
 import { FetchMessagesByBatchesService } from 'src/workspace/messaging/services/fetch-messages-by-batches.service';
 import { GmailFullSyncService } from 'src/workspace/messaging/services/gmail-full-sync.service';
 import { GmailPartialSyncService } from 'src/workspace/messaging/services/gmail-partial-sync.service';
 import { GmailRefreshAccessTokenService } from 'src/workspace/messaging/services/gmail-refresh-access-token.service';
 import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
-import { MessageParticipantModule } from 'src/workspace/messaging/message-participant/message-participant.module';
+import { MessageParticipantModule } from 'src/workspace/messaging/repositories/message-participant/message-participant.module';
 import { MessagingWorkspaceMemberListener } from 'src/workspace/messaging/listeners/messaging-workspace-member.listener';
 import { MessagingMessageChannelListener } from 'src/workspace/messaging/listeners/messaging-message-channel.listener';
-import { MessageService } from 'src/workspace/messaging/message/message.service';
-
+import { MessageService } from 'src/workspace/messaging/repositories/message/message.service';
+import { WorkspaceMemberModule } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.module';
 @Module({
   imports: [
     EnvironmentModule,
@@ -30,6 +30,7 @@ import { MessageService } from 'src/workspace/messaging/message/message.service'
     MessageModule,
     MessageThreadModule,
     MessageParticipantModule,
+    WorkspaceMemberModule,
   ],
   providers: [
     GmailFullSyncService,

packages/twenty-server/src/workspace/messaging/query-hooks/message/message-find-many.pre-query.hook.ts

@@ -0,0 +1,94 @@
+import {
+  BadRequestException,
+  ForbiddenException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+
+import { groupBy } from 'lodash';
+
+import { WorkspacePreQueryHook } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
+import { FindManyResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
+import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
+import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
+import { WorkspaceMemberService } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.service';
+
+@Injectable()
+export class MessageFindManyPreQueryHook implements WorkspacePreQueryHook {
+  constructor(
+    private readonly messageChannelMessageAssociationService: MessageChannelMessageAssociationService,
+    private readonly messageChannelService: MessageChannelService,
+    private readonly connectedAccountService: ConnectedAccountService,
+    private readonly workspaceMemberService: WorkspaceMemberService,
+  ) {}
+
+  async execute(
+    userId: string,
+    workspaceId: string,
+    payload: FindManyResolverArgs,
+  ): Promise<void> {
+    if (!payload?.filter?.messageThreadId?.eq) {
+      throw new BadRequestException('messageThreadId filter is required');
+    }
+
+    const messageChannelMessageAssociations =
+      await this.messageChannelMessageAssociationService.getByMessageThreadId(
+        payload?.filter?.messageThreadId?.eq,
+        workspaceId,
+      );
+
+    if (messageChannelMessageAssociations.length === 0) {
+      throw new NotFoundException();
+    }
+
+    await this.canAccessMessageThread(
+      userId,
+      workspaceId,
+      messageChannelMessageAssociations,
+    );
+  }
+
+  private async canAccessMessageThread(
+    userId: string,
+    workspaceId: string,
+    messageChannelMessageAssociations: any[],
+  ) {
+    const messageChannels = await this.messageChannelService.getByIds(
+      messageChannelMessageAssociations.map(
+        (association) => association.messageChannelId,
+      ),
+      workspaceId,
+    );
+
+    const messageChannelsGroupByVisibility = groupBy(
+      messageChannels,
+      (channel) => channel.visibility,
+    );
+
+    if (messageChannelsGroupByVisibility.share_everything) {
+      return;
+    }
+
+    const currentWorkspaceMember =
+      await this.workspaceMemberService.getByIdOrFail(userId, workspaceId);
+
+    const messageChannelsConnectedAccounts =
+      await this.connectedAccountService.getByIds(
+        messageChannels.map((channel) => channel.connectedAccountId),
+        workspaceId,
+      );
+
+    const messageChannelsWorkspaceMemberIds =
+      messageChannelsConnectedAccounts.map(
+        (connectedAccount) => connectedAccount.accountOwnerId,
+      );
+
+    if (messageChannelsWorkspaceMemberIds.includes(currentWorkspaceMember.id)) {
+      return;
+    }
+
+    throw new ForbiddenException();
+  }
+}

packages/twenty-server/src/workspace/messaging/query-hooks/message/message-find-one.pre-query-hook.ts

@@ -0,0 +1,16 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { BadRequestException, Injectable } from '@nestjs/common';
+
+import { WorkspacePreQueryHook } from 'src/workspace/workspace-query-runner/workspace-pre-query-hook/interfaces/workspace-pre-query-hook.interface';
+import { FindOneResolverArgs } from 'src/workspace/workspace-resolver-builder/interfaces/workspace-resolvers-builder.interface';
+
+@Injectable()
+export class MessageFindOnePreQueryHook implements WorkspacePreQueryHook {
+  async execute(
+    _userId: string,
+    _workspaceId: string,
+    _payload: FindOneResolverArgs,
+  ): Promise<void> {
+    throw new BadRequestException('Method not implemented.');
+  }
+}

packages/twenty-server/src/workspace/messaging/query-hooks/messaging-query-hook.module.ts

@@ -0,0 +1,28 @@
+import { Module } from '@nestjs/common';
+
+import { MessageFindManyPreQueryHook } from 'src/workspace/messaging/query-hooks/message/message-find-many.pre-query.hook';
+import { MessageFindOnePreQueryHook } from 'src/workspace/messaging/query-hooks/message/message-find-one.pre-query-hook';
+import { ConnectedAccountModule } from 'src/workspace/messaging/repositories/connected-account/connected-account.module';
+import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module';
+import { MessageChannelModule } from 'src/workspace/messaging/repositories/message-channel/message-channel.module';
+import { WorkspaceMemberModule } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.module';
+
+@Module({
+  imports: [
+    MessageChannelMessageAssociationModule,
+    MessageChannelModule,
+    ConnectedAccountModule,
+    WorkspaceMemberModule,
+  ],
+  providers: [
+    {
+      provide: MessageFindOnePreQueryHook.name,
+      useClass: MessageFindOnePreQueryHook,
+    },
+    {
+      provide: MessageFindManyPreQueryHook.name,
+      useClass: MessageFindManyPreQueryHook,
+    },
+  ],
+})
+export class MessagingQueryHookModule {}

packages/twenty-server/src/workspace/messaging/repositories/connected-account/connected-account.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { ConnectedAccountService } from 'src/workspace/messaging/connected-account/connected-account.service';
+import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
 import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
 
 @Module({

packages/twenty-server/src/workspace/messaging/repositories/connected-account/connected-account.service.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Injectable, NotFoundException } from '@nestjs/common';
 
 import { EntityManager } from 'typeorm';
 
@@ -27,6 +27,22 @@ export class ConnectedAccountService {
     );
   }
 
+  public async getByIds(
+    connectedAccountIds: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<ConnectedAccountObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."connectedAccount" WHERE "id" = ANY($1)`,
+      [connectedAccountIds],
+      workspaceId,
+      transactionManager,
+    );
+  }
+
   public async getByIdOrFail(
     connectedAccountId: string,
     workspaceId: string,
@@ -44,7 +60,7 @@ export class ConnectedAccountService {
       );
 
     if (!connectedAccounts || connectedAccounts.length === 0) {
-      throw new Error('No connected account found');
+      throw new NotFoundException('No connected account found');
     }
 
     return connectedAccounts[0];

packages/twenty-server/src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/message-channel-message-association/message-channel-message-association.service';
+import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
 import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
 
 @Module({

packages/twenty-server/src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service.ts

@@ -154,4 +154,21 @@ export class MessageChannelMessageAssociationService {
       transactionManager,
     );
   }
+
+  public async getByMessageThreadId(
+    messageThreadId: string,
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelMessageAssociationObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannelMessageAssociation"
+    WHERE "messageThreadId" = $1`,
+      [messageThreadId],
+      workspaceId,
+      transactionManager,
+    );
+  }
 }

packages/twenty-server/src/workspace/messaging/repositories/message-channel/message-channel.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { MessageChannelService } from 'src/workspace/messaging/message-channel/message-channel.service';
+import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
 import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
 
 @Module({

packages/twenty-server/src/workspace/messaging/repositories/message-channel/message-channel.service.ts

@@ -43,4 +43,20 @@ export class MessageChannelService {
 
     return messageChannels[0];
   }
+
+  public async getByIds(
+    ids: string[],
+    workspaceId: string,
+    transactionManager?: EntityManager,
+  ): Promise<ObjectRecord<MessageChannelObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    return await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."messageChannel" WHERE "id" = ANY($1)`,
+      [ids],
+      workspaceId,
+      transactionManager,
+    );
+  }
 }

packages/twenty-server/src/workspace/messaging/repositories/message-participant/message-participant.module.ts

@@ -1,8 +1,8 @@
 import { Module } from '@nestjs/common';
 
-import { CreateCompanyModule } from 'src/workspace/messaging/create-company/create-company.module';
-import { CreateContactModule } from 'src/workspace/messaging/create-contact/create-contact.module';
-import { MessageParticipantService } from 'src/workspace/messaging/message-participant/message-participant.service';
+import { CreateCompanyModule } from 'src/workspace/messaging/services/create-company/create-company.module';
+import { CreateContactModule } from 'src/workspace/messaging/services/create-contact/create-contact.module';
+import { MessageParticipantService } from 'src/workspace/messaging/repositories/message-participant/message-participant.service';
 import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
 
 @Module({

packages/twenty-server/src/workspace/messaging/repositories/message-participant/message-participant.service.ts

@@ -7,8 +7,8 @@ import { MessageParticipantObjectMetadata } from 'src/workspace/workspace-sync-m
 import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
 import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
 import { Participant } from 'src/workspace/messaging/types/gmail-message';
-import { CreateContactService } from 'src/workspace/messaging/create-contact/create-contact.service';
-import { CreateCompanyService } from 'src/workspace/messaging/create-company/create-company.service';
+import { CreateContactService } from 'src/workspace/messaging/services/create-contact/create-contact.service';
+import { CreateCompanyService } from 'src/workspace/messaging/services/create-company/create-company.service';
 
 @Injectable()
 export class MessageParticipantService {

packages/twenty-server/src/workspace/messaging/repositories/message-thread/message-thread.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
-import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/message-channel-message-association/message-channel-message-assocation.module';
-import { MessageThreadService } from 'src/workspace/messaging/message-thread/message-thread.service';
+import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module';
+import { MessageThreadService } from 'src/workspace/messaging/repositories/message-thread/message-thread.service';
 import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
 
 @Module({

packages/twenty-server/src/workspace/messaging/repositories/message-thread/message-thread.service.ts

@@ -5,7 +5,7 @@ import { v4 } from 'uuid';
 
 import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
 import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/message-channel-message-association/message-channel-message-association.service';
+import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
 
 @Injectable()
 export class MessageThreadService {

packages/twenty-server/src/workspace/messaging/repositories/message/message.module.ts

@@ -1,9 +1,9 @@
 import { Module } from '@nestjs/common';
 
-import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/message-channel-message-association/message-channel-message-assocation.module';
-import { MessageParticipantModule } from 'src/workspace/messaging/message-participant/message-participant.module';
-import { MessageThreadModule } from 'src/workspace/messaging/message-thread/message-thread.module';
-import { MessageService } from 'src/workspace/messaging/message/message.service';
+import { MessageChannelMessageAssociationModule } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-assocation.module';
+import { MessageParticipantModule } from 'src/workspace/messaging/repositories/message-participant/message-participant.module';
+import { MessageThreadModule } from 'src/workspace/messaging/repositories/message-thread/message-thread.module';
+import { MessageService } from 'src/workspace/messaging/repositories/message/message.service';
 import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
 
 @Module({

packages/twenty-server/src/workspace/messaging/repositories/message/message.service.ts

@@ -9,11 +9,10 @@ import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object
 import { DataSourceEntity } from 'src/metadata/data-source/data-source.entity';
 import { GmailMessage } from 'src/workspace/messaging/types/gmail-message';
 import { ConnectedAccountObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/connected-account.object-metadata';
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/message-channel-message-association/message-channel-message-association.service';
-import { MessageThreadService } from 'src/workspace/messaging/message-thread/message-thread.service';
-import { MessageParticipantService } from 'src/workspace/messaging/message-participant/message-participant.service';
+import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
+import { MessageParticipantService } from 'src/workspace/messaging/repositories/message-participant/message-participant.service';
+import { MessageThreadService } from 'src/workspace/messaging/repositories/message-thread/message-thread.service';
 import { isPersonEmail } from 'src/workspace/messaging/utils/is-person-email.util';
-
 @Injectable()
 export class MessageService {
   constructor(

packages/twenty-server/src/workspace/messaging/repositories/workspace-member/workspace-member.module.ts

@@ -0,0 +1,12 @@
+import { Module } from '@nestjs/common';
+
+import { WorkspaceMemberService } from 'src/workspace/messaging/repositories/workspace-member/workspace-member.service';
+import { WorkspaceDataSourceModule } from 'src/workspace/workspace-datasource/workspace-datasource.module';
+
+// TODO: Move outside of the messaging module
+@Module({
+  imports: [WorkspaceDataSourceModule],
+  providers: [WorkspaceMemberService],
+  exports: [WorkspaceMemberService],
+})
+export class WorkspaceMemberModule {}

packages/twenty-server/src/workspace/messaging/repositories/workspace-member/workspace-member.service.ts

@@ -0,0 +1,50 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+
+import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
+import { WorkspaceMemberObjectMetadata } from 'src/workspace/workspace-sync-metadata/standard-objects/workspace-member.object-metadata';
+import { ObjectRecord } from 'src/workspace/workspace-sync-metadata/types/object-record';
+
+// TODO: Move outside of the messaging module
+@Injectable()
+export class WorkspaceMemberService {
+  constructor(
+    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
+  ) {}
+
+  public async getByIds(
+    userIds: string[],
+    workspaceId: string,
+  ): Promise<ObjectRecord<WorkspaceMemberObjectMetadata>[]> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const result = await this.workspaceDataSourceService.executeRawQuery(
+      `SELECT * FROM ${dataSourceSchema}."workspaceMember" WHERE "userId" = ANY($1)`,
+      [userIds],
+      workspaceId,
+    );
+
+    return result.rows;
+  }
+
+  public async getByIdOrFail(
+    userId: string,
+    workspaceId: string,
+  ): Promise<ObjectRecord<WorkspaceMemberObjectMetadata>> {
+    const dataSourceSchema =
+      this.workspaceDataSourceService.getSchemaName(workspaceId);
+
+    const workspaceMembers =
+      await this.workspaceDataSourceService.executeRawQuery(
+        `SELECT * FROM ${dataSourceSchema}."workspaceMember" WHERE "userId" = $1`,
+        [userId],
+        workspaceId,
+      );
+
+    if (!workspaceMembers || workspaceMembers.length === 0) {
+      throw new NotFoundException('No workspace member found');
+    }
+
+    return workspaceMembers[0];
+  }
+}

packages/twenty-server/src/workspace/messaging/services/create-company/create-company.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { CreateCompanyService } from 'src/workspace/messaging/create-company/create-company.service';
+import { CreateCompanyService } from 'src/workspace/messaging/services/create-company/create-company.service';
 
 @Module({
   imports: [],

packages/twenty-server/src/workspace/messaging/services/create-contact/create-contact.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 
-import { CreateContactService } from 'src/workspace/messaging/create-contact/create-contact.service';
+import { CreateContactService } from 'src/workspace/messaging/services/create-contact/create-contact.service';
 
 @Module({
   imports: [],

packages/twenty-server/src/workspace/messaging/services/gmail-full-sync.service.ts

@@ -1,18 +1,18 @@
 import { Inject, Injectable, Logger } from '@nestjs/common';
 
 import { FetchMessagesByBatchesService } from 'src/workspace/messaging/services/fetch-messages-by-batches.service';
-import { GmailClientProvider } from 'src/workspace/messaging/providers/gmail/gmail-client.provider';
+import { GmailClientProvider } from 'src/workspace/messaging/services/providers/gmail/gmail-client.provider';
 import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
 import {
   GmailFullSyncJobData,
   GmailFullSyncJob,
 } from 'src/workspace/messaging/jobs/gmail-full-sync.job';
-import { ConnectedAccountService } from 'src/workspace/messaging/connected-account/connected-account.service';
-import { MessageChannelService } from 'src/workspace/messaging/message-channel/message-channel.service';
-import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/message-channel-message-association/message-channel-message-association.service';
+import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
+import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
+import { MessageChannelMessageAssociationService } from 'src/workspace/messaging/repositories/message-channel-message-association/message-channel-message-association.service';
 import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { MessageService } from 'src/workspace/messaging/message/message.service';
+import { MessageService } from 'src/workspace/messaging/repositories/message/message.service';
 import { createQueriesFromMessageIds } from 'src/workspace/messaging/utils/create-queries-from-message-ids.util';
 
 @Injectable()

packages/twenty-server/src/workspace/messaging/services/gmail-partial-sync.service.ts

@@ -3,17 +3,17 @@ import { Inject, Injectable, Logger } from '@nestjs/common';
 import { gmail_v1 } from 'googleapis';
 
 import { FetchMessagesByBatchesService } from 'src/workspace/messaging/services/fetch-messages-by-batches.service';
-import { GmailClientProvider } from 'src/workspace/messaging/providers/gmail/gmail-client.provider';
+import { GmailClientProvider } from 'src/workspace/messaging/services/providers/gmail/gmail-client.provider';
 import { MessageQueueService } from 'src/integrations/message-queue/services/message-queue.service';
 import { MessageQueue } from 'src/integrations/message-queue/message-queue.constants';
 import {
   GmailFullSyncJob,
   GmailFullSyncJobData,
 } from 'src/workspace/messaging/jobs/gmail-full-sync.job';
-import { ConnectedAccountService } from 'src/workspace/messaging/connected-account/connected-account.service';
+import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
 import { WorkspaceDataSourceService } from 'src/workspace/workspace-datasource/workspace-datasource.service';
-import { MessageChannelService } from 'src/workspace/messaging/message-channel/message-channel.service';
-import { MessageService } from 'src/workspace/messaging/message/message.service';
+import { MessageChannelService } from 'src/workspace/messaging/repositories/message-channel/message-channel.service';
+import { MessageService } from 'src/workspace/messaging/repositories/message/message.service';
 import { createQueriesFromMessageIds } from 'src/workspace/messaging/utils/create-queries-from-message-ids.util';
 
 @Injectable()

packages/twenty-server/src/workspace/messaging/services/gmail-refresh-access-token.service.ts

@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import axios from 'axios';
 
 import { EnvironmentService } from 'src/integrations/environment/environment.service';
-import { ConnectedAccountService } from 'src/workspace/messaging/connected-account/connected-account.service';
+import { ConnectedAccountService } from 'src/workspace/messaging/repositories/connected-account/connected-account.service';
 
 @Injectable()
 export class GmailRefreshAccessTokenService {

packages/twenty-server/src/workspace/messaging/services/providers/messaging-providers.module.ts

@@ -1,7 +1,7 @@
 import { Module } from '@nestjs/common';
 
 import { EnvironmentModule } from 'src/integrations/environment/environment.module';
-import { GmailClientProvider } from 'src/workspace/messaging/providers/gmail/gmail-client.provider';
+import { GmailClientProvider } from 'src/workspace/messaging/services/providers/gmail/gmail-client.provider';
 
 @Module({
   imports: [EnvironmentModule],