[backend] rename repository services and replace repository modules by dynamicModule (#4536)

* rename database services to repository * refactor more repositories * more refactoring * followup * remove unused imports * fix * fix * Fix calendar listener being called when flag is off * remove folders
2024-03-18 16:26:23 +01:00
parent 2aa6bcdb70
commit 8fb1ab8933
79 changed files with 1080 additions and 776 deletions
--- a/packages/twenty-server/src/modules/calendar/calendar.module.ts
+++ b/packages/twenty-server/src/modules/calendar/calendar.module.ts
@ -1,41 +1,8 @@
 import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { FeatureFlagEntity } from 'src/engine/modules/feature-flag/feature-flag.entity';
-import { EnvironmentModule } from 'src/engine/integrations/environment/environment.module';
-import { CreateCompaniesAndContactsModule } from 'src/modules/connected-account/auto-companies-and-contacts-creation/create-company-and-contact/create-company-and-contact.module';
-import { BlocklistModule } from 'src/modules/connected-account/repositories/blocklist/blocklist.module';
-import { ConnectedAccountModule } from 'src/modules/connected-account/repositories/connected-account/connected-account.module';
-import { CalendarChannelEventAssociationModule } from 'src/modules/calendar/repositories/calendar-channel-event-association/calendar-channel-event-assocation.module';
-import { CalendarChannelModule } from 'src/modules/calendar/repositories/calendar-channel/calendar-channel.module';
-import { CalendarEventAttendeeModule } from 'src/modules/calendar/repositories/calendar-event-attendee/calendar-event-attendee.module';
-import { CalendarEventModule } from 'src/modules/calendar/repositories/calendar-event/calendar-event.module';
-import { CalendarEventCleanerModule } from 'src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module';
-import { GoogleCalendarFullSyncService } from 'src/modules/calendar/services/google-calendar-full-sync.service';
-import { GoogleCalendarClientProvider } from 'src/modules/calendar/services/providers/google-calendar/google-calendar.provider';
-import { CompanyModule } from 'src/modules/messaging/repositories/company/company.module';
-import { PersonModule } from 'src/modules/person/repositories/person/person.module';
-import { WorkspaceMemberModule } from 'src/modules/workspace-member/repositories/workspace-member/workspace-member.module';
-import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';

@Module({
-  imports: [
-    EnvironmentModule,
-    WorkspaceDataSourceModule,
-    ConnectedAccountModule,
-    CalendarChannelModule,
-    CalendarChannelEventAssociationModule,
-    CalendarEventModule,
-    CalendarEventAttendeeModule,
-    CreateCompaniesAndContactsModule,
-    WorkspaceMemberModule,
-    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
-    CompanyModule,
-    PersonModule,
-    BlocklistModule,
-    CalendarEventCleanerModule,
-  ],
-  providers: [GoogleCalendarFullSyncService, GoogleCalendarClientProvider],
-  exports: [GoogleCalendarFullSyncService],
+  imports: [],
+  providers: [],
+  exports: [],
 })
 export class CalendarModule {}
--- a/packages/twenty-server/src/modules/calendar/commands/google-calendar-full-sync.command.ts
+++ b/packages/twenty-server/src/modules/calendar/commands/google-calendar-full-sync.command.ts
@ -4,11 +4,13 @@ import { Command, CommandRunner, Option } from 'nest-commander';

 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
-import { ConnectedAccountService } from 'src/modules/connected-account/repositories/connected-account/connected-account.service';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
 import {
  GoogleCalendarFullSyncJobData,
  GoogleCalendarFullSyncJob,
 } from 'src/modules/calendar/jobs/google-calendar-full-sync.job';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';

 interface GoogleCalendarFullSyncOptions {
  workspaceId: string;
@ -23,7 +25,8 @@ export class GoogleCalendarFullSyncCommand extends CommandRunner {
  constructor(
    @Inject(MessageQueue.messagingQueue)
    private readonly messageQueueService: MessageQueueService,
-    private readonly connectedAccountService: ConnectedAccountService,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
  ) {
    super();
  }
@ -48,7 +51,7 @@ export class GoogleCalendarFullSyncCommand extends CommandRunner {

  private async fetchWorkspaceCalendars(workspaceId: string): Promise<void> {
    const connectedAccounts =
-      await this.connectedAccountService.getAll(workspaceId);
+      await this.connectedAccountRepository.getAll(workspaceId);

    for (const connectedAccount of connectedAccounts) {
      await this.messageQueueService.add<GoogleCalendarFullSyncJobData>(
--- a/packages/twenty-server/src/modules/calendar/commands/workspace-calendar-sync-commands.module.ts
+++ b/packages/twenty-server/src/modules/calendar/commands/workspace-calendar-sync-commands.module.ts
@ -1,18 +1,12 @@
 import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';

-import { FeatureFlagEntity } from 'src/engine/modules/feature-flag/feature-flag.entity';
-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { DataSourceModule } from 'src/engine-metadata/data-source/data-source.module';
-import { ConnectedAccountModule } from 'src/modules/connected-account/repositories/connected-account/connected-account.module';
 import { GoogleCalendarFullSyncCommand } from 'src/modules/calendar/commands/google-calendar-full-sync.command';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';

@Module({
  imports: [
-    DataSourceModule,
-    TypeORMModule,
-    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
-    ConnectedAccountModule,
+    ObjectMetadataRepositoryModule.forFeature([ConnectedAccountObjectMetadata]),
  ],
  providers: [GoogleCalendarFullSyncCommand],
 })
--- a/packages/twenty-server/src/modules/calendar/jobs/google-calendar-full-sync.job.ts
+++ b/packages/twenty-server/src/modules/calendar/jobs/google-calendar-full-sync.job.ts
@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';

 import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface';

-import { GoogleAPIsRefreshAccessTokenService } from 'src/modules/connected-account/services/google-apis-refresh-access-token.service';
+import { GoogleAPIRefreshAccessTokenService } from 'src/modules/connected-account/services/google-api-refresh-access-token/google-api-refresh-access-token.service';
 import { GoogleCalendarFullSyncService } from 'src/modules/calendar/services/google-calendar-full-sync.service';

 export type GoogleCalendarFullSyncJobData = {
@ -18,7 +18,7 @@ export class GoogleCalendarFullSyncJob
  private readonly logger = new Logger(GoogleCalendarFullSyncJob.name);

  constructor(
-    private readonly googleAPIsRefreshAccessTokenService: GoogleAPIsRefreshAccessTokenService,
+    private readonly googleAPIsRefreshAccessTokenService: GoogleAPIRefreshAccessTokenService,
    private readonly googleCalendarFullSyncService: GoogleCalendarFullSyncService,
  ) {}

--- a/packages/twenty-server/src/modules/calendar/repositories/calendar-channel-event-association/calendar-channel-event-association.service.ts
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-channel-event-association/calendar-channel-event-association.service.ts
@ -8,7 +8,7 @@ import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calen
 import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/calendar/utils/getFlattenedValuesAndValuesStringForBatchRawQuery.util';

@Injectable()
-export class CalendarChannelEventAssociationService {
+export class CalendarChannelEventAssociationRepository {
  constructor(
    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
  ) {}
--- a/packages/twenty-server/src/modules/calendar/repositories/calendar-channel-event-association/calendar-channel-event-assocation.module.ts
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-channel-event-association/calendar-channel-event-assocation.module.ts
@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { CalendarChannelEventAssociationService } from 'src/modules/calendar/repositories/calendar-channel-event-association/calendar-channel-event-association.service';
-import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [CalendarChannelEventAssociationService],
-  exports: [CalendarChannelEventAssociationService],
-})
-export class CalendarChannelEventAssociationModule {}
--- a/packages/twenty-server/src/modules/calendar/repositories/calendar-channel/calendar-channel.service.ts
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-channel/calendar-channel.service.ts
@ -7,7 +7,7 @@ import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-obj
 import { ObjectRecord } from 'src/engine/workspace-manager/workspace-sync-metadata/types/object-record';

@Injectable()
-export class CalendarChannelService {
+export class CalendarChannelRepository {
  constructor(
    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
  ) {}
--- a/packages/twenty-server/src/modules/calendar/repositories/calendar-channel/calendar-channel.module.ts
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-channel/calendar-channel.module.ts
@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { CalendarChannelService } from 'src/modules/calendar/repositories/calendar-channel/calendar-channel.service';
-import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [CalendarChannelService],
-  exports: [CalendarChannelService],
-})
-export class CalendarChannelModule {}
--- a/packages/twenty-server/src/modules/calendar/repositories/calendar-event-attendee/calendar-event-attendee.service.ts
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-event-attendee/calendar-event-attendee.service.ts
@ -9,7 +9,7 @@ import { getFlattenedValuesAndValuesStringForBatchRawQuery } from 'src/modules/c
 import { CalendarEventAttendee } from 'src/modules/calendar/types/calendar-event';

@Injectable()
-export class CalendarEventAttendeeService {
+export class CalendarEventAttendeeRepository {
  constructor(
    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
  ) {}
--- a/packages/twenty-server/src/modules/calendar/repositories/calendar-event-attendee/calendar-event-attendee.module.ts
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-event-attendee/calendar-event-attendee.module.ts
@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { CalendarEventAttendeeService } from 'src/modules/calendar/repositories/calendar-event-attendee/calendar-event-attendee.service';
-import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [CalendarEventAttendeeService],
-  exports: [CalendarEventAttendeeService],
-})
-export class CalendarEventAttendeeModule {}
--- a/packages/twenty-server/src/modules/calendar/repositories/calendar-event/calendar-event.service.ts
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-event/calendar-event.service.ts
@ -10,7 +10,7 @@ import { CalendarEvent } from 'src/modules/calendar/types/calendar-event';
 import { CalendarEventAttendeeObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-attendee.object-metadata';

@Injectable()
-export class CalendarEventService {
+export class CalendarEventRepository {
  constructor(
    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
  ) {}
--- a/packages/twenty-server/src/modules/calendar/repositories/calendar-event/calendar-event.module.ts
+++ b/packages/twenty-server/src/modules/calendar/repositories/calendar-event/calendar-event.module.ts
@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-
-import { CalendarEventService } from 'src/modules/calendar/repositories/calendar-event/calendar-event.service';
-import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
-
-@Module({
-  imports: [WorkspaceDataSourceModule],
-  providers: [CalendarEventService],
-  exports: [CalendarEventService],
-})
-export class CalendarEventModule {}
--- a/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module.ts
+++ b/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.module.ts
@ -1,12 +1,13 @@
 import { Module } from '@nestjs/common';

-import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
-import { DataSourceModule } from 'src/engine-metadata/data-source/data-source.module';
-import { CalendarEventModule } from 'src/modules/calendar/repositories/calendar-event/calendar-event.module';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
 import { CalendarEventCleanerService } from 'src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';

@Module({
-  imports: [DataSourceModule, TypeORMModule, CalendarEventModule],
+  imports: [
+    ObjectMetadataRepositoryModule.forFeature([CalendarEventObjectMetadata]),
+  ],
  providers: [CalendarEventCleanerService],
  exports: [CalendarEventCleanerService],
 })
--- a/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service.ts
+++ b/packages/twenty-server/src/modules/calendar/services/calendar-event-cleaner/calendar-event-cleaner.service.ts
@ -1,20 +1,27 @@
 import { Injectable } from '@nestjs/common';

-import { CalendarEventService } from 'src/modules/calendar/repositories/calendar-event/calendar-event.service';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CalendarEventRepository } from 'src/modules/calendar/repositories/calendar-event.repository';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
 import { deleteUsingPagination } from 'src/modules/messaging/services/thread-cleaner/utils/delete-using-pagination.util';

@Injectable()
 export class CalendarEventCleanerService {
-  constructor(private readonly calendarEventService: CalendarEventService) {}
+  constructor(
+    @InjectObjectMetadataRepository(CalendarEventObjectMetadata)
+    private readonly calendarEventRepository: CalendarEventRepository,
+  ) {}

  public async cleanWorkspaceCalendarEvents(workspaceId: string) {
    await deleteUsingPagination(
      workspaceId,
      500,
-      this.calendarEventService.getNonAssociatedCalendarEventIdsPaginated.bind(
-        this.calendarEventService,
+      this.calendarEventRepository.getNonAssociatedCalendarEventIdsPaginated.bind(
+        this.calendarEventRepository,
+      ),
+      this.calendarEventRepository.deleteByIds.bind(
+        this.calendarEventRepository,
      ),
-      this.calendarEventService.deleteByIds.bind(this.calendarEventService),
    );
  }
 }
--- a/packages/twenty-server/src/modules/calendar/services/google-calendar-full-sync.module.ts
+++ b/packages/twenty-server/src/modules/calendar/services/google-calendar-full-sync.module.ts
@ -0,0 +1,37 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { FeatureFlagEntity } from 'src/engine/modules/feature-flag/feature-flag.entity';
+import { ObjectMetadataRepositoryModule } from 'src/engine/object-metadata-repository/object-metadata-repository.module';
+import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
+import { GoogleCalendarFullSyncService } from 'src/modules/calendar/services/google-calendar-full-sync.service';
+import { CalendarProvidersModule } from 'src/modules/calendar/services/providers/calendar-providers.module';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { CalendarEventAttendeeObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-attendee.object-metadata';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { PersonObjectMetadata } from 'src/modules/person/standard-objects/person.object-metadata';
+import { WorkspaceMemberObjectMetadata } from 'src/modules/workspace-member/standard-objects/workspace-member.object-metadata';
+
+@Module({
+  imports: [
+    CalendarProvidersModule,
+    ObjectMetadataRepositoryModule.forFeature([
+      ConnectedAccountObjectMetadata,
+      CalendarEventObjectMetadata,
+      CalendarChannelObjectMetadata,
+      CalendarChannelEventAssociationObjectMetadata,
+      CalendarEventAttendeeObjectMetadata,
+      BlocklistObjectMetadata,
+      PersonObjectMetadata,
+      WorkspaceMemberObjectMetadata,
+    ]),
+    TypeOrmModule.forFeature([FeatureFlagEntity], 'core'),
+    WorkspaceDataSourceModule,
+  ],
+  providers: [GoogleCalendarFullSyncService],
+  exports: [GoogleCalendarFullSyncService],
+})
+export class GoogleCalendarFullSyncModule {}
--- a/packages/twenty-server/src/modules/calendar/services/google-calendar-full-sync.service.ts
+++ b/packages/twenty-server/src/modules/calendar/services/google-calendar-full-sync.service.ts
@ -3,23 +3,30 @@ import { InjectRepository } from '@nestjs/typeorm';

 import { Repository } from 'typeorm';

-import { ConnectedAccountService } from 'src/modules/connected-account/repositories/connected-account/connected-account.service';
-import { BlocklistService } from 'src/modules/connected-account/repositories/blocklist/blocklist.service';
+import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository';
+import { BlocklistRepository } from 'src/modules/connected-account/repositories/blocklist.repository';
 import {
  FeatureFlagEntity,
  FeatureFlagKeys,
 } from 'src/engine/modules/feature-flag/feature-flag.entity';
 import { GoogleCalendarClientProvider } from 'src/modules/calendar/services/providers/google-calendar/google-calendar.provider';
 import { googleCalendarSearchFilterExcludeEmails } from 'src/modules/calendar/utils/google-calendar-search-filter.util';
-import { CalendarChannelEventAssociationService } from 'src/modules/calendar/repositories/calendar-channel-event-association/calendar-channel-event-association.service';
-import { CalendarChannelService } from 'src/modules/calendar/repositories/calendar-channel/calendar-channel.service';
+import { CalendarChannelEventAssociationRepository } from 'src/modules/calendar/repositories/calendar-channel-event-association.repository';
+import { CalendarChannelRepository } from 'src/modules/calendar/repositories/calendar-channel.repository';
 import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants';
 import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service';
 import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
-import { CalendarEventService } from 'src/modules/calendar/repositories/calendar-event/calendar-event.service';
+import { CalendarEventRepository } from 'src/modules/calendar/repositories/calendar-event.repository';
 import { formatGoogleCalendarEvent } from 'src/modules/calendar/utils/format-google-calendar-event.util';
 import { GoogleCalendarFullSyncJobData } from 'src/modules/calendar/jobs/google-calendar-full-sync.job';
-import { CalendarEventAttendeeService } from 'src/modules/calendar/repositories/calendar-event-attendee/calendar-event-attendee.service';
+import { CalendarEventAttendeeRepository } from 'src/modules/calendar/repositories/calendar-event-attendee.repository';
+import { ConnectedAccountObjectMetadata } from 'src/modules/connected-account/standard-objects/connected-account.object-metadata';
+import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator';
+import { CalendarEventObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event.object-metadata';
+import { CalendarChannelObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel.object-metadata';
+import { CalendarChannelEventAssociationObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-channel-event-association.object-metadata';
+import { CalendarEventAttendeeObjectMetadata } from 'src/modules/calendar/standard-objects/calendar-event-attendee.object-metadata';
+import { BlocklistObjectMetadata } from 'src/modules/connected-account/standard-objects/blocklist.object-metadata';

@Injectable()
 export class GoogleCalendarFullSyncService {
@ -29,12 +36,20 @@ export class GoogleCalendarFullSyncService {
    private readonly googleCalendarClientProvider: GoogleCalendarClientProvider,
    @Inject(MessageQueue.calendarQueue)
    private readonly messageQueueService: MessageQueueService,
-    private readonly connectedAccountService: ConnectedAccountService,
-    private readonly calendarEventService: CalendarEventService,
-    private readonly calendarChannelService: CalendarChannelService,
-    private readonly calendarChannelEventAssociationService: CalendarChannelEventAssociationService,
-    private readonly calendarEventAttendeesService: CalendarEventAttendeeService,
-    private readonly blocklistService: BlocklistService,
+    @InjectObjectMetadataRepository(ConnectedAccountObjectMetadata)
+    private readonly connectedAccountRepository: ConnectedAccountRepository,
+    @InjectObjectMetadataRepository(CalendarEventObjectMetadata)
+    private readonly calendarEventRepository: CalendarEventRepository,
+    @InjectObjectMetadataRepository(CalendarChannelObjectMetadata)
+    private readonly calendarChannelRepository: CalendarChannelRepository,
+    @InjectObjectMetadataRepository(
+      CalendarChannelEventAssociationObjectMetadata,
+    )
+    private readonly calendarChannelEventAssociationRepository: CalendarChannelEventAssociationRepository,
+    @InjectObjectMetadataRepository(CalendarEventAttendeeObjectMetadata)
+    private readonly calendarEventAttendeesRepository: CalendarEventAttendeeRepository,
+    @InjectObjectMetadataRepository(BlocklistObjectMetadata)
+    private readonly blocklistRepository: BlocklistRepository,
    @InjectRepository(FeatureFlagEntity, 'core')
    private readonly featureFlagRepository: Repository<FeatureFlagEntity>,
    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
@ -45,7 +60,7 @@ export class GoogleCalendarFullSyncService {
    connectedAccountId: string,
    pageToken?: string,
  ): Promise<void> {
-    const connectedAccount = await this.connectedAccountService.getById(
+    const connectedAccount = await this.connectedAccountRepository.getById(
      connectedAccountId,
      workspaceId,
    );
@ -64,7 +79,7 @@ export class GoogleCalendarFullSyncService {
    }

    const calendarChannel =
-      await this.calendarChannelService.getFirstByConnectedAccountIdOrFail(
+      await this.calendarChannelRepository.getFirstByConnectedAccountIdOrFail(
        connectedAccountId,
        workspaceId,
      );
@ -87,7 +102,7 @@ export class GoogleCalendarFullSyncService {
      isBlocklistEnabledFeatureFlag && isBlocklistEnabledFeatureFlag.value;

    const blocklist = isBlocklistEnabled
-      ? await this.blocklistService.getByWorkspaceMemberId(
+      ? await this.blocklistRepository.getByWorkspaceMemberId(
          workspaceMemberId,
          workspaceId,
        )
@ -130,7 +145,7 @@ export class GoogleCalendarFullSyncService {
    startTime = Date.now();

    const existingCalendarChannelEventAssociations =
-      await this.calendarChannelEventAssociationService.getByEventExternalIdsAndCalendarChannelId(
+      await this.calendarChannelEventAssociationRepository.getByEventExternalIdsAndCalendarChannelId(
        eventExternalIds,
        calendarChannelId,
        workspaceId,
@ -180,7 +195,7 @@ export class GoogleCalendarFullSyncService {
    );

    const iCalUIDCalendarEventIdMap =
-      await this.calendarEventService.getICalUIDCalendarEventIdMap(
+      await this.calendarEventRepository.getICalUIDCalendarEventIdMap(
        eventsToUpdate.map((event) => event.iCalUID),
        workspaceId,
      );
@ -192,31 +207,31 @@ export class GoogleCalendarFullSyncService {
        );

      dataSourceMetadata?.transaction(async (transactionManager) => {
-        this.calendarEventService.saveCalendarEvents(
+        this.calendarEventRepository.saveCalendarEvents(
          eventsToSave,
          workspaceId,
          transactionManager,
        );

-        this.calendarEventService.updateCalendarEvents(
+        this.calendarEventRepository.updateCalendarEvents(
          eventsToUpdate,
          workspaceId,
          transactionManager,
        );

-        this.calendarChannelEventAssociationService.saveCalendarChannelEventAssociations(
+        this.calendarChannelEventAssociationRepository.saveCalendarChannelEventAssociations(
          calendarChannelEventAssociationsToSave,
          workspaceId,
          transactionManager,
        );

-        this.calendarEventAttendeesService.saveCalendarEventAttendees(
+        this.calendarEventAttendeesRepository.saveCalendarEventAttendees(
          attendeesToSave,
          workspaceId,
          transactionManager,
        );

-        this.calendarEventAttendeesService.updateCalendarEventAttendees(
+        this.calendarEventAttendeesRepository.updateCalendarEventAttendees(
          attendeesToUpdate,
          iCalUIDCalendarEventIdMap,
          workspaceId,