feat: migrate ConnectedAccount infrastructure entities to metadata schema (#18784)

## Summary - Migrates 4 entities (`connectedAccount`, `messageChannel`, `calendarChannel`, `messageFolder`) from per-workspace schemas to the shared `core` metadata schema - Introduces a `IS_CONNECTED_ACCOUNT_MIGRATED` feature flag to control the migration: when enabled, reads come from core metadata and all writes are dual-written to both workspace and core - Extracts 12 enums from workspace entity files to `twenty-shared` for reuse across frontend and backend - Creates new TypeORM entities, metadata services, GraphQL resolvers/DTOs, and exception interceptors per entity - Each entity owns its own data access module (`ConnectedAccountDataAccessModule`, `MessageChannelDataAccessModule`, `CalendarChannelDataAccessModule`, `MessageFolderDataAccessModule`) — no umbrella infrastructure module - Adds a 1.20 upgrade command that backfills data from workspace schemas to core (preserving UUIDs) and enables the feature flag - Replaces direct repository access with data access service calls across ~50 files in messaging, calendar, and connected-account modules - Adds `lastSignedInAt` and `oidcTokenClaims` fields to the new `ConnectedAccountEntity` - Drops unused `lastSyncHistoryId` field from the migrated connected account entity ## Test plan - [x] Lint passes (`npx nx lint:diff-with-main twenty-server`) - [x] Typecheck passes (`npx nx typecheck twenty-server`) - [x] All unit tests pass (477 suites, 4267 tests, 0 failures) - [ ] Manual test: verify messaging sync works with feature flag disabled (existing behavior) - [ ] Manual test: run upgrade command on a workspace, verify data backfilled to core tables - [ ] Manual test: verify messaging/calendar sync works with feature flag enabled (dual-write path) - [ ] Manual test: verify GraphQL metadata resolvers return correct data when flag enabled
2026-03-20 00:34:58 +01:00
parent cd594ce8bd
commit cee4cf6452
149 changed files with 7338 additions and 1699 deletions
@@ -1,5 +1,6 @@
 import { Module } from '@nestjs/common';

+import { CalendarChannelDataAccessModule } from 'src/engine/metadata-modules/calendar-channel/data-access/calendar-channel-data-access.module';
 import { BlocklistItemDeleteCalendarEventsJob } from 'src/modules/calendar/blocklist-manager/jobs/blocklist-item-delete-calendar-events.job';
 import { BlocklistReimportCalendarEventsJob } from 'src/modules/calendar/blocklist-manager/jobs/blocklist-reimport-calendar-events.job';
 import { CalendarBlocklistListener } from 'src/modules/calendar/blocklist-manager/listeners/calendar-blocklist.listener';
@@ -7,7 +8,11 @@ import { CalendarEventCleanerModule } from 'src/modules/calendar/calendar-event-
 import { CalendarCommonModule } from 'src/modules/calendar/common/calendar-common.module';

@Module({
-  imports: [CalendarEventCleanerModule, CalendarCommonModule],
+  imports: [
+    CalendarEventCleanerModule,
+    CalendarCommonModule,
+    CalendarChannelDataAccessModule,
+  ],
  providers: [
    CalendarBlocklistListener,
    BlocklistItemDeleteCalendarEventsJob,
@@ -7,13 +7,13 @@ import { type ObjectRecordCreateEvent } from 'twenty-shared/database-events';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
 import { type BlocklistWorkspaceEntity } from 'src/modules/blocklist/standard-objects/blocklist.workspace-entity';
 import { CalendarEventCleanerService } from 'src/modules/calendar/calendar-event-cleaner/services/calendar-event-cleaner.service';
 import { type CalendarChannelEventAssociationWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity';
-import { type CalendarChannelWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';

 export type BlocklistItemDeleteCalendarEventsJobData = WorkspaceEventBatch<
  ObjectRecordCreateEvent<BlocklistWorkspaceEntity>
@@ -26,6 +26,7 @@ export type BlocklistItemDeleteCalendarEventsJobData = WorkspaceEventBatch<
 export class BlocklistItemDeleteCalendarEventsJob {
  constructor(
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
    private readonly calendarEventCleanerService: CalendarEventCleanerService,
  ) {}

@@ -71,12 +72,6 @@ export class BlocklistItemDeleteCalendarEventsJob {
        new Map<string, string[]>(),
      );

-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
      const calendarChannelEventAssociationRepository =
        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelEventAssociationWorkspaceEntity>(
          workspaceId,
@@ -91,29 +86,35 @@ export class BlocklistItemDeleteCalendarEventsJob {
          continue;
        }

-        const calendarChannels = await calendarChannelRepository.find({
-          select: {
-            id: true,
-            handle: true,
-            connectedAccount: {
-              handleAliases: true,
+        const calendarChannels =
+          await this.calendarChannelDataAccessService.find(workspaceId, {
+            select: {
+              id: true,
+              handle: true,
+              connectedAccount: {
+                handleAliases: true,
+              },
            },
-          },
-          where: {
-            connectedAccount: {
-              accountOwnerId: workspaceMemberId,
+            where: {
+              connectedAccount: {
+                accountOwnerId: workspaceMemberId,
+              },
            },
-          },
-          relations: ['connectedAccount'],
-        });
+            relations: ['connectedAccount'],
+          });

        for (const calendarChannel of calendarChannels) {
          const calendarChannelHandles = [calendarChannel.handle];

          if (calendarChannel.connectedAccount.handleAliases) {
-            calendarChannelHandles.push(
-              ...calendarChannel.connectedAccount.handleAliases.split(','),
-            );
+            const rawAliases = calendarChannel.connectedAccount
+              .handleAliases as string | string[];
+
+            const aliasList = Array.isArray(rawAliases)
+              ? rawAliases
+              : rawAliases.split(',').map((alias: string) => alias.trim());
+
+            calendarChannelHandles.push(...aliasList);
          }

          const handleConditions = handles.map((handle) => {
@@ -6,15 +6,13 @@ import { type ObjectRecordDeleteEvent } from 'twenty-shared/database-events';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import { type WorkspaceEventBatch } from 'src/engine/workspace-event-emitter/types/workspace-event-batch.type';
 import { type BlocklistWorkspaceEntity } from 'src/modules/blocklist/standard-objects/blocklist.workspace-entity';
 import { CalendarChannelSyncStatusService } from 'src/modules/calendar/common/services/calendar-channel-sync-status.service';
-import {
-  CalendarChannelSyncStage,
-  type CalendarChannelWorkspaceEntity,
-} from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
+import { CalendarChannelSyncStage } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';

 export type BlocklistReimportCalendarEventsJobData = WorkspaceEventBatch<
  ObjectRecordDeleteEvent<BlocklistWorkspaceEntity>
@@ -27,6 +25,7 @@ export type BlocklistReimportCalendarEventsJobData = WorkspaceEventBatch<
 export class BlocklistReimportCalendarEventsJob {
  constructor(
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
    private readonly calendarChannelSyncStatusService: CalendarChannelSyncStatusService,
  ) {}

@@ -37,27 +36,22 @@ export class BlocklistReimportCalendarEventsJob {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
      for (const eventPayload of data.events) {
        const workspaceMemberId =
          eventPayload.properties.before.workspaceMemberId;

-        const calendarChannels = await calendarChannelRepository.find({
-          select: ['id'],
-          where: {
-            connectedAccount: {
-              accountOwnerId: workspaceMemberId,
+        const calendarChannels =
+          await this.calendarChannelDataAccessService.find(workspaceId, {
+            select: ['id'],
+            where: {
+              connectedAccount: {
+                accountOwnerId: workspaceMemberId,
+              },
+              syncStage: Not(
+                CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
+              ),
            },
-            syncStage: Not(
-              CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
-            ),
-          },
-        });
+          });

        await this.calendarChannelSyncStatusService.resetAndMarkAsCalendarEventListFetchPending(
          calendarChannels.map((calendarChannel) => calendarChannel.id),
@@ -6,6 +6,8 @@ import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-
 import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
 import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
 import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
+import { CalendarChannelDataAccessModule } from 'src/engine/metadata-modules/calendar-channel/data-access/calendar-channel-data-access.module';
+import { ConnectedAccountDataAccessModule } from 'src/engine/metadata-modules/connected-account/data-access/connected-account-data-access.module';
 import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { BlocklistWorkspaceEntity } from 'src/modules/blocklist/standard-objects/blocklist.workspace-entity';
@@ -57,6 +59,8 @@ import { RefreshTokensManagerModule } from 'src/modules/connected-account/refres
    ConnectedAccountModule,
    CalendarCommonModule,
    MetricsModule,
+    CalendarChannelDataAccessModule,
+    ConnectedAccountDataAccessModule,
  ],
  providers: [
    CalendarAccountAuthenticationService,
@@ -5,16 +5,14 @@ import { Command, CommandRunner, Option } from 'nest-commander';
 import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import {
  CalendarEventListFetchJob,
  type CalendarEventListFetchJobData,
 } from 'src/modules/calendar/calendar-event-import-manager/jobs/calendar-event-list-fetch.job';
-import {
-  CalendarChannelSyncStage,
-  type CalendarChannelWorkspaceEntity,
-} from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
+import { CalendarChannelSyncStage } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';

 type CalendarTriggerEventListFetchCommandOptions = {
  workspaceId: string;
@@ -33,6 +31,7 @@ export class CalendarTriggerEventListFetchCommand extends CommandRunner {

  constructor(
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
    @InjectMessageQueue(MessageQueue.calendarQueue)
    private readonly messageQueueService: MessageQueueService,
  ) {
@@ -52,23 +51,17 @@ export class CalendarTriggerEventListFetchCommand extends CommandRunner {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      const whereCondition: Record<string, unknown> = {
-        isSyncEnabled: true,
-        syncStage: CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
-      };
-
-      if (calendarChannelId) {
-        whereCondition.id = calendarChannelId;
-      }
-
-      const calendarChannels =
-        await calendarChannelRepository.find(whereCondition);
+      const calendarChannels = await this.calendarChannelDataAccessService.find(
+        workspaceId,
+        {
+          where: {
+            isSyncEnabled: true,
+            syncStage:
+              CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
+            ...(calendarChannelId ? { id: calendarChannelId } : {}),
+          },
+        },
+      );

      if (calendarChannels.length === 0) {
        this.logger.warn(
@@ -83,11 +76,15 @@ export class CalendarTriggerEventListFetchCommand extends CommandRunner {
      );

      for (const calendarChannel of calendarChannels) {
-        await calendarChannelRepository.update(calendarChannel.id, {
-          syncStage:
-            CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_SCHEDULED,
-          syncStageStartedAt: new Date().toISOString(),
-        });
+        await this.calendarChannelDataAccessService.update(
+          workspaceId,
+          { id: calendarChannel.id },
+          {
+            syncStage:
+              CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_SCHEDULED,
+            syncStageStartedAt: new Date().toISOString(),
+          },
+        );

        await this.messageQueueService.add<CalendarEventListFetchJobData>(
          CalendarEventListFetchJob.name,
@@ -3,6 +3,7 @@ import { Scope } from '@nestjs/common';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import { CalendarFetchEventsService } from 'src/modules/calendar/calendar-event-import-manager/services/calendar-fetch-events.service';
@@ -11,6 +12,7 @@ import {
  CalendarChannelSyncStage,
  type CalendarChannelWorkspaceEntity,
 } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
+import { type ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { isThrottled } from 'src/modules/connected-account/utils/is-throttled';

 export type CalendarEventListFetchJobData = {
@@ -25,6 +27,7 @@ export type CalendarEventListFetchJobData = {
 export class CalendarEventListFetchJob {
  constructor(
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
    private readonly calendarChannelSyncStatusService: CalendarChannelSyncStatusService,
    private readonly calendarFetchEventsService: CalendarFetchEventsService,
  ) {}
@@ -36,19 +39,14 @@ export class CalendarEventListFetchJob {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      const calendarChannel = await calendarChannelRepository.findOne({
-        where: {
-          id: calendarChannelId,
-          isSyncEnabled: true,
-        },
-        relations: ['connectedAccount'],
-      });
+      const calendarChannel =
+        await this.calendarChannelDataAccessService.findOne(workspaceId, {
+          where: {
+            id: calendarChannelId,
+            isSyncEnabled: true,
+          },
+          relations: ['connectedAccount'],
+        });

      if (!calendarChannel) {
        return;
@@ -61,11 +59,10 @@ export class CalendarEventListFetchJob {
        return;
      }

+      const syncStageStartedAt = calendarChannel.syncStageStartedAt;
+
      if (
-        isThrottled(
-          calendarChannel.syncStageStartedAt,
-          calendarChannel.throttleFailureCount,
-        )
+        isThrottled(syncStageStartedAt, calendarChannel.throttleFailureCount)
      ) {
        await this.calendarChannelSyncStatusService.markAsCalendarEventListFetchPending(
          [calendarChannel.id],
@@ -77,8 +74,8 @@ export class CalendarEventListFetchJob {
      }

      await this.calendarFetchEventsService.fetchCalendarEvents(
-        calendarChannel,
-        calendarChannel.connectedAccount,
+        calendarChannel as unknown as CalendarChannelWorkspaceEntity,
+        calendarChannel.connectedAccount as unknown as ConnectedAccountWorkspaceEntity,
        workspaceId,
      );
    }, authContext);
@@ -3,6 +3,7 @@ import { Scope } from '@nestjs/common';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import { CalendarEventsImportService } from 'src/modules/calendar/calendar-event-import-manager/services/calendar-events-import.service';
@@ -11,6 +12,7 @@ import {
  CalendarChannelSyncStage,
  type CalendarChannelWorkspaceEntity,
 } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
+import { type ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { isThrottled } from 'src/modules/connected-account/utils/is-throttled';

 export type CalendarEventsImportJobData = {
@@ -27,6 +29,7 @@ export class CalendarEventsImportJob {
    private readonly calendarEventsImportService: CalendarEventsImportService,
    private readonly calendarChannelSyncStatusService: CalendarChannelSyncStatusService,
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
  ) {}

  @Process(CalendarEventsImportJob.name)
@@ -36,18 +39,14 @@ export class CalendarEventsImportJob {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-      const calendarChannel = await calendarChannelRepository.findOne({
-        where: {
-          id: calendarChannelId,
-          isSyncEnabled: true,
-        },
-        relations: ['connectedAccount'],
-      });
+      const calendarChannel =
+        await this.calendarChannelDataAccessService.findOne(workspaceId, {
+          where: {
+            id: calendarChannelId,
+            isSyncEnabled: true,
+          },
+          relations: ['connectedAccount'],
+        });

      if (!calendarChannel?.isSyncEnabled) {
        return;
@@ -60,11 +59,10 @@ export class CalendarEventsImportJob {
        return;
      }

+      const syncStageStartedAt = calendarChannel.syncStageStartedAt;
+
      if (
-        isThrottled(
-          calendarChannel.syncStageStartedAt,
-          calendarChannel.throttleFailureCount,
-        )
+        isThrottled(syncStageStartedAt, calendarChannel.throttleFailureCount)
      ) {
        await this.calendarChannelSyncStatusService.markAsCalendarEventsImportPending(
          [calendarChannel.id],
@@ -76,8 +74,8 @@ export class CalendarEventsImportJob {
      }

      await this.calendarEventsImportService.processCalendarEventsImport(
-        calendarChannel,
-        calendarChannel.connectedAccount,
+        calendarChannel as unknown as CalendarChannelWorkspaceEntity,
+        calendarChannel.connectedAccount as unknown as ConnectedAccountWorkspaceEntity,
        workspaceId,
      );
    }, authContext);
@@ -5,14 +5,12 @@ import { In } from 'typeorm';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import { isSyncStale } from 'src/modules/calendar/calendar-event-import-manager/utils/is-sync-stale.util';
 import { CalendarChannelSyncStatusService } from 'src/modules/calendar/common/services/calendar-channel-sync-status.service';
-import {
-  CalendarChannelSyncStage,
-  type CalendarChannelWorkspaceEntity,
-} from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
+import { CalendarChannelSyncStage } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';

 export type CalendarOngoingStaleJobData = {
  workspaceId: string;
@@ -26,6 +24,7 @@ export class CalendarOngoingStaleJob {
  private readonly logger = new Logger(CalendarOngoingStaleJob.name);
  constructor(
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
    private readonly calendarChannelSyncStatusService: CalendarChannelSyncStatusService,
  ) {}

@@ -36,25 +35,24 @@ export class CalendarOngoingStaleJob {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      const calendarChannels = await calendarChannelRepository.find({
-        where: {
-          syncStage: In([
-            CalendarChannelSyncStage.CALENDAR_EVENTS_IMPORT_ONGOING,
-            CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_ONGOING,
-            CalendarChannelSyncStage.CALENDAR_EVENTS_IMPORT_SCHEDULED,
-            CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_SCHEDULED,
-          ]),
+      const calendarChannels = await this.calendarChannelDataAccessService.find(
+        workspaceId,
+        {
+          where: {
+            syncStage: In([
+              CalendarChannelSyncStage.CALENDAR_EVENTS_IMPORT_ONGOING,
+              CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_ONGOING,
+              CalendarChannelSyncStage.CALENDAR_EVENTS_IMPORT_SCHEDULED,
+              CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_SCHEDULED,
+            ]),
+          },
        },
-      });
+      );

      for (const calendarChannel of calendarChannels) {
-        if (isSyncStale(calendarChannel.syncStageStartedAt)) {
+        const syncStageStartedAt = calendarChannel.syncStageStartedAt;
+
+        if (isSyncStale(syncStageStartedAt)) {
          await this.calendarChannelSyncStatusService.resetSyncStageStartedAt(
            [calendarChannel.id],
            workspaceId,
@@ -3,12 +3,12 @@ import { Scope } from '@nestjs/common';
 import { Process } from 'src/engine/core-modules/message-queue/decorators/process.decorator';
 import { Processor } from 'src/engine/core-modules/message-queue/decorators/processor.decorator';
 import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import {
  CalendarChannelSyncStage,
  CalendarChannelSyncStatus,
-  CalendarChannelWorkspaceEntity,
 } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';

 export type CalendarRelaunchFailedCalendarChannelJobData = {
@@ -23,6 +23,7 @@ export type CalendarRelaunchFailedCalendarChannelJobData = {
 export class CalendarRelaunchFailedCalendarChannelJob {
  constructor(
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
  ) {}

  @Process(CalendarRelaunchFailedCalendarChannelJob.name)
@@ -32,23 +33,12 @@ export class CalendarRelaunchFailedCalendarChannelJob {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-          { shouldBypassPermissionChecks: true },
-        );
-
-      const calendarChannel = await calendarChannelRepository.findOne({
-        where: {
-          id: calendarChannelId,
-        },
-        relations: {
-          connectedAccount: {
-            accountOwner: true,
+      const calendarChannel =
+        await this.calendarChannelDataAccessService.findOne(workspaceId, {
+          where: {
+            id: calendarChannelId,
          },
-        },
-      });
+        });

      if (
        !calendarChannel ||
@@ -58,10 +48,14 @@ export class CalendarRelaunchFailedCalendarChannelJob {
        return;
      }

-      await calendarChannelRepository.update(calendarChannelId, {
-        syncStage: CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
-        syncStatus: CalendarChannelSyncStatus.ACTIVE,
-      });
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: calendarChannelId },
+        {
+          syncStage: CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
+          syncStatus: CalendarChannelSyncStatus.ACTIVE,
+        },
+      );
    }, authContext);
  }
 }
@@ -1,12 +1,11 @@
 import { Injectable, Logger } from '@nestjs/common';

 import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
 import {
  type TwentyORMException,
  TwentyORMExceptionCode,
 } from 'src/engine/twenty-orm/exceptions/twenty-orm.exception';
-import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
-import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import { CALENDAR_THROTTLE_MAX_ATTEMPTS } from 'src/modules/calendar/calendar-event-import-manager/constants/calendar-throttle-max-attempts';
 import {
  type CalendarEventImportDriverException,
@@ -29,7 +28,7 @@ export class CalendarEventImportErrorHandlerService {
    CalendarEventImportErrorHandlerService.name,
  );
  constructor(
-    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
    private readonly calendarChannelSyncStatusService: CalendarChannelSyncStatusService,
    private readonly exceptionHandlerService: ExceptionHandlerService,
  ) {}
@@ -133,25 +132,14 @@ export class CalendarEventImportErrorHandlerService {
      throw calendarEventImportException;
    }

-    const authContext = buildSystemAuthContext(workspaceId);
-
-    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      await calendarChannelRepository.increment(
-        {
-          id: calendarChannel.id,
-        },
-        'throttleFailureCount',
-        1,
-        undefined,
-        ['throttleFailureCount', 'id'],
-      );
-    }, authContext);
+    await this.calendarChannelDataAccessService.increment(
+      workspaceId,
+      {
+        id: calendarChannel.id,
+      },
+      'throttleFailureCount',
+      1,
+    );

    switch (syncStep) {
      case CalendarEventImportSyncStep.CALENDAR_EVENT_LIST_FETCH:
@@ -5,6 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
 import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
 import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
 import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import {
@@ -29,6 +30,7 @@ export class CalendarFetchEventsService {
    @InjectCacheStorage(CacheStorageNamespace.ModuleCalendar)
    private readonly cacheStorage: CacheStorageService,
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
    private readonly calendarChannelSyncStatusService: CalendarChannelSyncStatusService,
    private readonly getCalendarEventsService: CalendarGetCalendarEventsService,
    private readonly calendarEventImportErrorHandlerService: CalendarEventImportErrorHandlerService,
@@ -90,14 +92,9 @@ export class CalendarFetchEventsService {
        const calendarEventIds = getCalendarEventsResponse.calendarEventIds;
        const nextSyncCursor = getCalendarEventsResponse.nextSyncCursor;

-        const calendarChannelRepository =
-          await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-            workspaceId,
-            'calendarChannel',
-          );
-
        if (!calendarEvents || calendarEvents?.length === 0) {
-          await calendarChannelRepository.update(
+          await this.calendarChannelDataAccessService.update(
+            workspaceId,
            {
              id: calendarChannel.id,
            },
@@ -112,7 +109,8 @@ export class CalendarFetchEventsService {
          );
        }

-        await calendarChannelRepository.update(
+        await this.calendarChannelDataAccessService.update(
+          workspaceId,
          {
            id: calendarChannel.id,
          },
@@ -3,6 +3,8 @@ import { TypeOrmModule } from '@nestjs/typeorm';

 import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
 import { MetricsModule } from 'src/engine/core-modules/metrics/metrics.module';
+import { CalendarChannelDataAccessModule } from 'src/engine/metadata-modules/calendar-channel/data-access/calendar-channel-data-access.module';
+import { ConnectedAccountDataAccessModule } from 'src/engine/metadata-modules/connected-account/data-access/connected-account-data-access.module';
 import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
 import { CalendarChannelSyncStatusService } from 'src/modules/calendar/common/services/calendar-channel-sync-status.service';
 import { ConnectedAccountModule } from 'src/modules/connected-account/connected-account.module';
@@ -12,6 +14,8 @@ import { ConnectedAccountModule } from 'src/modules/connected-account/connected-
    WorkspaceDataSourceModule,
    TypeOrmModule.forFeature([FeatureFlagEntity]),
    ConnectedAccountModule,
+    CalendarChannelDataAccessModule,
+    ConnectedAccountDataAccessModule,
    MetricsModule,
  ],
  providers: [CalendarChannelSyncStatusService],
@@ -2,6 +2,7 @@ import { Test, type TestingModule } from '@nestjs/testing';

 import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/constants';

+import { ConnectedAccountDataAccessService } from 'src/engine/metadata-modules/connected-account/data-access/services/connected-account-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { CalendarChannelVisibility } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
 import { type CalendarEventWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event.workspace-entity';
@@ -44,22 +45,19 @@ describe('ApplyCalendarEventsVisibilityRestrictionsService', () => {
    find: jest.fn(),
  };

-  const mockConnectedAccountRepository = {
-    find: jest.fn(),
-  };
-
  const mockWorkspaceMemberRepository = {
    findOneByOrFail: jest.fn(),
  };

+  const mockConnectedAccountDataAccessService = {
+    find: jest.fn(),
+  };
+
  const mockGlobalWorkspaceOrmManager = {
    getRepository: jest.fn().mockImplementation((workspaceId, name) => {
      if (name === 'calendarChannelEventAssociation') {
        return mockCalendarEventAssociationRepository;
      }
-      if (name === 'connectedAccount') {
-        return mockConnectedAccountRepository;
-      }
      if (name === 'workspaceMember') {
        return mockWorkspaceMemberRepository;
      }
@@ -77,6 +75,10 @@ describe('ApplyCalendarEventsVisibilityRestrictionsService', () => {
          provide: GlobalWorkspaceOrmManager,
          useValue: mockGlobalWorkspaceOrmManager,
        },
+        {
+          provide: ConnectedAccountDataAccessService,
+          useValue: mockConnectedAccountDataAccessService,
+        },
      ],
    }).compile();

@@ -121,7 +123,7 @@ describe('ApplyCalendarEventsVisibilityRestrictionsService', () => {
          item.description !== FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED,
      ),
    ).toBe(true);
-    expect(mockConnectedAccountRepository.find).not.toHaveBeenCalled();
+    expect(mockConnectedAccountDataAccessService.find).not.toHaveBeenCalled();
  });

  it('should return calendar event with obfuscated title and description if the visibility is METADATA', async () => {
@@ -143,7 +145,7 @@ describe('ApplyCalendarEventsVisibilityRestrictionsService', () => {
      id: 'workspace-member-id',
    });

-    mockConnectedAccountRepository.find.mockResolvedValue([]);
+    mockConnectedAccountDataAccessService.find.mockResolvedValue([]);

    const result = await service.applyCalendarEventsVisibilityRestrictions(
      calendarEvents,
@@ -179,7 +181,7 @@ describe('ApplyCalendarEventsVisibilityRestrictionsService', () => {
      id: 'workspace-member-account-owner-id',
    });

-    mockConnectedAccountRepository.find.mockResolvedValue([{ id: '1' }]);
+    mockConnectedAccountDataAccessService.find.mockResolvedValue([{ id: '1' }]);

    const result = await service.applyCalendarEventsVisibilityRestrictions(
      calendarEvents,
@@ -215,7 +217,7 @@ describe('ApplyCalendarEventsVisibilityRestrictionsService', () => {
      id: 'workspace-member-not-account-owner-id',
    });

-    mockConnectedAccountRepository.find.mockResolvedValue([]);
+    mockConnectedAccountDataAccessService.find.mockResolvedValue([]);

    const result = await service.applyCalendarEventsVisibilityRestrictions(
      calendarEvents,
@@ -261,7 +263,7 @@ describe('ApplyCalendarEventsVisibilityRestrictionsService', () => {
      },
    ]);

-    mockConnectedAccountRepository.find
+    mockConnectedAccountDataAccessService.find
      .mockResolvedValueOnce([]) // request for calendar event 3
      .mockResolvedValueOnce([{ id: '1' }]); // request for calendar event 2

@@ -317,7 +319,7 @@ describe('ApplyCalendarEventsVisibilityRestrictionsService', () => {
      },
    ]);

-    mockConnectedAccountRepository.find
+    mockConnectedAccountDataAccessService.find
      .mockResolvedValueOnce([]) // request for calendar event 3
      .mockResolvedValueOnce([{ id: '1' }]); // request for calendar event 2

@@ -5,18 +5,19 @@ import { FIELD_RESTRICTED_ADDITIONAL_PERMISSIONS_REQUIRED } from 'twenty-shared/
 import { isDefined } from 'twenty-shared/utils';
 import { In } from 'typeorm';

+import { ConnectedAccountDataAccessService } from 'src/engine/metadata-modules/connected-account/data-access/services/connected-account-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import { type CalendarChannelEventAssociationWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity';
 import { CalendarChannelVisibility } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
 import { type CalendarEventWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-event.workspace-entity';
-import { type ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';

@Injectable()
 export class ApplyCalendarEventsVisibilityRestrictionsService {
  constructor(
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
+    private readonly connectedAccountDataAccessService: ConnectedAccountDataAccessService,
  ) {}

  public async applyCalendarEventsVisibilityRestrictions(
@@ -42,12 +43,6 @@ export class ApplyCalendarEventsVisibilityRestrictionsService {
            relations: ['calendarChannel'],
          });

-        const connectedAccountRepository =
-          await this.globalWorkspaceOrmManager.getRepository<ConnectedAccountWorkspaceEntity>(
-            workspaceId,
-            'connectedAccount',
-          );
-
        const workspaceMemberRepository =
          await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
            workspaceId,
@@ -84,15 +79,13 @@ export class ApplyCalendarEventsVisibilityRestrictionsService {
                userId: userId,
              });

-            const connectedAccounts = await connectedAccountRepository.find({
-              select: ['id'],
-              where: {
+            const connectedAccounts =
+              await this.connectedAccountDataAccessService.find(workspaceId, {
                calendarChannels: {
                  id: In(calendarChannels.map((channel) => channel.id)),
                },
                accountOwnerId: workspaceMember.id,
-              },
-            });
+              });

            if (connectedAccounts.length > 0) {
              continue;
@@ -1,10 +1,12 @@
 import { Module } from '@nestjs/common';

+import { ConnectedAccountDataAccessModule } from 'src/engine/metadata-modules/connected-account/data-access/connected-account-data-access.module';
 import { CalendarEventFindManyPostQueryHook } from 'src/modules/calendar/common/query-hooks/calendar-event/calendar-event-find-many.post-query.hook';
 import { CalendarEventFindOnePostQueryHook } from 'src/modules/calendar/common/query-hooks/calendar-event/calendar-event-find-one.post-query.hook';
 import { ApplyCalendarEventsVisibilityRestrictionsService } from 'src/modules/calendar/common/query-hooks/calendar-event/services/apply-calendar-events-visibility-restrictions.service';

@Module({
+  imports: [ConnectedAccountDataAccessModule],
  providers: [
    ApplyCalendarEventsVisibilityRestrictionsService,
    CalendarEventFindOnePostQueryHook,
@@ -1,22 +1,23 @@
 import { Injectable } from '@nestjs/common';

-import { Any } from 'typeorm';
+import { Any, In } from 'typeorm';

 import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
 import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
 import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
 import { MetricsService } from 'src/engine/core-modules/metrics/metrics.service';
 import { MetricsKeys } from 'src/engine/core-modules/metrics/types/metrics-keys.type';
+import { CalendarChannelDataAccessService } from 'src/engine/metadata-modules/calendar-channel/data-access/services/calendar-channel-data-access.service';
+import { ConnectedAccountDataAccessService } from 'src/engine/metadata-modules/connected-account/data-access/services/connected-account-data-access.service';
 import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
 import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
 import {
  CalendarChannelSyncStage,
  CalendarChannelSyncStatus,
-  type CalendarChannelWorkspaceEntity,
 } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
 import { AccountsToReconnectService } from 'src/modules/connected-account/services/accounts-to-reconnect.service';
-import { type ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';
 import { AccountsToReconnectKeys } from 'src/modules/connected-account/types/accounts-to-reconnect-key-value.type';
+import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';

@Injectable()
 export class CalendarChannelSyncStatusService {
@@ -24,6 +25,8 @@ export class CalendarChannelSyncStatusService {
    private readonly globalWorkspaceOrmManager: GlobalWorkspaceOrmManager,
    @InjectCacheStorage(CacheStorageNamespace.ModuleCalendar)
    private readonly cacheStorage: CacheStorageService,
+    private readonly calendarChannelDataAccessService: CalendarChannelDataAccessService,
+    private readonly connectedAccountDataAccessService: ConnectedAccountDataAccessService,
    private readonly accountsToReconnectService: AccountsToReconnectService,
    private readonly metricsService: MetricsService,
  ) {}
@@ -40,16 +43,14 @@ export class CalendarChannelSyncStatusService {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      await calendarChannelRepository.update(calendarChannelIds, {
-        syncStage: CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
-        ...(!preserveSyncStageStartedAt ? { syncStageStartedAt: null } : {}),
-      });
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: In(calendarChannelIds) },
+        {
+          syncStage: CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
+          ...(!preserveSyncStageStartedAt ? { syncStageStartedAt: null } : {}),
+        },
+      );
    }, authContext);
  }

@@ -64,17 +65,15 @@ export class CalendarChannelSyncStatusService {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      await calendarChannelRepository.update(calendarChannelIds, {
-        syncStage: CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_ONGOING,
-        syncStatus: CalendarChannelSyncStatus.ONGOING,
-        syncStageStartedAt: new Date().toISOString(),
-      });
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: In(calendarChannelIds) },
+        {
+          syncStage: CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_ONGOING,
+          syncStatus: CalendarChannelSyncStatus.ONGOING,
+          syncStageStartedAt: new Date().toISOString(),
+        },
+      );
    }, authContext);
  }

@@ -95,17 +94,15 @@ export class CalendarChannelSyncStatusService {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      await calendarChannelRepository.update(calendarChannelIds, {
-        syncCursor: '',
-        syncStageStartedAt: null,
-        throttleFailureCount: 0,
-      });
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: In(calendarChannelIds) },
+        {
+          syncCursor: '',
+          syncStageStartedAt: null,
+          throttleFailureCount: 0,
+        },
+      );
    }, authContext);

    await this.markAsCalendarEventListFetchPending(
@@ -125,15 +122,13 @@ export class CalendarChannelSyncStatusService {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      await calendarChannelRepository.update(calendarChannelIds, {
-        syncStageStartedAt: null,
-      });
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: In(calendarChannelIds) },
+        {
+          syncStageStartedAt: null,
+        },
+      );
    }, authContext);
  }

@@ -149,16 +144,14 @@ export class CalendarChannelSyncStatusService {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      await calendarChannelRepository.update(calendarChannelIds, {
-        syncStage: CalendarChannelSyncStage.CALENDAR_EVENTS_IMPORT_PENDING,
-        ...(!preserveSyncStageStartedAt ? { syncStageStartedAt: null } : {}),
-      });
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: In(calendarChannelIds) },
+        {
+          syncStage: CalendarChannelSyncStage.CALENDAR_EVENTS_IMPORT_PENDING,
+          ...(!preserveSyncStageStartedAt ? { syncStageStartedAt: null } : {}),
+        },
+      );
    }, authContext);
  }

@@ -173,17 +166,15 @@ export class CalendarChannelSyncStatusService {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      await calendarChannelRepository.update(calendarChannelIds, {
-        syncStage: CalendarChannelSyncStage.CALENDAR_EVENTS_IMPORT_ONGOING,
-        syncStatus: CalendarChannelSyncStatus.ONGOING,
-        syncStageStartedAt: new Date().toISOString(),
-      });
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: In(calendarChannelIds) },
+        {
+          syncStage: CalendarChannelSyncStage.CALENDAR_EVENTS_IMPORT_ONGOING,
+          syncStatus: CalendarChannelSyncStatus.ONGOING,
+          syncStageStartedAt: new Date().toISOString(),
+        },
+      );
    }, authContext);
  }

@@ -198,19 +189,17 @@ export class CalendarChannelSyncStatusService {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      await calendarChannelRepository.update(calendarChannelIds, {
-        syncStage: CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
-        syncStatus: CalendarChannelSyncStatus.ACTIVE,
-        throttleFailureCount: 0,
-        syncStageStartedAt: null,
-        syncedAt: new Date().toISOString(),
-      });
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: In(calendarChannelIds) },
+        {
+          syncStage: CalendarChannelSyncStage.CALENDAR_EVENT_LIST_FETCH_PENDING,
+          syncStatus: CalendarChannelSyncStatus.ACTIVE,
+          throttleFailureCount: 0,
+          syncStageStartedAt: null,
+          syncedAt: new Date().toISOString(),
+        },
+      );
    }, authContext);

    await this.markAsCalendarEventListFetchPending(
@@ -241,16 +230,14 @@ export class CalendarChannelSyncStatusService {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
-
-      await calendarChannelRepository.update(calendarChannelIds, {
-        syncStatus: CalendarChannelSyncStatus.FAILED_UNKNOWN,
-        syncStage: CalendarChannelSyncStage.FAILED,
-      });
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: In(calendarChannelIds) },
+        {
+          syncStatus: CalendarChannelSyncStatus.FAILED_UNKNOWN,
+          syncStage: CalendarChannelSyncStage.FAILED,
+        },
+      );
    }, authContext);

    await this.metricsService.batchIncrementCounter({
@@ -276,33 +263,29 @@ export class CalendarChannelSyncStatusService {
    const authContext = buildSystemAuthContext(workspaceId);

    await this.globalWorkspaceOrmManager.executeInWorkspaceContext(async () => {
-      const calendarChannelRepository =
-        await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-          workspaceId,
-          'calendarChannel',
-        );
+      await this.calendarChannelDataAccessService.update(
+        workspaceId,
+        { id: In(calendarChannelIds) },
+        {
+          syncStatus: CalendarChannelSyncStatus.FAILED_INSUFFICIENT_PERMISSIONS,
+          syncStage: CalendarChannelSyncStage.FAILED,
+        },
+      );

-      await calendarChannelRepository.update(calendarChannelIds, {
-        syncStatus: CalendarChannelSyncStatus.FAILED_INSUFFICIENT_PERMISSIONS,
-        syncStage: CalendarChannelSyncStage.FAILED,
-      });
-
-      const connectedAccountRepository =
-        await this.globalWorkspaceOrmManager.getRepository<ConnectedAccountWorkspaceEntity>(
-          workspaceId,
-          'connectedAccount',
-        );
-
-      const calendarChannels = await calendarChannelRepository.find({
-        select: ['id', 'connectedAccountId'],
-        where: { id: Any(calendarChannelIds) },
-      });
+      const calendarChannels = await this.calendarChannelDataAccessService.find(
+        workspaceId,
+        {
+          select: ['id', 'connectedAccountId'],
+          where: { id: Any(calendarChannelIds) },
+        },
+      );

      const connectedAccountIds = calendarChannels.map(
        (calendarChannel) => calendarChannel.connectedAccountId,
      );

-      await connectedAccountRepository.update(
+      await this.connectedAccountDataAccessService.update(
+        workspaceId,
        { id: Any(connectedAccountIds) },
        {
          authFailedAt: new Date(),
@@ -329,26 +312,43 @@ export class CalendarChannelSyncStatusService {
      return;
    }

-    const calendarChannelRepository =
-      await this.globalWorkspaceOrmManager.getRepository<CalendarChannelWorkspaceEntity>(
-        workspaceId,
-        'calendarChannel',
-      );
-
-    const calendarChannels = await calendarChannelRepository.find({
-      where: {
-        id: Any(calendarChannelIds),
-      },
-      relations: {
-        connectedAccount: {
-          accountOwner: true,
+    const calendarChannels = await this.calendarChannelDataAccessService.find(
+      workspaceId,
+      {
+        select: ['id', 'connectedAccountId'],
+        where: {
+          id: Any(calendarChannelIds),
        },
      },
-    });
+    );
+
+    const workspaceMemberRepository =
+      await this.globalWorkspaceOrmManager.getRepository<WorkspaceMemberWorkspaceEntity>(
+        workspaceId,
+        'workspaceMember',
+        { shouldBypassPermissionChecks: true },
+      );

    for (const calendarChannel of calendarChannels) {
-      const userId = calendarChannel.connectedAccount.accountOwner.userId;
-      const connectedAccountId = calendarChannel.connectedAccount.id;
+      const connectedAccount =
+        await this.connectedAccountDataAccessService.findOne(workspaceId, {
+          where: { id: calendarChannel.connectedAccountId },
+        });
+
+      if (!connectedAccount) {
+        continue;
+      }
+
+      const workspaceMember = await workspaceMemberRepository.findOne({
+        where: { id: connectedAccount.accountOwnerId },
+      });
+
+      if (!workspaceMember) {
+        continue;
+      }
+
+      const userId = workspaceMember.userId;
+      const connectedAccountId = connectedAccount.id;

      await this.accountsToReconnectService.addAccountToReconnectByKey(
        AccountsToReconnectKeys.ACCOUNTS_TO_RECONNECT_INSUFFICIENT_PERMISSIONS,
@@ -1,6 +1,12 @@
 import { registerEnumType } from '@nestjs/graphql';

-import { FieldMetadataType } from 'twenty-shared/types';
+import {
+  CalendarChannelContactAutoCreationPolicy,
+  CalendarChannelSyncStage,
+  CalendarChannelSyncStatus,
+  CalendarChannelVisibility,
+  FieldMetadataType,
+} from 'twenty-shared/types';

 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { type FieldTypeAndNameMetadata } from 'src/engine/workspace-manager/utils/get-ts-vector-column-expression.util';
@@ -8,36 +14,12 @@ import { type EntityRelation } from 'src/engine/workspace-manager/workspace-migr
 import { type CalendarChannelEventAssociationWorkspaceEntity } from 'src/modules/calendar/common/standard-objects/calendar-channel-event-association.workspace-entity';
 import { type ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity';

-export enum CalendarChannelVisibility {
-  METADATA = 'METADATA',
-  SHARE_EVERYTHING = 'SHARE_EVERYTHING',
-}
-
-export enum CalendarChannelSyncStatus {
-  NOT_SYNCED = 'NOT_SYNCED',
-  ONGOING = 'ONGOING',
-  ACTIVE = 'ACTIVE',
-  FAILED_INSUFFICIENT_PERMISSIONS = 'FAILED_INSUFFICIENT_PERMISSIONS',
-  FAILED_UNKNOWN = 'FAILED_UNKNOWN',
-}
-
-export enum CalendarChannelSyncStage {
-  PENDING_CONFIGURATION = 'PENDING_CONFIGURATION',
-  CALENDAR_EVENT_LIST_FETCH_PENDING = 'CALENDAR_EVENT_LIST_FETCH_PENDING',
-  CALENDAR_EVENT_LIST_FETCH_SCHEDULED = 'CALENDAR_EVENT_LIST_FETCH_SCHEDULED',
-  CALENDAR_EVENT_LIST_FETCH_ONGOING = 'CALENDAR_EVENT_LIST_FETCH_ONGOING',
-  CALENDAR_EVENTS_IMPORT_PENDING = 'CALENDAR_EVENTS_IMPORT_PENDING',
-  CALENDAR_EVENTS_IMPORT_SCHEDULED = 'CALENDAR_EVENTS_IMPORT_SCHEDULED',
-  CALENDAR_EVENTS_IMPORT_ONGOING = 'CALENDAR_EVENTS_IMPORT_ONGOING',
-  FAILED = 'FAILED',
-}
-
-export enum CalendarChannelContactAutoCreationPolicy {
-  AS_PARTICIPANT_AND_ORGANIZER = 'AS_PARTICIPANT_AND_ORGANIZER',
-  AS_PARTICIPANT = 'AS_PARTICIPANT',
-  AS_ORGANIZER = 'AS_ORGANIZER',
-  NONE = 'NONE',
-}
+export {
+  CalendarChannelContactAutoCreationPolicy,
+  CalendarChannelSyncStage,
+  CalendarChannelSyncStatus,
+  CalendarChannelVisibility,
+};

 registerEnumType(CalendarChannelVisibility, {
  name: 'CalendarChannelVisibility',