From cadb0592f9499b67ada968305e8cc11c966951eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Magrin?= Date: Thu, 6 Jun 2024 09:25:38 +0200 Subject: [PATCH] fix: rebase issues --- .../0-20-record-position-backfill.command.ts | 5 ++--- ...panies-and-contacts-creation-job.module.ts | 7 +------ .../messaging-message-cleaner.module.ts | 5 +---- .../messaging-messages-import.cron.job.ts | 16 +++++++-------- .../jobs/messaging-message-list-fetch.job.ts | 14 ++++++------- .../jobs/messaging-messages-import.job.ts | 14 ++++++------- .../messaging-import-manager.module.ts | 20 ++++--------------- .../messaging-participants-manager.module.ts | 7 +------ 8 files changed, 30 insertions(+), 58 deletions(-) diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/commands/0-20-record-position-backfill.command.ts b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/commands/0-20-record-position-backfill.command.ts index b5709a8954815..ddc2f06a4dbf2 100644 --- a/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/commands/0-20-record-position-backfill.command.ts +++ b/packages/twenty-server/src/engine/api/graphql/workspace-query-runner/commands/0-20-record-position-backfill.command.ts @@ -1,11 +1,10 @@ -import { Inject } from '@nestjs/common'; - import { Command, CommandRunner, Option } from 'nest-commander'; import { RecordPositionBackfillJob, RecordPositionBackfillJobData, } from 'src/engine/api/graphql/workspace-query-runner/jobs/record-position-backfill.job'; +import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator'; import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants'; import { MessageQueueService } from 'src/engine/integrations/message-queue/services/message-queue.service'; @@ -20,7 +19,7 @@ export type RecordPositionBackfillCommandOptions = { }) export class RecordPositionBackfillCommand extends CommandRunner { constructor( - @Inject(MessageQueue.recordPositionBackfillQueue) + @InjectMessageQueue(MessageQueue.recordPositionBackfillQueue) private readonly messageQueueService: MessageQueueService, ) { super(); diff --git a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/jobs/auto-companies-and-contacts-creation-job.module.ts b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/jobs/auto-companies-and-contacts-creation-job.module.ts index f65e1965b7f0f..63f90db2ee6eb 100644 --- a/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/jobs/auto-companies-and-contacts-creation-job.module.ts +++ b/packages/twenty-server/src/modules/connected-account/auto-companies-and-contacts-creation/jobs/auto-companies-and-contacts-creation-job.module.ts @@ -5,11 +5,6 @@ import { CreateCompanyAndContactJob } from 'src/modules/connected-account/auto-c @Module({ imports: [AutoCompaniesAndContactsCreationModule], - providers: [ - { - provide: CreateCompanyAndContactJob.name, - useClass: CreateCompanyAndContactJob, - }, - ], + providers: [CreateCompanyAndContactJob], }) export class AutoCompaniesAndContactsCreationJobModule {} diff --git a/packages/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts b/packages/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts index 4562bd75bad6a..ef28ce0efb773 100644 --- a/packages/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts +++ b/packages/twenty-server/src/modules/messaging/message-cleaner/messaging-message-cleaner.module.ts @@ -16,10 +16,7 @@ import { MessagingMessageCleanerService } from 'src/modules/messaging/message-cl ], providers: [ MessagingMessageCleanerService, - { - provide: MessagingConnectedAccountDeletionCleanupJob.name, - useClass: MessagingConnectedAccountDeletionCleanupJob, - }, + MessagingConnectedAccountDeletionCleanupJob, MessagingMessageCleanerConnectedAccountListener, ], exports: [MessagingMessageCleanerService], diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts index 6780059bd4646..6f6e7c1ff7d34 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/crons/jobs/messaging-messages-import.cron.job.ts @@ -1,10 +1,8 @@ -import { Inject, Injectable, Logger } from '@nestjs/common'; +import { Logger } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository, In } from 'typeorm'; -import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface'; - import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity'; import { EnvironmentService } from 'src/engine/integrations/environment/environment.service'; @@ -14,11 +12,12 @@ import { MessagingMessagesImportJobData, MessagingMessagesImportJob, } from 'src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job'; +import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator'; +import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator'; +import { InjectMessageQueue } from 'src/engine/integrations/message-queue/decorators/message-queue.decorator'; -@Injectable() -export class MessagingMessagesImportCronJob - implements MessageQueueJob -{ +@Processor(MessageQueue.cronQueue) +export class MessagingMessagesImportCronJob { private readonly logger = new Logger(MessagingMessagesImportCronJob.name); constructor( @@ -27,10 +26,11 @@ export class MessagingMessagesImportCronJob @InjectRepository(DataSourceEntity, 'metadata') private readonly dataSourceRepository: Repository, private readonly environmentService: EnvironmentService, - @Inject(MessageQueue.messagingQueue) + @InjectMessageQueue(MessageQueue.messagingQueue) private readonly messageQueueService: MessageQueueService, ) {} + @Process() async handle(): Promise { const workspaceIds = ( await this.workspaceRepository.find({ diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts index a39672d204b8d..87b740a36a79e 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-message-list-fetch.job.ts @@ -1,7 +1,8 @@ -import { Injectable, Logger } from '@nestjs/common'; - -import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface'; +import { Logger } from '@nestjs/common'; +import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator'; +import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator'; +import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants'; import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator'; import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository'; import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity'; @@ -20,10 +21,8 @@ export type MessagingMessageListFetchJobData = { connectedAccountId: string; }; -@Injectable() -export class MessagingMessageListFetchJob - implements MessageQueueJob -{ +@Processor(MessageQueue.messagingQueue) +export class MessagingMessageListFetchJob { private readonly logger = new Logger(MessagingMessageListFetchJob.name); constructor( @@ -36,6 +35,7 @@ export class MessagingMessageListFetchJob private readonly messagingTelemetryService: MessagingTelemetryService, ) {} + @Process() async handle(data: MessagingMessageListFetchJobData): Promise { const { workspaceId, connectedAccountId } = data; diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts index 757fbbf41eabe..c69028e6d23e3 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-messages-import.job.ts @@ -1,7 +1,6 @@ -import { Injectable } from '@nestjs/common'; - -import { MessageQueueJob } from 'src/engine/integrations/message-queue/interfaces/message-queue-job.interface'; - +import { Process } from 'src/engine/integrations/message-queue/decorators/process.decorator'; +import { Processor } from 'src/engine/integrations/message-queue/decorators/processor.decorator'; +import { MessageQueue } from 'src/engine/integrations/message-queue/message-queue.constants'; import { InjectObjectMetadataRepository } from 'src/engine/object-metadata-repository/object-metadata-repository.decorator'; import { ConnectedAccountRepository } from 'src/modules/connected-account/repositories/connected-account.repository'; import { ConnectedAccountWorkspaceEntity } from 'src/modules/connected-account/standard-objects/connected-account.workspace-entity'; @@ -15,10 +14,8 @@ export type MessagingMessagesImportJobData = { workspaceId: string; }; -@Injectable() -export class MessagingMessagesImportJob - implements MessageQueueJob -{ +@Processor(MessageQueue.messagingQueue) +export class MessagingMessagesImportJob { constructor( @InjectObjectMetadataRepository(ConnectedAccountWorkspaceEntity) private readonly connectedAccountRepository: ConnectedAccountRepository, @@ -28,6 +25,7 @@ export class MessagingMessagesImportJob private readonly messagingTelemetryService: MessagingTelemetryService, ) {} + @Process() async handle(data: MessagingMessagesImportJobData): Promise { const { workspaceId } = data; diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts index b0b6362c0f35c..494edba8fb6db 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/messaging-import-manager.module.ts @@ -22,22 +22,10 @@ import { MessagingMessagesImportJob } from 'src/modules/messaging/message-import providers: [ MessagingMessageListFetchCronCommand, MessagingMessagesImportCronCommand, - { - provide: MessagingMessageListFetchJob.name, - useClass: MessagingMessageListFetchJob, - }, - { - provide: MessagingMessagesImportJob.name, - useClass: MessagingMessagesImportJob, - }, - { - provide: MessagingMessageListFetchCronJob.name, - useClass: MessagingMessageListFetchCronJob, - }, - { - provide: MessagingMessagesImportCronJob.name, - useClass: MessagingMessagesImportCronJob, - }, + MessagingMessageListFetchJob, + MessagingMessagesImportJob, + MessagingMessageListFetchCronJob, + MessagingMessagesImportCronJob, ], exports: [], }) diff --git a/packages/twenty-server/src/modules/messaging/message-participants-manager/messaging-participants-manager.module.ts b/packages/twenty-server/src/modules/messaging/message-participants-manager/messaging-participants-manager.module.ts index f7744916fb4a6..8fa7b7cbf2be8 100644 --- a/packages/twenty-server/src/modules/messaging/message-participants-manager/messaging-participants-manager.module.ts +++ b/packages/twenty-server/src/modules/messaging/message-participants-manager/messaging-participants-manager.module.ts @@ -14,11 +14,6 @@ import { MessagingCreateCompanyAndContactAfterSyncJob } from 'src/modules/messag MessagingGmailDriverModule, AutoCompaniesAndContactsCreationModule, ], - providers: [ - { - provide: MessagingCreateCompanyAndContactAfterSyncJob.name, - useClass: MessagingCreateCompanyAndContactAfterSyncJob, - }, - ], + providers: [MessagingCreateCompanyAndContactAfterSyncJob], }) export class MessaginParticipantsManagerModule {}