Skip to content

The open alternative to Salesforce, designed for AI.

Only sweep workspaces with an emailing domain for stale campaigns (#28276)

Charles Bochetd4a40c6d1766
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/constants/campaign.constant.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/constants/campaign.constant.ts
index f16ffb49aa9..5ca1f8c4b78 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/constants/campaign.constant.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/constants/campaign.constant.ts
@@ -4,6 +4,8 @@ export const SEND_CAMPAIGN_EMAIL_JOB = 'SendCampaignEmailJob';
export const REFRESH_CAMPAIGN_STATS_JOB = 'RefreshCampaignStatsJob';
export const RECONCILE_WORKSPACE_CAMPAIGN_STATS_JOB =
'ReconcileWorkspaceCampaignStatsJob';
+export const RECOVER_WORKSPACE_STALE_CAMPAIGNS_JOB =
+ 'RecoverWorkspaceStaleCampaignsJob';
export const CAMPAIGN_STATS_REFRESH_DEBOUNCE_MS = 10_000;
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/exceptions/emailing-domain.exception.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/exceptions/emailing-domain.exception.ts
index beb44b1f437..e605fc40d1c 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/exceptions/emailing-domain.exception.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/exceptions/emailing-domain.exception.ts
@@ -8,6 +8,7 @@ export enum EmailingDomainExceptionCode {
EMAILING_DOMAIN_ALREADY_REGISTERED = 'EMAILING_DOMAIN_ALREADY_REGISTERED',
EMAILING_DOMAIN_NOT_VERIFIED = 'EMAILING_DOMAIN_NOT_VERIFIED',
EMAILING_DOMAIN_UNSUBSCRIBE_NOT_READY = 'EMAILING_DOMAIN_UNSUBSCRIBE_NOT_READY',
+ EMAILING_DOMAIN_CAMPAIGN_SENDING = 'EMAILING_DOMAIN_CAMPAIGN_SENDING',
MESSAGE_SUPPRESSION_NOT_FOUND = 'MESSAGE_SUPPRESSION_NOT_FOUND',
MESSAGE_SUPPRESSION_NOT_REMOVABLE = 'MESSAGE_SUPPRESSION_NOT_REMOVABLE',
MESSAGE_CAMPAIGN_NOT_FOUND = 'MESSAGE_CAMPAIGN_NOT_FOUND',
@@ -18,6 +19,7 @@ export enum EmailingDomainExceptionCode {
MESSAGE_CAMPAIGN_REQUIRES_PAID_PLAN = 'MESSAGE_CAMPAIGN_REQUIRES_PAID_PLAN',
MESSAGE_CAMPAIGN_NOT_CANCELABLE = 'MESSAGE_CAMPAIGN_NOT_CANCELABLE',
MESSAGE_CAMPAIGN_SCHEDULE_NOT_IN_FUTURE = 'MESSAGE_CAMPAIGN_SCHEDULE_NOT_IN_FUTURE',
+ MESSAGE_CAMPAIGN_RECOVERY_FAILED = 'MESSAGE_CAMPAIGN_RECOVERY_FAILED',
}
const getEmailingDomainExceptionUserFriendlyMessage = (
@@ -30,6 +32,8 @@ const getEmailingDomainExceptionUserFriendlyMessage = (
return msg`No verified sending domain matches this from address.`;
case EmailingDomainExceptionCode.EMAILING_DOMAIN_UNSUBSCRIBE_NOT_READY:
return msg`Marketing sending is on hold until the unsubscribe domain is verified.`;
+ case EmailingDomainExceptionCode.EMAILING_DOMAIN_CAMPAIGN_SENDING:
+ return msg`A campaign is still sending. Wait for it to finish or cancel it before removing this sender.`;
case EmailingDomainExceptionCode.MESSAGE_SUPPRESSION_NOT_FOUND:
return msg`This suppressed address no longer exists.`;
case EmailingDomainExceptionCode.MESSAGE_SUPPRESSION_NOT_REMOVABLE:
@@ -50,6 +54,8 @@ const getEmailingDomainExceptionUserFriendlyMessage = (
return msg`Only a scheduled or sending campaign can be canceled.`;
case EmailingDomainExceptionCode.MESSAGE_CAMPAIGN_SCHEDULE_NOT_IN_FUTURE:
return msg`Pick a send time in the future.`;
+ case EmailingDomainExceptionCode.MESSAGE_CAMPAIGN_RECOVERY_FAILED:
+ return msg`Some campaigns could not be recovered.`;
default:
assertUnreachable(code);
}
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/filters/emailing-domain-graphql-api-exception.filter.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/filters/emailing-domain-graphql-api-exception.filter.ts
index e0fd3890d05..3f99d74d0c1 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/filters/emailing-domain-graphql-api-exception.filter.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/filters/emailing-domain-graphql-api-exception.filter.ts
@@ -9,6 +9,7 @@ import {
import {
ConflictError,
ForbiddenError,
+ InternalServerError,
NotFoundError,
UserInputError,
} from 'src/engine/core-modules/graphql/utils/graphql-errors.util';
@@ -34,7 +35,10 @@ export class EmailingDomainGraphqlApiExceptionFilter implements ExceptionFilter
case EmailingDomainExceptionCode.MESSAGE_CAMPAIGN_SCHEDULE_NOT_IN_FUTURE:
case EmailingDomainExceptionCode.EMAILING_DOMAIN_UNSUBSCRIBE_NOT_READY:
case EmailingDomainExceptionCode.EMAILING_DOMAIN_NOT_VERIFIED:
+ case EmailingDomainExceptionCode.EMAILING_DOMAIN_CAMPAIGN_SENDING:
throw new UserInputError(exception);
+ case EmailingDomainExceptionCode.MESSAGE_CAMPAIGN_RECOVERY_FAILED:
+ throw new InternalServerError(exception);
default: {
assertUnreachable(exception.code);
}
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts
index 8e3d3bbe1e9..a6ae4359174 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/services/emailing-domain.service.ts
@@ -2,10 +2,12 @@ import { Injectable, Logger } from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { msg } from '@lingui/core/macro';
+import { MessageCampaignStatus } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { Repository } from 'typeorm';
+import { In, Repository } from 'typeorm';
+import { CAMPAIGN_DELIVERY_STATE } from 'src/engine/core-modules/emailing-domain/constants/campaign-delivery-state.constant';
import {
EmailingDomainDriverException,
EmailingDomainDriverExceptionCode,
@@ -20,8 +22,12 @@ import {
import { DmarcRecordService } from 'src/engine/core-modules/emailing-domain/services/dmarc-record.service';
import { UnsubscribeHostnameService } from 'src/engine/core-modules/emailing-domain/services/unsubscribe-hostname.service';
import { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
+import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
+import { CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
+import { MessageCampaignWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-campaign.workspace-entity';
@Injectable()
export class EmailingDomainService {
@@ -37,6 +43,7 @@ export class EmailingDomainService {
private readonly emailingDomainDriverFactory: EmailingDomainDriverFactory,
private readonly unsubscribeHostnameService: UnsubscribeHostnameService,
private readonly dmarcRecordService: DmarcRecordService,
+ private readonly workspaceOrmManager: WorkspaceOrmManager,
) {}
private async withDnsRecords(
@@ -150,6 +157,8 @@ export class EmailingDomainService {
emailingDomainId,
);
+ await this.validateNoCampaignSendingOrThrow(workspace.id);
+
await this.unsubscribeHostnameService.deprovision(emailingDomain);
await this.deleteRemoteEmailingDomain(emailingDomain);
await this.emailingDomainRepository.delete(workspace.id, {
@@ -157,6 +166,41 @@ export class EmailingDomainService {
});
}
+ async validateNoCampaignSendingOrThrow(workspaceId: string): Promise<void> {
+ const isCampaignSending =
+ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const hasSendingCampaign = await this.workspaceOrmManager
+ .getRepository(MessageCampaignWorkspaceEntity, {
+ shouldBypassPermissionChecks: true,
+ })
+ .exists({ where: { status: MessageCampaignStatus.SENDING } });
+
+ if (hasSendingCampaign) {
+ return true;
+ }
+
+ return this.workspaceOrmManager
+ .getRepository(CampaignDeliveryWorkspaceEntity, {
+ shouldBypassPermissionChecks: true,
+ })
+ .exists({
+ where: {
+ state: In([
+ CAMPAIGN_DELIVERY_STATE.QUEUED,
+ CAMPAIGN_DELIVERY_STATE.SENDING,
+ ]),
+ },
+ });
+ }, buildSystemAuthContext(workspaceId));
+
+ if (isCampaignSending) {
+ throw new EmailingDomainException(
+ `Workspace ${workspaceId} has a campaign sending`,
+ EmailingDomainExceptionCode.EMAILING_DOMAIN_CAMPAIGN_SENDING,
+ );
+ }
+ }
+
async cleanupEmailingDomainsForWorkspace(
workspaceId: string,
domains: string[],
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/types/campaign-workspace-job-data.type.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/types/campaign-workspace-job-data.type.ts
new file mode 100644
index 00000000000..a04a6130048
--- /dev/null
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/types/campaign-workspace-job-data.type.ts
@@ -0,0 +1,3 @@
+export type CampaignWorkspaceJobData = {
+ workspaceId: string;
+};
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/types/reconcile-workspace-campaign-stats-job-data.type.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/types/reconcile-workspace-campaign-stats-job-data.type.ts
deleted file mode 100644
index 2ea7018e559..00000000000
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/types/reconcile-workspace-campaign-stats-job-data.type.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export type ReconcileWorkspaceCampaignStatsJobData = {
- workspaceId: string;
-};
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.service.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.service.ts
index 15d9dc644e5..95854d7dd48 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/message-channel-metadata.service.ts
@@ -475,6 +475,10 @@ export class MessageChannelMetadataService {
);
}
+ await this.emailingDomainService.validateNoCampaignSendingOrThrow(
+ workspaceId,
+ );
+
const connectedAccount =
await this.connectedAccountMetadataService.findById({
id: messageChannel.connectedAccountId,
diff --git a/packages/twenty-server/src/engine/metadata-modules/message-channel/utils/message-channel-graphql-api-exception-handler.util.ts b/packages/twenty-server/src/engine/metadata-modules/message-channel/utils/message-channel-graphql-api-exception-handler.util.ts
index a4674da001a..7401093581a 100644
--- a/packages/twenty-server/src/engine/metadata-modules/message-channel/utils/message-channel-graphql-api-exception-handler.util.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/message-channel/utils/message-channel-graphql-api-exception-handler.util.ts
@@ -57,7 +57,10 @@ export const messageChannelGraphqlApiExceptionHandler = (error: Error) => {
case EmailingDomainExceptionCode.MESSAGE_CAMPAIGN_SCHEDULE_NOT_IN_FUTURE:
case EmailingDomainExceptionCode.EMAILING_DOMAIN_UNSUBSCRIBE_NOT_READY:
case EmailingDomainExceptionCode.EMAILING_DOMAIN_NOT_VERIFIED:
+ case EmailingDomainExceptionCode.EMAILING_DOMAIN_CAMPAIGN_SENDING:
throw new UserInputError(error);
+ case EmailingDomainExceptionCode.MESSAGE_CAMPAIGN_RECOVERY_FAILED:
+ throw new InternalServerError(error);
default: {
return assertUnreachable(error.code);
}
diff --git a/packages/twenty-server/src/modules/emailing/crons/jobs/emailing-ongoing-stale.cron.job.ts b/packages/twenty-server/src/modules/emailing/crons/jobs/emailing-ongoing-stale.cron.job.ts
index 3a8fcddbb7d..0317aef085e 100644
--- a/packages/twenty-server/src/modules/emailing/crons/jobs/emailing-ongoing-stale.cron.job.ts
+++ b/packages/twenty-server/src/modules/emailing/crons/jobs/emailing-ongoing-stale.cron.job.ts
@@ -1,25 +1,16 @@
import { EMAILING_ONGOING_STALE_CRON_PATTERN } from 'src/modules/emailing/constants/emailing-ongoing-stale-cron-pattern.constant';
-import { Logger } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+import { RECOVER_WORKSPACE_STALE_CAMPAIGNS_JOB } from 'src/engine/core-modules/emailing-domain/constants/campaign.constant';
import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
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 { WorkspaceEntity } from 'src/engine/core-modules/workspace/workspace.entity';
-import { MessageCampaignRecoveryService } from 'src/modules/emailing/services/message-campaign-recovery.service';
+import { CampaignSendingWorkspaceService } from 'src/modules/emailing/services/campaign-sending-workspace.service';
@Processor(MessageQueue.cronQueue)
export class EmailingOngoingStaleCronJob {
- private readonly logger = new Logger(EmailingOngoingStaleCronJob.name);
-
constructor(
- @InjectRepository(WorkspaceEntity)
- private readonly workspaceRepository: Repository<WorkspaceEntity>,
- private readonly messageCampaignRecoveryService: MessageCampaignRecoveryService,
+ private readonly campaignSendingWorkspaceService: CampaignSendingWorkspaceService,
) {}
@Process(EmailingOngoingStaleCronJob.name)
@@ -28,21 +19,8 @@ export class EmailingOngoingStaleCronJob {
EMAILING_ONGOING_STALE_CRON_PATTERN,
)
async handle(): Promise<void> {
- const workspaces = await this.workspaceRepository.find({
- where: { activationStatus: WorkspaceActivationStatus.ACTIVE },
- select: ['id'],
- });
-
- for (const workspace of workspaces) {
- await this.messageCampaignRecoveryService
- .recoverOngoingStaleCampaigns({ workspaceId: workspace.id })
- .catch((error) => {
- this.logger.error(
- `[${EmailingOngoingStaleCronJob.name}] Cannot recover ongoing stale campaigns of workspace ${workspace.id}: ${
- error instanceof Error ? error.message : String(error)
- }`,
- );
- });
- }
+ await this.campaignSendingWorkspaceService.enqueueJobForEachSendingWorkspace(
+ RECOVER_WORKSPACE_STALE_CAMPAIGNS_JOB,
+ );
}
}
diff --git a/packages/twenty-server/src/modules/emailing/crons/jobs/reconcile-campaign-stats.cron.job.ts b/packages/twenty-server/src/modules/emailing/crons/jobs/reconcile-campaign-stats.cron.job.ts
index 671ff73f4b2..0d475d93f71 100644
--- a/packages/twenty-server/src/modules/emailing/crons/jobs/reconcile-campaign-stats.cron.job.ts
+++ b/packages/twenty-server/src/modules/emailing/crons/jobs/reconcile-campaign-stats.cron.job.ts
@@ -1,35 +1,16 @@
import { RECONCILE_CAMPAIGN_STATS_CRON_PATTERN } from 'src/modules/emailing/constants/reconcile-campaign-stats-cron-pattern.constant';
-import { CAMPAIGN_JOB_RETRY_LIMIT } from 'src/engine/core-modules/emailing-domain/constants/campaign-job-retry-limit.constant';
import { RECONCILE_WORKSPACE_CAMPAIGN_STATS_JOB } from 'src/engine/core-modules/emailing-domain/constants/campaign.constant';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chunk from 'lodash.chunk';
-import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
-import { IsNull, Repository } from 'typeorm';
import { SentryCronMonitor } from 'src/engine/core-modules/cron/sentry-cron-monitor.decorator';
-import { EmailingDomainEntity } from 'src/engine/core-modules/emailing-domain/emailing-domain.entity';
-import { type ReconcileWorkspaceCampaignStatsJobData } from 'src/engine/core-modules/emailing-domain/types/reconcile-workspace-campaign-stats-job-data.type';
-import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
-import { InjectMessageQueue } from 'src/engine/core-modules/message-queue/decorators/message-queue.decorator';
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 { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
-
-const ENQUEUE_BATCH_SIZE = 500;
+import { CampaignSendingWorkspaceService } from 'src/modules/emailing/services/campaign-sending-workspace.service';
@Processor(MessageQueue.cronQueue)
export class ReconcileCampaignStatsCronJob {
constructor(
- // Instance-wide sweep: it reads every active workspace to find which ones
- // have a sending domain, so there is no request workspace to scope by.
- // eslint-disable-next-line twenty/prefer-workspace-scoped-repository
- @InjectRepository(EmailingDomainEntity)
- private readonly emailingDomainRepository: Repository<EmailingDomainEntity>,
- @InjectMessageQueue(MessageQueue.campaignQueue)
- private readonly messageQueueService: MessageQueueService,
- private readonly exceptionHandlerService: ExceptionHandlerService,
+ private readonly campaignSendingWorkspaceService: CampaignSendingWorkspaceService,
) {}
@Process(ReconcileCampaignStatsCronJob.name)
@@ -38,32 +19,8 @@ export class ReconcileCampaignStatsCronJob {
RECONCILE_CAMPAIGN_STATS_CRON_PATTERN,
)
async handle(): Promise<void> {
- const workspaceIds = await this.findSendingWorkspaceIds();
-
- for (const workspaceIdsBatch of chunk(workspaceIds, ENQUEUE_BATCH_SIZE)) {
- await this.messageQueueService
- .bulkAdd<ReconcileWorkspaceCampaignStatsJobData>(
- RECONCILE_WORKSPACE_CAMPAIGN_STATS_JOB,
- workspaceIdsBatch.map((workspaceId) => ({ data: { workspaceId } })),
- { retryLimit: CAMPAIGN_JOB_RETRY_LIMIT },
- )
- .catch((error) => {
- this.exceptionHandlerService.captureExceptions([error]);
- });
- }
- }
-
- private async findSendingWorkspaceIds(): Promise<string[]> {
- const emailingDomains = await this.emailingDomainRepository.find({
- select: { workspaceId: true },
- where: {
- workspace: {
- deletedAt: IsNull(),
- activationStatus: WorkspaceActivationStatus.ACTIVE,
- },
- },
- });
-
- return [...new Set(emailingDomains.map(({ workspaceId }) => workspaceId))];
+ await this.campaignSendingWorkspaceService.enqueueJobForEachSendingWorkspace(
+ RECONCILE_WORKSPACE_CAMPAIGN_STATS_JOB,
+ );
}
}
diff --git a/packages/twenty-server/src/modules/emailing/emailing.module.ts b/packages/twenty-server/src/modules/emailing/emailing.module.ts
index 1496017dc47..508f832e8be 100644
--- a/packages/twenty-server/src/modules/emailing/emailing.module.ts
+++ b/packages/twenty-server/src/modules/emailing/emailing.module.ts
@@ -28,6 +28,7 @@ import { UsageLimitModule } from 'src/engine/core-modules/usage-limit/usage-limi
import { CampaignTrackingController } from 'src/modules/emailing/controllers/campaign-tracking.controller';
import { UnsubscribeController } from 'src/modules/emailing/controllers/unsubscribe.controller';
import { RecordCampaignEngagementJob } from 'src/modules/emailing/jobs/record-campaign-engagement.job';
+import { RecoverWorkspaceStaleCampaignsJob } from 'src/modules/emailing/jobs/recover-workspace-stale-campaigns.job';
import { CampaignEngagementCaptureService } from 'src/modules/emailing/services/campaign-engagement-capture.service';
import { CampaignEngagementEventService } from 'src/modules/emailing/services/campaign-engagement-event.service';
import { CampaignEngagementRecordingService } from 'src/modules/emailing/services/campaign-engagement-recording.service';
@@ -40,6 +41,7 @@ import { EmailingSendResolver } from 'src/modules/emailing/resolvers/emailing-se
import { MessageListResolver } from 'src/modules/emailing/resolvers/message-list.resolver';
import { MessageSuppressionResolver } from 'src/modules/emailing/resolvers/message-suppression.resolver';
import { UnsubscribeTopicResolver } from 'src/modules/emailing/resolvers/unsubscribe-topic.resolver';
+import { CampaignSendingWorkspaceService } from 'src/modules/emailing/services/campaign-sending-workspace.service';
import { CampaignVariableService } from 'src/modules/emailing/services/campaign-variable.service';
import { ThrottlerModule } from 'src/engine/core-modules/throttler/throttler.module';
import { EmailBillingService } from 'src/modules/emailing/services/email-billing.service';
@@ -122,8 +124,10 @@ import { SaveCampaignTool } from 'src/modules/emailing/tools/save-campaign-tool'
CampaignEngagementEventService,
RecordCampaignEngagementJob,
provideWorkspaceScopedRepository(UnsubscribeTopicEntity),
+ CampaignSendingWorkspaceService,
EmailingOngoingStaleCronCommand,
EmailingOngoingStaleCronJob,
+ RecoverWorkspaceStaleCampaignsJob,
ReconcileCampaignStatsCronCommand,
ReconcileCampaignStatsCronJob,
],
diff --git a/packages/twenty-server/src/modules/emailing/jobs/reconcile-workspace-campaign-stats.job.ts b/packages/twenty-server/src/modules/emailing/jobs/reconcile-workspace-campaign-stats.job.ts
index 5a87bd45624..bf5ded31487 100644
--- a/packages/twenty-server/src/modules/emailing/jobs/reconcile-workspace-campaign-stats.job.ts
+++ b/packages/twenty-server/src/modules/emailing/jobs/reconcile-workspace-campaign-stats.job.ts
@@ -1,5 +1,5 @@
import { RECONCILE_WORKSPACE_CAMPAIGN_STATS_JOB } from 'src/engine/core-modules/emailing-domain/constants/campaign.constant';
-import { type ReconcileWorkspaceCampaignStatsJobData } from 'src/engine/core-modules/emailing-domain/types/reconcile-workspace-campaign-stats-job-data.type';
+import { type CampaignWorkspaceJobData } from 'src/engine/core-modules/emailing-domain/types/campaign-workspace-job-data.type';
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';
@@ -12,7 +12,7 @@ export class ReconcileWorkspaceCampaignStatsJob {
) {}
@Process(RECONCILE_WORKSPACE_CAMPAIGN_STATS_JOB)
- async handle(data: ReconcileWorkspaceCampaignStatsJobData): Promise<void> {
+ async handle(data: CampaignWorkspaceJobData): Promise<void> {
await this.messageCampaignStatisticsService.reconcileWorkspaceCampaignCounts(
{ workspaceId: data.workspaceId },
);
diff --git a/packages/twenty-server/src/modules/emailing/jobs/recover-workspace-stale-campaigns.job.ts b/packages/twenty-server/src/modules/emailing/jobs/recover-workspace-stale-campaigns.job.ts
new file mode 100644
index 00000000000..f3b75d1cce2
--- /dev/null
+++ b/packages/twenty-server/src/modules/emailing/jobs/recover-workspace-stale-campaigns.job.ts
@@ -0,0 +1,20 @@
+import { RECOVER_WORKSPACE_STALE_CAMPAIGNS_JOB } from 'src/engine/core-modules/emailing-domain/constants/campaign.constant';
+import { type CampaignWorkspaceJobData } from 'src/engine/core-modules/emailing-domain/types/campaign-workspace-job-data.type';
+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 { MessageCampaignRecoveryService } from 'src/modules/emailing/services/message-campaign-recovery.service';
+
+@Processor(MessageQueue.campaignQueue)
+export class RecoverWorkspaceStaleCampaignsJob {
+ constructor(
+ private readonly messageCampaignRecoveryService: MessageCampaignRecoveryService,
+ ) {}
+
+ @Process(RECOVER_WORKSPACE_STALE_CAMPAIGNS_JOB)
+ async handle(data: CampaignWorkspaceJobData): Promise<void> {
+ await this.messageCampaignRecoveryService.recoverOngoingStaleCampaigns({
+ workspaceId: data.workspaceId,
+ });
+ }
+}
diff --git a/packages/twenty-server/src/modules/emailing/services/campaign-sending-workspace.service.ts b/packages/twenty-server/src/modules/emailing/services/campaign-sending-workspace.service.ts
new file mode 100644
index 00000000000..73e8fe60e06
--- /dev/null
+++ b/packages/twenty-server/src/modules/emailing/services/campaign-sending-workspace.service.ts
@@ -0,0 +1,58 @@
+import { CAMPAIGN_JOB_RETRY_LIMIT } from 'src/engine/core-modules/emailing-domain/constants/campaign-job-retry-limit.constant';
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import chunk from 'lodash.chunk';
+import { WorkspaceActivationStatus } from 'twenty-shared/workspace';
+import { IsNull, Repository } from 'typeorm';
+
+import { EmailingDomainEntity } from 'src/engine/core-modules/emailing-domain/emailing-domain.entity';
+import { type CampaignWorkspaceJobData } from 'src/engine/core-modules/emailing-domain/types/campaign-workspace-job-data.type';
+import { ExceptionHandlerService } from 'src/engine/core-modules/exception-handler/exception-handler.service';
+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';
+
+const ENQUEUE_BATCH_SIZE = 500;
+
+@Injectable()
+export class CampaignSendingWorkspaceService {
+ constructor(
+ // eslint-disable-next-line twenty/prefer-workspace-scoped-repository
+ @InjectRepository(EmailingDomainEntity)
+ private readonly emailingDomainRepository: Repository<EmailingDomainEntity>,
+ @InjectMessageQueue(MessageQueue.campaignQueue)
+ private readonly messageQueueService: MessageQueueService,
+ private readonly exceptionHandlerService: ExceptionHandlerService,
+ ) {}
+
+ async enqueueJobForEachSendingWorkspace(jobName: string): Promise<void> {
+ const workspaceIds = await this.findSendingWorkspaceIds();
+
+ for (const workspaceIdsBatch of chunk(workspaceIds, ENQUEUE_BATCH_SIZE)) {
+ await this.messageQueueService
+ .bulkAdd<CampaignWorkspaceJobData>(
+ jobName,
+ workspaceIdsBatch.map((workspaceId) => ({ data: { workspaceId } })),
+ { retryLimit: CAMPAIGN_JOB_RETRY_LIMIT },
+ )
+ .catch((error) => {
+ this.exceptionHandlerService.captureExceptions([error]);
+ });
+ }
+ }
+
+ private async findSendingWorkspaceIds(): Promise<string[]> {
+ const emailingDomains = await this.emailingDomainRepository.find({
+ select: { workspaceId: true },
+ where: {
+ workspace: {
+ deletedAt: IsNull(),
+ activationStatus: WorkspaceActivationStatus.ACTIVE,
+ },
+ },
+ });
+
+ return [...new Set(emailingDomains.map(({ workspaceId }) => workspaceId))];
+ }
+}
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-recovery.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-recovery.service.ts
index e87479c3252..e29a03bff31 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-recovery.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-recovery.service.ts
@@ -2,7 +2,12 @@ import { Injectable, Logger } from '@nestjs/common';
import { In, LessThan, MoreThan } from 'typeorm';
import { MessageCampaignStatus } from 'twenty-shared/types';
+import { isNonEmptyArray } from 'twenty-shared/utils';
+import {
+ EmailingDomainException,
+ EmailingDomainExceptionCode,
+} from 'src/engine/core-modules/emailing-domain/exceptions/emailing-domain.exception';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { MessageCampaignStatisticsService } from 'src/modules/emailing/services/message-campaign-statistics.service';
@@ -57,6 +62,8 @@ export class MessageCampaignRecoveryService {
});
}, buildSystemAuthContext(workspaceId));
+ const failedCampaignIds: string[] = [];
+
for (const campaign of staleCampaigns) {
await this.recoverStaleCampaign({
workspaceId,
@@ -68,8 +75,16 @@ export class MessageCampaignRecoveryService {
error instanceof Error ? error.message : String(error)
}`,
);
+ failedCampaignIds.push(campaign.id);
});
}
+
+ if (isNonEmptyArray(failedCampaignIds)) {
+ throw new EmailingDomainException(
+ `Failed to recover campaigns ${failedCampaignIds.join(', ')} of workspace ${workspaceId}`,
+ EmailingDomainExceptionCode.MESSAGE_CAMPAIGN_RECOVERY_FAILED,
+ );
+ }
}
private async hasRecentMessageProgress({