Skip to content

The open alternative to Salesforce, designed for AI.

Move campaign deliveries and suppressions into the workspace schema (#26491)

neo7739799ea67a038
diff --git a/packages/twenty-server/src/database/commands/list-and-delete-orphaned-workspace-entities.command.ts b/packages/twenty-server/src/database/commands/list-and-delete-orphaned-workspace-entities.command.ts
index a2c60da4d98..c7e3fa6a439 100644
--- a/packages/twenty-server/src/database/commands/list-and-delete-orphaned-workspace-entities.command.ts
+++ b/packages/twenty-server/src/database/commands/list-and-delete-orphaned-workspace-entities.command.ts
@@ -15,7 +15,6 @@ import { BillingCustomerEntity } from 'src/engine/core-modules/billing/entities/
import { BillingEntitlementEntity } from 'src/engine/core-modules/billing/entities/billing-entitlement.entity';
import { BillingSubscriptionEntity } from 'src/engine/core-modules/billing/entities/billing-subscription.entity';
import { EmailingDomainEntity } from 'src/engine/core-modules/emailing-domain/emailing-domain.entity';
-import { MessageSuppressionEntity } from 'src/engine/core-modules/emailing-domain/message-suppression.entity';
import { FeatureFlagEntity } from 'src/engine/core-modules/feature-flag/feature-flag.entity';
import { FileEntity } from 'src/engine/core-modules/file/entities/file.entity';
import { PublicDomainEntity } from 'src/engine/core-modules/public-domain/public-domain.entity';
@@ -103,7 +102,6 @@ const WORKSPACE_RELATED_ENTITIES: EntityTarget<ObjectLiteral>[] = [
BillingSubscriptionEntity,
DataSourceEntity,
EmailingDomainEntity,
- MessageSuppressionEntity,
FeatureFlagEntity,
FileEntity,
PublicDomainEntity,
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts
index 2f56b3e32ac..b4a6e66a63f 100644
--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-upgrade-version-command.module.ts
@@ -5,6 +5,8 @@ import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/w
import { AgentHistoryModule } from 'src/engine/metadata-modules/ai/ai-history/ai-history.module';
import { AttributeChatMessageSendersCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790171503075-attribute-chat-message-senders.command';
import { DeleteSystemReadableObjectNavigationCommandMenuItemsCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790180964414-delete-system-readable-object-navigation-command-menu-items.command';
+import { MoveCampaignSendingTablesToWorkspaceCommand } from 'src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790203235337-move-campaign-sending-tables-to-workspace.command';
+import { ApplicationModule } from 'src/engine/core-modules/application/application.module';
import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';
import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace-migration/workspace-migration.module';
@@ -12,6 +14,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
imports: [
AgentHistoryMigrationModule,
AgentHistoryModule,
+ ApplicationModule,
WorkspaceCacheModule,
WorkspaceIteratorModule,
WorkspaceMigrationModule,
@@ -19,6 +22,7 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspace
providers: [
AttributeChatMessageSendersCommand,
DeleteSystemReadableObjectNavigationCommandMenuItemsCommand,
+ MoveCampaignSendingTablesToWorkspaceCommand,
],
})
export class V2_43_UpgradeVersionCommandModule {}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790203235337-move-campaign-sending-tables-to-workspace.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790203235337-move-campaign-sending-tables-to-workspace.command.ts
new file mode 100644
index 00000000000..2981622b1b3
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/2-43-workspace-command-1790203235337-move-campaign-sending-tables-to-workspace.command.ts
@@ -0,0 +1,148 @@
+import { Command } from 'nest-commander';
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';
+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';
+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';
+import { getStandardFlatEntitiesToCreateOrThrow } from 'src/database/commands/upgrade-version-command/2-10/utils/get-standard-flat-entities-to-create-or-throw.util';
+import { collectCampaignSendingStandardUniversalIdentifiers } from 'src/database/commands/upgrade-version-command/2-43/utils/collect-campaign-sending-standard-universal-identifiers.util';
+import { ApplicationService } from 'src/engine/core-modules/application/application.service';
+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';
+import { type FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';
+import { computeTwentyStandardApplicationAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/utils/twenty-standard-application-all-flat-entity-maps.constant';
+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';
+
+@RegisteredWorkspaceCommand('2.43.0', 1790203235337)
+@Command({
+ name: 'upgrade:2-43:move-campaign-sending-tables-to-workspace',
+ description:
+ 'Create the campaignDelivery and messageSuppression workspace objects in existing workspaces',
+})
+export class MoveCampaignSendingTablesToWorkspaceCommand extends ProvisionedWorkspaceCommandRunner {
+ constructor(
+ protected readonly workspaceIteratorService: WorkspaceIteratorService,
+ private readonly applicationService: ApplicationService,
+ private readonly workspaceCacheService: WorkspaceCacheService,
+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,
+ ) {
+ super(workspaceIteratorService);
+ }
+
+ override async runOnWorkspace({
+ workspaceId,
+ options,
+ }: RunOnWorkspaceArgs): Promise<void> {
+ const isDryRun = options.dryRun ?? false;
+ const { flatObjectMetadataMaps, flatFieldMetadataMaps, flatIndexMaps } =
+ await this.workspaceCacheService.getOrRecompute(workspaceId, [
+ 'flatObjectMetadataMaps',
+ 'flatFieldMetadataMaps',
+ 'flatIndexMaps',
+ ]);
+
+ if (
+ !isDefined(
+ flatObjectMetadataMaps.byUniversalIdentifier[
+ STANDARD_OBJECTS.person.universalIdentifier
+ ],
+ )
+ ) {
+ this.logger.warn(
+ `person object not found for workspace ${workspaceId}, skipping campaign sending objects creation`,
+ );
+
+ return;
+ }
+
+ const { twentyStandardFlatApplication } =
+ await this.applicationService.findWorkspaceTwentyStandardAndCustomApplicationOrThrow(
+ { workspaceId },
+ );
+ const { allFlatEntityMaps: standardAllFlatEntityMaps } =
+ computeTwentyStandardApplicationAllFlatEntityMaps({
+ now: new Date().toISOString(),
+ workspaceId,
+ twentyStandardApplicationId: twentyStandardFlatApplication.id,
+ });
+ const universalIdentifiers =
+ collectCampaignSendingStandardUniversalIdentifiers({
+ standardAllFlatEntityMaps,
+ });
+ const allFlatEntityOperationByMetadataName = {
+ objectMetadata: {
+ flatEntityToCreate:
+ getStandardFlatEntitiesToCreateOrThrow<FlatObjectMetadata>({
+ standardFlatEntityMaps:
+ standardAllFlatEntityMaps.flatObjectMetadataMaps,
+ existingFlatEntityMaps: flatObjectMetadataMaps,
+ universalIdentifiers: universalIdentifiers.objectMetadata,
+ }),
+ flatEntityToDelete: [],
+ flatEntityToUpdate: [],
+ },
+ fieldMetadata: {
+ flatEntityToCreate:
+ getStandardFlatEntitiesToCreateOrThrow<FlatFieldMetadata>({
+ standardFlatEntityMaps:
+ standardAllFlatEntityMaps.flatFieldMetadataMaps,
+ existingFlatEntityMaps: flatFieldMetadataMaps,
+ universalIdentifiers: universalIdentifiers.fieldMetadata,
+ }),
+ flatEntityToDelete: [],
+ flatEntityToUpdate: [],
+ },
+ index: {
+ flatEntityToCreate:
+ getStandardFlatEntitiesToCreateOrThrow<FlatIndexMetadata>({
+ standardFlatEntityMaps: standardAllFlatEntityMaps.flatIndexMaps,
+ existingFlatEntityMaps: flatIndexMaps,
+ universalIdentifiers: universalIdentifiers.index,
+ }),
+ flatEntityToDelete: [],
+ flatEntityToUpdate: [],
+ },
+ };
+ const creationSummary = `${allFlatEntityOperationByMetadataName.objectMetadata.flatEntityToCreate.length} object(s), ${allFlatEntityOperationByMetadataName.fieldMetadata.flatEntityToCreate.length} field(s) and ${allFlatEntityOperationByMetadataName.index.flatEntityToCreate.length} index(es)`;
+ const totalOperationCount = Object.values(
+ allFlatEntityOperationByMetadataName,
+ ).reduce(
+ (total, operations) => total + operations.flatEntityToCreate.length,
+ 0,
+ );
+
+ if (totalOperationCount === 0) {
+ return;
+ }
+
+ if (isDryRun) {
+ this.logger.log(
+ `[DRY RUN] Would create ${creationSummary} for workspace ${workspaceId}`,
+ );
+
+ return;
+ }
+
+ const result =
+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(
+ {
+ allFlatEntityOperationByMetadataName,
+ workspaceId,
+ isSystemBuild: true,
+ applicationUniversalIdentifier:
+ twentyStandardFlatApplication.universalIdentifier,
+ },
+ );
+
+ if (result.status === 'fail') {
+ throw new Error(
+ `Failed to create the campaign sending objects for workspace ${workspaceId}: ${JSON.stringify(result, null, 2)}`,
+ );
+ }
+
+ this.logger.log(`Created ${creationSummary} for workspace ${workspaceId}`);
+ }
+}
diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/collect-campaign-sending-standard-universal-identifiers.util.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/collect-campaign-sending-standard-universal-identifiers.util.ts
new file mode 100644
index 00000000000..94875489e64
--- /dev/null
+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-43/utils/collect-campaign-sending-standard-universal-identifiers.util.ts
@@ -0,0 +1,44 @@
+import { STANDARD_OBJECTS } from 'twenty-shared/metadata';
+import { isDefined } from 'twenty-shared/utils';
+
+import { type TwentyStandardAllFlatEntityMaps } from 'src/engine/workspace-manager/twenty-standard-application/types/twenty-standard-all-flat-entity-maps.type';
+
+const CAMPAIGN_SENDING_OBJECT_UNIVERSAL_IDENTIFIERS: string[] = [
+ STANDARD_OBJECTS.campaignDelivery.universalIdentifier,
+ STANDARD_OBJECTS.messageSuppression.universalIdentifier,
+];
+
+export const collectCampaignSendingStandardUniversalIdentifiers = ({
+ standardAllFlatEntityMaps,
+}: {
+ standardAllFlatEntityMaps: TwentyStandardAllFlatEntityMaps;
+}): { objectMetadata: string[]; fieldMetadata: string[]; index: string[] } => {
+ const belongsToCampaignSendingObject = ({
+ objectMetadataUniversalIdentifier,
+ }: {
+ objectMetadataUniversalIdentifier: string;
+ }) =>
+ CAMPAIGN_SENDING_OBJECT_UNIVERSAL_IDENTIFIERS.includes(
+ objectMetadataUniversalIdentifier,
+ );
+
+ const fieldMetadata = Object.values(
+ standardAllFlatEntityMaps.flatFieldMetadataMaps.byUniversalIdentifier,
+ )
+ .filter(isDefined)
+ .filter(belongsToCampaignSendingObject)
+ .map((flatFieldMetadata) => flatFieldMetadata.universalIdentifier);
+
+ const index = Object.values(
+ standardAllFlatEntityMaps.flatIndexMaps.byUniversalIdentifier,
+ )
+ .filter(isDefined)
+ .filter(belongsToCampaignSendingObject)
+ .map((flatIndexMetadata) => flatIndexMetadata.universalIdentifier);
+
+ return {
+ objectMetadata: CAMPAIGN_SENDING_OBJECT_UNIVERSAL_IDENTIFIERS,
+ fieldMetadata,
+ index,
+ };
+};
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/campaign-delivery.entity.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/campaign-delivery.entity.ts
deleted file mode 100644
index dd06e34c0cb..00000000000
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/campaign-delivery.entity.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import {
- Check,
- Column,
- CreateDateColumn,
- Entity,
- Index,
- PrimaryColumn,
- UpdateDateColumn,
-} from 'typeorm';
-
-import { type CampaignFailureReason } from 'src/engine/core-modules/emailing-domain/types/campaign-failure-reason.type';
-import { type CampaignDeliveryState } from 'src/engine/core-modules/emailing-domain/types/campaign-delivery-state.type';
-import { type CampaignSkipReason } from 'src/engine/core-modules/emailing-domain/types/campaign-skip-reason.type';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
-
-@Entity({ name: 'campaignDelivery', schema: 'core' })
-@Check(
- 'CHK_CAMPAIGN_DELIVERY_CLAIM_HAS_LEASE',
- `"state" <> 'SENDING' OR "claimExpiresAt" IS NOT NULL`,
-)
-@Check(
- 'CHK_CAMPAIGN_DELIVERY_CLAIM_IS_WHOLE',
- `("claimToken" IS NULL) = ("claimExpiresAt" IS NULL)`,
-)
-@Index('IDX_CAMPAIGN_DELIVERY_UNIQUE', ['campaignId', 'personId'], {
- unique: true,
-})
-@Index('IDX_CAMPAIGN_DELIVERY_UNFINISHED', ['campaignId'], {
- where: `"state" IN ('QUEUED', 'SENDING')`,
-})
-@Index('IDX_CAMPAIGN_DELIVERY_EXPIRED_CLAIM', ['claimExpiresAt'], {
- where: `"state" = 'SENDING'`,
-})
-@Index('IDX_CAMPAIGN_DELIVERY_COUNTS', ['workspaceId', 'campaignId', 'state'])
-@Index('IDX_CAMPAIGN_DELIVERY_CLAIM_TOKEN', ['workspaceId', 'claimToken'], {
- where: '"claimToken" IS NOT NULL',
-})
-@Index(
- 'IDX_CAMPAIGN_DELIVERY_PROVIDER_MESSAGE_ID',
- ['workspaceId', 'providerMessageId'],
- { unique: true, where: '"providerMessageId" IS NOT NULL' },
-)
-export class CampaignDeliveryEntity extends WorkspaceRelatedEntity {
- @PrimaryColumn({ type: 'uuid' })
- id: string;
-
- @CreateDateColumn({ type: 'timestamptz' })
- createdAt: Date;
-
- @UpdateDateColumn({ type: 'timestamptz' })
- updatedAt: Date;
-
- @Column({ type: 'uuid', nullable: false })
- campaignId: string;
-
- @Column({ type: 'uuid', nullable: false })
- personId: string;
-
- @Column({ type: 'varchar', nullable: false })
- recipientEmail: string;
-
- @Column({ type: 'varchar', nullable: false, default: 'QUEUED' })
- state: CampaignDeliveryState;
-
- @Column({ type: 'varchar', nullable: true })
- skipReason: CampaignSkipReason | null;
-
- @Column({ type: 'varchar', nullable: true })
- failureReason: CampaignFailureReason | null;
-
- @Column({ type: 'uuid', nullable: true })
- claimToken: string | null;
-
- @Column({ type: 'timestamptz', nullable: true })
- claimExpiresAt: Date | null;
-
- @Column({ type: 'varchar', nullable: true })
- providerMessageId: string | null;
-
- @Column({ type: 'timestamptz', nullable: true })
- sentAt: Date | null;
-
- @Column({ type: 'timestamptz', nullable: true })
- deliveredAt: Date | null;
-
- @Column({ type: 'timestamptz', nullable: true })
- bouncedAt: Date | null;
-
- @Column({ type: 'timestamptz', nullable: true })
- complainedAt: Date | null;
-
- @Column({ type: 'timestamptz', nullable: true })
- rejectedAt: Date | null;
-
- @Column({ type: 'timestamptz', nullable: true })
- renderingFailedAt: Date | null;
-}
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/message-suppression.entity.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/message-suppression.entity.ts
deleted file mode 100644
index 910d13c22a3..00000000000
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/message-suppression.entity.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import {
- Column,
- CreateDateColumn,
- Entity,
- Index,
- PrimaryGeneratedColumn,
- UpdateDateColumn,
-} from 'typeorm';
-
-import { MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';
-import { MessageSuppressionSource } from 'src/engine/core-modules/emailing-domain/types/message-suppression-source.type';
-import { WorkspaceRelatedEntity } from 'src/engine/workspace-manager/types/workspace-related-entity';
-
-// Two partial indexes because Postgres treats NULLs as distinct: one global
-// block per (workspace, address), one opt-out per (workspace, address, topic).
-// NOT decorated with @WasIntroducedInUpgrade: a missing-table error that fails
-// sends is safer than silently skipping suppression during a deploy window.
-@Entity({ name: 'messageSuppression', schema: 'core' })
-@Index(
- 'IDX_MESSAGE_SUPPRESSION_GLOBAL_UNIQUE',
- ['workspaceId', 'emailAddress'],
- {
- unique: true,
- where: '"unsubscribeTopicId" IS NULL',
- },
-)
-@Index(
- 'IDX_MESSAGE_SUPPRESSION_TOPIC_UNIQUE',
- ['workspaceId', 'emailAddress', 'unsubscribeTopicId'],
- { unique: true, where: '"unsubscribeTopicId" IS NOT NULL' },
-)
-@Index('IDX_MESSAGE_SUPPRESSION_WORKSPACE_ID', ['workspaceId'])
-export class MessageSuppressionEntity extends WorkspaceRelatedEntity {
- @PrimaryGeneratedColumn('uuid')
- id: string;
-
- @CreateDateColumn({ type: 'timestamptz' })
- createdAt: Date;
-
- @UpdateDateColumn({ type: 'timestamptz' })
- updatedAt: Date;
-
- @Column({ type: 'varchar', nullable: false })
- emailAddress: string;
-
- @Column({
- type: 'enum',
- enum: Object.values(MessageSuppressionReason),
- nullable: false,
- })
- reason: MessageSuppressionReason;
-
- @Column({
- type: 'enum',
- enum: Object.values(MessageSuppressionSource),
- nullable: false,
- })
- source: MessageSuppressionSource;
-
- @Column({ type: 'varchar', nullable: true })
- providerEventId: string | null;
-
- @Column({ type: 'uuid', nullable: true })
- unsubscribeTopicId: string | null;
-}
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-campaign-delivery-outcome-update.util.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-campaign-delivery-outcome-update.util.ts
index 2344d72cc0c..f965d1f19c0 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-campaign-delivery-outcome-update.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/build-campaign-delivery-outcome-update.util.ts
@@ -1,12 +1,12 @@
import { assertUnreachable } from 'twenty-shared/utils';
-import { type CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
+import { type CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
import { CAMPAIGN_PROVIDER_OUTCOME } from 'src/engine/core-modules/emailing-domain/constants/campaign-provider-outcome.constant';
import { type CampaignProviderOutcome } from 'src/engine/core-modules/emailing-domain/types/campaign-provider-outcome.type';
type CampaignDeliveryOutcomeUpdate = Partial<
Pick<
- CampaignDeliveryEntity,
+ CampaignDeliveryWorkspaceEntity,
| 'deliveredAt'
| 'bouncedAt'
| 'complainedAt'
diff --git a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/is-suppression-blocking-send.util.ts b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/is-suppression-blocking-send.util.ts
index c75f0d56851..8eb2cde4eb1 100644
--- a/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/is-suppression-blocking-send.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/emailing-domain/utils/is-suppression-blocking-send.util.ts
@@ -2,11 +2,14 @@ import { isDefined } from 'twenty-shared/utils';
import { HARD_SUPPRESSION_REASONS } from 'src/engine/core-modules/emailing-domain/constants/hard-suppression-reasons.constant';
import { type EmailingDomainSendKind } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-send-kind.type';
-import { type MessageSuppressionEntity } from 'src/engine/core-modules/emailing-domain/message-suppression.entity';
+import { type MessageSuppressionWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-suppression.workspace-entity';
type IsSuppressionBlockingSendArgs = {
sendKind: EmailingDomainSendKind;
- suppression: Pick<MessageSuppressionEntity, 'reason' | 'unsubscribeTopicId'>;
+ suppression: Pick<
+ MessageSuppressionWorkspaceEntity,
+ 'reason' | 'unsubscribeTopicId'
+ >;
unsubscribeTopicId?: string;
};
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.ts
index 6a7b5f20b65..81eeed0e199 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.ts
@@ -14,6 +14,7 @@ import { WorkspaceManyOrAllFlatEntityMapsCacheService } from 'src/engine/metadat
import { FlatObjectMetadata } from 'src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type';
import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
+import { seedMessageSuppressions } from 'src/engine/workspace-manager/dev-seeder/data/utils/seed-message-suppressions.util';
import {
ATTACHMENT_DATA_SEED_COLUMNS,
ATTACHMENT_SAMPLE_FILES,
@@ -360,6 +361,12 @@ export class DevSeederDataService {
light,
});
+ await seedMessageSuppressions({
+ entityManager,
+ schemaName,
+ workspaceId,
+ });
+
if (!light) {
await this.timelineActivitySeederService.seedTimelineActivities({
entityManager,
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-message-suppressions.util.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/utils/seed-message-suppressions.util.ts
similarity index 97%
rename from packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-message-suppressions.util.ts
rename to packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/utils/seed-message-suppressions.util.ts
index d5e0334e8e6..58ff4c605b3 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-message-suppressions.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/utils/seed-message-suppressions.util.ts
@@ -1,4 +1,4 @@
-import { type QueryRunner } from 'typeorm';
+import { type EntityManager } from 'typeorm';
import { isDefined } from 'twenty-shared/utils';
@@ -132,23 +132,22 @@ const MESSAGE_SUPPRESSION_SEEDS: MessageSuppressionSeed[] = [
];
type SeedMessageSuppressionsArgs = {
- queryRunner: QueryRunner;
+ entityManager: EntityManager;
schemaName: string;
workspaceId: string;
};
export const seedMessageSuppressions = async ({
- queryRunner,
+ entityManager,
schemaName,
workspaceId,
}: SeedMessageSuppressionsArgs) => {
const topicIds = getSeededUnsubscribeTopicIds(workspaceId);
- await queryRunner.manager
+ await entityManager
.createQueryBuilder()
.insert()
.into(`${schemaName}.${tableName}`, [
- 'workspaceId',
'emailAddress',
'reason',
'source',
@@ -159,7 +158,6 @@ export const seedMessageSuppressions = async ({
.values(
MESSAGE_SUPPRESSION_SEEDS.map(
({ emailAddress, reason, source, providerEventId, topicSeedName }) => ({
- workspaceId,
emailAddress,
reason,
source,
diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
index c1756fa300d..d2567df5958 100644
--- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/services/dev-seeder.service.ts
@@ -40,7 +40,6 @@ import {
import { seedApiKeys } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-api-keys.util';
import { seedEmailingDomains } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-emailing-domains.util';
import { seedFeatureFlags } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-feature-flags.util';
-import { seedMessageSuppressions } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-message-suppressions.util';
import { seedMetadataEntities } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-metadata-entities.util';
import { seedPageLayouts } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-page-layouts.util';
import { seedServerId } from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-server-id.util';
@@ -328,7 +327,6 @@ export class DevSeederService {
await seedEmailingDomains({ queryRunner, schemaName, workspaceId });
}
await seedUnsubscribeTopics({ queryRunner, schemaName, workspaceId });
- await seedMessageSuppressions({ queryRunner, schemaName, workspaceId });
await seedFeatureFlags({ queryRunner, schemaName, workspaceId });
if (seedBilling) {
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/search-fields-by-standard-object-name.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/search-fields-by-standard-object-name.constant.ts
index cd576c43482..466bbe7214a 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/search-fields-by-standard-object-name.constant.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/search-fields-by-standard-object-name.constant.ts
@@ -18,6 +18,7 @@ export const SEARCH_FIELDS_BY_STANDARD_OBJECT_NAME = {
calendarEventTarget: [{ name: 'id', type: FieldMetadataType.UUID }],
calendarEventParticipant: [{ name: 'handle', type: FieldMetadataType.TEXT }],
callRecording: [{ name: 'title', type: FieldMetadataType.TEXT }],
+ campaignDelivery: [],
company: [
{ name: 'name', type: FieldMetadataType.TEXT },
{ name: 'domainName', type: FieldMetadataType.LINKS },
@@ -35,6 +36,7 @@ export const SEARCH_FIELDS_BY_STANDARD_OBJECT_NAME = {
messageList: [{ name: 'name', type: FieldMetadataType.TEXT }],
messageListMember: [{ name: 'id', type: FieldMetadataType.UUID }],
messageParticipant: [{ name: 'handle', type: FieldMetadataType.TEXT }],
+ messageSuppression: [],
messageThread: [{ name: 'subject', type: FieldMetadataType.TEXT }],
messageThreadTarget: [{ name: 'id', type: FieldMetadataType.UUID }],
note: [
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap
index 34f70766441..2f6abd47621 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/__snapshots__/get-standard-object-metadata-related-entity-ids.util.spec.ts.snap
@@ -996,6 +996,69 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
},
},
},
+ "campaignDelivery": {
+ "fields": {
+ "bouncedAt": {
+ "id": "00000000-0000-0000-0000-000000001088",
+ },
+ "campaignId": {
+ "id": "00000000-0000-0000-0000-000000001077",
+ },
+ "claimExpiresAt": {
+ "id": "00000000-0000-0000-0000-000000001084",
+ },
+ "claimToken": {
+ "id": "00000000-0000-0000-0000-000000001083",
+ },
+ "complainedAt": {
+ "id": "00000000-0000-0000-0000-000000001089",
+ },
+ "createdAt": {
+ "id": "00000000-0000-0000-0000-000000001074",
+ },
+ "deletedAt": {
+ "id": "00000000-0000-0000-0000-000000001076",
+ },
+ "deliveredAt": {
+ "id": "00000000-0000-0000-0000-000000001087",
+ },
+ "failureReason": {
+ "id": "00000000-0000-0000-0000-000000001082",
+ },
+ "id": {
+ "id": "00000000-0000-0000-0000-000000001073",
+ },
+ "personId": {
+ "id": "00000000-0000-0000-0000-000000001078",
+ },
+ "providerMessageId": {
+ "id": "00000000-0000-0000-0000-000000001085",
+ },
+ "recipientEmail": {
+ "id": "00000000-0000-0000-0000-000000001079",
+ },
+ "rejectedAt": {
+ "id": "00000000-0000-0000-0000-000000001090",
+ },
+ "renderingFailedAt": {
+ "id": "00000000-0000-0000-0000-000000001091",
+ },
+ "sentAt": {
+ "id": "00000000-0000-0000-0000-000000001086",
+ },
+ "skipReason": {
+ "id": "00000000-0000-0000-0000-000000001081",
+ },
+ "state": {
+ "id": "00000000-0000-0000-0000-000000001080",
+ },
+ "updatedAt": {
+ "id": "00000000-0000-0000-0000-000000001075",
+ },
+ },
+ "id": "00000000-0000-0000-0000-000000001092",
+ "views": undefined,
+ },
"company": {
"fields": {
"accountOwner": {
@@ -1944,6 +2007,39 @@ exports[`getStandardObjectMetadataRelatedEntityIds should return standard object
},
},
},
+ "messageSuppression": {
+ "fields": {
+ "createdAt": {
+ "id": "00000000-0000-0000-0000-000000001094",
+ },
+ "deletedAt": {
+ "id": "00000000-0000-0000-0000-000000001096",
+ },
+ "emailAddress": {
+ "id": "00000000-0000-0000-0000-000000001097",
+ },
+ "id": {
+ "id": "00000000-0000-0000-0000-000000001093",
+ },
+ "providerEventId": {
+ "id": "00000000-0000-0000-0000-000000001100",
+ },
+ "reason": {
+ "id": "00000000-0000-0000-0000-000000001098",
+ },
+ "source": {
+ "id": "00000000-0000-0000-0000-000000001099",
+ },
+ "unsubscribeTopicId": {
+ "id": "00000000-0000-0000-0000-000000001101",
+ },
+ "updatedAt": {
+ "id": "00000000-0000-0000-0000-000000001095",
+ },
+ },
+ "id": "00000000-0000-0000-0000-000000001102",
+ "views": undefined,
+ },
"messageThread": {
"fields": {
"createdAt": {
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-field-writability.spec.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-field-writability.spec.ts
index 971d952debb..bc23181b823 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-field-writability.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-field-writability.spec.ts
@@ -47,6 +47,8 @@ describe('Standard field writability', () => {
STANDARD_OBJECTS.agentMessagePart.universalIdentifier,
STANDARD_OBJECTS.agentTurn.universalIdentifier,
STANDARD_OBJECTS.agentTurnEvaluation.universalIdentifier,
+ STANDARD_OBJECTS.campaignDelivery.universalIdentifier,
+ STANDARD_OBJECTS.messageSuppression.universalIdentifier,
].some(
(identifier) =>
identifier ===
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-readability.spec.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-readability.spec.ts
index 80fc16f961a..086b6ec7890 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-readability.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-readability.spec.ts
@@ -68,6 +68,9 @@ describe('Standard object readability', () => {
STANDARD_OBJECTS.agentTurn.universalIdentifier,
STANDARD_OBJECTS.agentTurnEvaluation.universalIdentifier,
+ STANDARD_OBJECTS.campaignDelivery.universalIdentifier,
+ STANDARD_OBJECTS.messageSuppression.universalIdentifier,
+
STANDARD_OBJECTS.recordShare.universalIdentifier,
...inheritedObjectNames.map(
(objectName) => STANDARD_OBJECTS[objectName].universalIdentifier,
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-writability.spec.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-writability.spec.ts
index 8935fad3103..d190779bdd4 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-writability.spec.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/__tests__/standard-object-writability.spec.ts
@@ -8,8 +8,9 @@ const TWENTY_STANDARD_APPLICATION_ID = '20202020-2222-4222-8222-222222222222';
const NOW = '2024-01-01T00:00:00.000Z';
// Records of these objects are only ever written by the platform itself:
-// sync bookkeeping rows and workflow trigger registrations. timelineActivity
-// stays OPEN because merging records reparents its rows under the caller.
+// sync bookkeeping rows, campaign sending state and workflow trigger
+// registrations. timelineActivity stays OPEN because merging records
+// reparents its rows under the caller.
const SYSTEM_WRITABILITY_STANDARD_OBJECT_NAMES = [
'agentChatThread',
'agentMessage',
@@ -18,8 +19,10 @@ const SYSTEM_WRITABILITY_STANDARD_OBJECT_NAMES = [
'agentTurnEvaluation',
'calendarChannelEventAssociation',
+ 'campaignDelivery',
'messageChannelMessageAssociation',
'messageChannelMessageAssociationMessageFolder',
+ 'messageSuppression',
'recordShare',
'workflowAutomatedTrigger',
];
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/build-standard-flat-field-metadata-maps.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/build-standard-flat-field-metadata-maps.util.ts
index d2009602020..b7637cb0ed7 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/build-standard-flat-field-metadata-maps.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/build-standard-flat-field-metadata-maps.util.ts
@@ -1,3 +1,5 @@
+import { buildCampaignDeliveryStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-campaign-delivery-standard-flat-field-metadata.util';
+import { buildMessageSuppressionStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-suppression-standard-flat-field-metadata.util';
import { buildAgentTurnEvaluationStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-turn-evaluation-standard-flat-field-metadata.util';
import { buildAgentMessagePartStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-part-standard-flat-field-metadata.util';
import { buildAgentMessageStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-agent-message-standard-flat-field-metadata.util';
@@ -49,6 +51,8 @@ type StandardFieldBuilder<P extends AllStandardObjectName> = (
const STANDARD_FLAT_FIELD_METADATA_BUILDERS_BY_OBJECT_NAME = {
agentTurnEvaluation: buildAgentTurnEvaluationStandardFlatFieldMetadatas,
+ campaignDelivery: buildCampaignDeliveryStandardFlatFieldMetadatas,
+ messageSuppression: buildMessageSuppressionStandardFlatFieldMetadatas,
agentMessagePart: buildAgentMessagePartStandardFlatFieldMetadatas,
agentMessage: buildAgentMessageStandardFlatFieldMetadatas,
agentTurn: buildAgentTurnStandardFlatFieldMetadatas,
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-campaign-delivery-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-campaign-delivery-standard-flat-field-metadata.util.ts
new file mode 100644
index 00000000000..85eb6e1819b
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-campaign-delivery-standard-flat-field-metadata.util.ts
@@ -0,0 +1,451 @@
+import { msg } from '@lingui/core/macro';
+import { FieldMetadataType, MetadataWritability } from 'twenty-shared/types';
+
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type AllStandardObjectFieldName } from 'src/engine/workspace-manager/twenty-standard-application/types/all-standard-object-field-name.type';
+import {
+ type CreateStandardFieldArgs,
+ createStandardFieldFlatMetadata,
+} from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/create-standard-field-flat-metadata.util';
+import { i18nLabel } from 'src/engine/workspace-manager/twenty-standard-application/utils/i18n-label.util';
+
+export const buildCampaignDeliveryStandardFlatFieldMetadatas = (
+ args: Omit<
+ CreateStandardFieldArgs<'campaignDelivery', FieldMetadataType>,
+ 'context'
+ >,
+): Record<
+ AllStandardObjectFieldName<'campaignDelivery'>,
+ FlatFieldMetadata
+> => ({
+ id: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'id',
+ type: FieldMetadataType.UUID,
+ label: i18nLabel(
+ msg({ message: 'ID', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'ID', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconId',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ defaultValue: 'uuid',
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ campaignId: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'campaignId',
+ type: FieldMetadataType.UUID,
+ label: i18nLabel(
+ msg({ message: 'Campaign ID', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Campaign ID', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconSpeakerphone',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ personId: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'personId',
+ type: FieldMetadataType.UUID,
+ label: i18nLabel(
+ msg({ message: 'Person ID', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Person ID', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconUser',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ recipientEmail: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'recipientEmail',
+ type: FieldMetadataType.TEXT,
+ label: i18nLabel(
+ msg({ message: 'Recipient Email', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Recipient Email',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconMail',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ state: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'state',
+ type: FieldMetadataType.TEXT,
+ label: i18nLabel(
+ msg({ message: 'State', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'State', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconStatusChange',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ defaultValue: "'QUEUED'",
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ skipReason: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'skipReason',
+ type: FieldMetadataType.TEXT,
+ label: i18nLabel(
+ msg({ message: 'Skip Reason', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Skip Reason', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconPlayerSkipForward',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ failureReason: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'failureReason',
+ type: FieldMetadataType.TEXT,
+ label: i18nLabel(
+ msg({ message: 'Failure Reason', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Failure Reason',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconAlertTriangle',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ claimToken: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'claimToken',
+ type: FieldMetadataType.UUID,
+ label: i18nLabel(
+ msg({ message: 'Claim Token', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Claim Token', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconKey',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ claimExpiresAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'claimExpiresAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Claim Expires At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Claim Expires At',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconClock',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ providerMessageId: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'providerMessageId',
+ type: FieldMetadataType.TEXT,
+ label: i18nLabel(
+ msg({
+ message: 'Provider Message ID',
+ context: 'fieldMetadata.label',
+ }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Provider Message ID',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconId',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ sentAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'sentAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Sent At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Sent At', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconSend',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ deliveredAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'deliveredAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Delivered At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Delivered At',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconMailCheck',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ bouncedAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'bouncedAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Bounced At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Bounced At', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconMailX',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ complainedAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'complainedAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Complained At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Complained At',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconMailExclamation',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ rejectedAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'rejectedAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Rejected At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Rejected At', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconMailOff',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ renderingFailedAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'renderingFailedAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({
+ message: 'Rendering Failed At',
+ context: 'fieldMetadata.label',
+ }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Rendering Failed At',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconAlertTriangle',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ createdAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'createdAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Created At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Created At', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconCalendar',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ defaultValue: 'now',
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ updatedAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'updatedAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Updated At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Updated At', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconCalendar',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ defaultValue: 'now',
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ deletedAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'deletedAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Deleted At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Deleted At', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconCalendar',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+});
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-suppression-standard-flat-field-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-suppression-standard-flat-field-metadata.util.ts
new file mode 100644
index 00000000000..52fa7640293
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-suppression-standard-flat-field-metadata.util.ts
@@ -0,0 +1,225 @@
+import { msg } from '@lingui/core/macro';
+import { FieldMetadataType, MetadataWritability } from 'twenty-shared/types';
+
+import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
+import { type AllStandardObjectFieldName } from 'src/engine/workspace-manager/twenty-standard-application/types/all-standard-object-field-name.type';
+import {
+ type CreateStandardFieldArgs,
+ createStandardFieldFlatMetadata,
+} from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/create-standard-field-flat-metadata.util';
+import { i18nLabel } from 'src/engine/workspace-manager/twenty-standard-application/utils/i18n-label.util';
+
+export const buildMessageSuppressionStandardFlatFieldMetadatas = (
+ args: Omit<
+ CreateStandardFieldArgs<'messageSuppression', FieldMetadataType>,
+ 'context'
+ >,
+): Record<
+ AllStandardObjectFieldName<'messageSuppression'>,
+ FlatFieldMetadata
+> => ({
+ id: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'id',
+ type: FieldMetadataType.UUID,
+ label: i18nLabel(
+ msg({ message: 'ID', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'ID', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconId',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ defaultValue: 'uuid',
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ emailAddress: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'emailAddress',
+ type: FieldMetadataType.TEXT,
+ label: i18nLabel(
+ msg({ message: 'Email Address', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Email Address',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconMail',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ reason: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'reason',
+ type: FieldMetadataType.TEXT,
+ label: i18nLabel(
+ msg({ message: 'Reason', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Reason', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconBan',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ source: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'source',
+ type: FieldMetadataType.TEXT,
+ label: i18nLabel(
+ msg({ message: 'Source', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Source', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconPlugConnected',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ providerEventId: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'providerEventId',
+ type: FieldMetadataType.TEXT,
+ label: i18nLabel(
+ msg({ message: 'Provider Event ID', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Provider Event ID',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconId',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ unsubscribeTopicId: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'unsubscribeTopicId',
+ type: FieldMetadataType.UUID,
+ label: i18nLabel(
+ msg({
+ message: 'Unsubscribe Topic ID',
+ context: 'fieldMetadata.label',
+ }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Unsubscribe Topic ID',
+ context: 'fieldMetadata.description',
+ }),
+ ),
+ icon: 'IconTags',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ createdAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'createdAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Created At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Created At', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconCalendar',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ defaultValue: 'now',
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ updatedAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'updatedAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Updated At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Updated At', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconCalendar',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: false,
+ defaultValue: 'now',
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+ deletedAt: {
+ ...createStandardFieldFlatMetadata({
+ ...args,
+ context: {
+ fieldName: 'deletedAt',
+ type: FieldMetadataType.DATE_TIME,
+ label: i18nLabel(
+ msg({ message: 'Deleted At', context: 'fieldMetadata.label' }),
+ ),
+ description: i18nLabel(
+ msg({ message: 'Deleted At', context: 'fieldMetadata.description' }),
+ ),
+ icon: 'IconCalendar',
+ isSystem: true,
+ isUIEditable: false,
+ isNullable: true,
+ },
+ }),
+ writability: MetadataWritability.SYSTEM,
+ isAuditLogged: false,
+ },
+});
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/build-standard-flat-index-metadata-maps.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/build-standard-flat-index-metadata-maps.util.ts
index 220df742bff..f452607319e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/build-standard-flat-index-metadata-maps.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/build-standard-flat-index-metadata-maps.util.ts
@@ -1,3 +1,5 @@
+import { buildCampaignDeliveryStandardFlatIndexMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/index/compute-campaign-delivery-standard-flat-index-metadata.util';
+import { buildMessageSuppressionStandardFlatIndexMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/index/compute-message-suppression-standard-flat-index-metadata.util';
import { buildAgentTurnEvaluationStandardFlatIndexMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/index/compute-agent-turn-evaluation-standard-flat-index-metadata.util';
import { buildAgentMessagePartStandardFlatIndexMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/index/compute-agent-message-part-standard-flat-index-metadata.util';
import { buildAgentMessageStandardFlatIndexMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/index/compute-agent-message-standard-flat-index-metadata.util';
@@ -45,6 +47,8 @@ type StandardIndexBuilder<P extends AllStandardObjectName> = (
const STANDARD_FLAT_INDEX_METADATA_BUILDERS_BY_OBJECT_NAME = {
agentTurnEvaluation: buildAgentTurnEvaluationStandardFlatIndexMetadatas,
+ campaignDelivery: buildCampaignDeliveryStandardFlatIndexMetadatas,
+ messageSuppression: buildMessageSuppressionStandardFlatIndexMetadatas,
agentMessagePart: buildAgentMessagePartStandardFlatIndexMetadatas,
agentMessage: buildAgentMessageStandardFlatIndexMetadatas,
agentTurn: buildAgentTurnStandardFlatIndexMetadatas,
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-campaign-delivery-standard-flat-index-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-campaign-delivery-standard-flat-index-metadata.util.ts
new file mode 100644
index 00000000000..df350128baa
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-campaign-delivery-standard-flat-index-metadata.util.ts
@@ -0,0 +1,55 @@
+import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';
+import {
+ type CreateStandardIndexArgs,
+ createStandardIndexFlatMetadata,
+} from 'src/engine/workspace-manager/twenty-standard-application/utils/index/create-standard-index-flat-metadata.util';
+
+export const buildCampaignDeliveryStandardFlatIndexMetadatas = (
+ args: Omit<CreateStandardIndexArgs<'campaignDelivery'>, 'context'>,
+): Record<string, FlatIndexMetadata> => ({
+ campaignPersonUniqueIndex: createStandardIndexFlatMetadata({
+ ...args,
+ context: {
+ indexName: 'campaignPersonUniqueIndex',
+ relatedFieldNames: ['campaignId', 'personId'],
+ isUnique: true,
+ indexWhereClause: null,
+ },
+ }),
+ expiredClaimIndex: createStandardIndexFlatMetadata({
+ ...args,
+ context: {
+ indexName: 'expiredClaimIndex',
+ relatedFieldNames: ['claimExpiresAt'],
+ isUnique: false,
+ indexWhereClause: null,
+ },
+ }),
+ countsIndex: createStandardIndexFlatMetadata({
+ ...args,
+ context: {
+ indexName: 'countsIndex',
+ relatedFieldNames: ['campaignId', 'state'],
+ isUnique: false,
+ indexWhereClause: null,
+ },
+ }),
+ claimTokenIndex: createStandardIndexFlatMetadata({
+ ...args,
+ context: {
+ indexName: 'claimTokenIndex',
+ relatedFieldNames: ['claimToken'],
+ isUnique: false,
+ indexWhereClause: null,
+ },
+ }),
+ providerMessageIdUniqueIndex: createStandardIndexFlatMetadata({
+ ...args,
+ context: {
+ indexName: 'providerMessageIdUniqueIndex',
+ relatedFieldNames: ['providerMessageId'],
+ isUnique: true,
+ indexWhereClause: null,
+ },
+ }),
+});
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-message-suppression-standard-flat-index-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-message-suppression-standard-flat-index-metadata.util.ts
new file mode 100644
index 00000000000..43a8986f548
--- /dev/null
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-message-suppression-standard-flat-index-metadata.util.ts
@@ -0,0 +1,19 @@
+import { type FlatIndexMetadata } from 'src/engine/metadata-modules/flat-index-metadata/types/flat-index-metadata.type';
+import {
+ type CreateStandardIndexArgs,
+ createStandardIndexFlatMetadata,
+} from 'src/engine/workspace-manager/twenty-standard-application/utils/index/create-standard-index-flat-metadata.util';
+
+export const buildMessageSuppressionStandardFlatIndexMetadatas = (
+ args: Omit<CreateStandardIndexArgs<'messageSuppression'>, 'context'>,
+): Record<string, FlatIndexMetadata> => ({
+ emailAddressTopicUniqueIndex: createStandardIndexFlatMetadata({
+ ...args,
+ context: {
+ indexName: 'emailAddressTopicUniqueIndex',
+ relatedFieldNames: ['emailAddress', 'unsubscribeTopicId'],
+ isUnique: true,
+ indexWhereClause: null,
+ },
+ }),
+});
diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-flat-object-metadata.util.ts
index 3c54ace5bb7..ee040b25c1e 100644
--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-flat-object-metadata.util.ts
+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-flat-object-metadata.util.ts
@@ -222,6 +222,92 @@ export const STANDARD_FLAT_OBJECT_METADATA_BUILDERS_BY_OBJECT_NAME = {
labelIdentifierFieldMetadataName: 'id',
},
}),
+ campaignDelivery: (
+ args: Omit<
+ CreateStandardObjectArgs<'campaignDelivery'>,
+ 'context' | 'objectName'
+ >,
+ ) =>
+ createStandardObjectFlatMetadata({
+ ...args,
+ objectName: 'campaignDelivery',
+ context: {
+ universalIdentifier:
+ STANDARD_OBJECTS.campaignDelivery.universalIdentifier,
+ nameSingular: 'campaignDelivery',
+ namePlural: 'campaignDeliveries',
+ labelSingular: i18nLabel(
+ msg({
+ message: 'Campaign delivery',
+ context: 'objectMetadata.labelSingular',
+ }),
+ ),
+ labelPlural: i18nLabel(
+ msg({
+ message: 'Campaign deliveries',
+ context: 'objectMetadata.labelPlural',
+ }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Campaign delivery',
+ context: 'objectMetadata.description',
+ }),
+ ),
+ icon: 'IconSend',
+ isSystem: true,
+ isSearchable: false,
+ isAuditLogged: false,
+ isUIEditable: false,
+ isUICreatable: false,
+ readability: MetadataReadability.SYSTEM,
+ writability: MetadataWritability.SYSTEM,
+ labelIdentifierFieldMetadataName: 'id',
+ },
+ }),
+ messageSuppression: (
+ args: Omit<
+ CreateStandardObjectArgs<'messageSuppression'>,
+ 'context' | 'objectName'
+ >,
+ ) =>
+ createStandardObjectFlatMetadata({
+ ...args,
+ objectName: 'messageSuppression',
+ context: {
+ universalIdentifier:
+ STANDARD_OBJECTS.messageSuppression.universalIdentifier,
+ nameSingular: 'messageSuppression',
+ namePlural: 'messageSuppressions',
+ labelSingular: i18nLabel(
+ msg({
+ message: 'Message suppression',
+ context: 'objectMetadata.labelSingular',
+ }),
+ ),
+ labelPlural: i18nLabel(
+ msg({
+ message: 'Message suppressions',
+ context: 'objectMetadata.labelPlural',
+ }),
+ ),
+ description: i18nLabel(
+ msg({
+ message: 'Message suppression',
+ context: 'objectMetadata.description',
+ }),
+ ),
+ icon: 'IconBan',
+ isSystem: true,
+ isSearchable: false,
+ isAuditLogged: false,
+ isUIEditable: false,
+ isUICreatable: false,
+ readability: MetadataReadability.SYSTEM,
+ writability: MetadataWritability.SYSTEM,
+ labelIdentifierFieldMetadataName: 'id',
+ },
+ }),
attachment: ({
now,
diff --git a/packages/twenty-server/src/modules/emailing/constants/skip-event-emission.constant.ts b/packages/twenty-server/src/modules/emailing/constants/skip-event-emission.constant.ts
deleted file mode 100644
index 5acf251e347..00000000000
--- a/packages/twenty-server/src/modules/emailing/constants/skip-event-emission.constant.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// Campaign rows are machine-generated and nothing subscribes to them: no
-// webhook, workflow trigger or timeline activity. Emitting would cost a
-// snapshot SELECT of every row written plus a timeline row per recipient.
-export const SKIP_EVENT_EMISSION = { shouldSkipEventEmission: true };
diff --git a/packages/twenty-server/src/modules/emailing/emailing.module.ts b/packages/twenty-server/src/modules/emailing/emailing.module.ts
index 2b104fb6f25..2ecd83eb035 100644
--- a/packages/twenty-server/src/modules/emailing/emailing.module.ts
+++ b/packages/twenty-server/src/modules/emailing/emailing.module.ts
@@ -5,8 +5,6 @@ import { ActorModule } from 'src/engine/core-modules/actor/actor.module';
import { BillingModule } from 'src/engine/core-modules/billing/billing.module';
import { EmailingDomainModule } from 'src/engine/core-modules/emailing-domain/emailing-domain.module';
import { EmailingDomainEntity } from 'src/engine/core-modules/emailing-domain/emailing-domain.entity';
-import { CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
-import { MessageSuppressionEntity } from 'src/engine/core-modules/emailing-domain/message-suppression.entity';
import { UnsubscribeTopicEntity } from 'src/engine/core-modules/emailing-domain/unsubscribe-topic.entity';
import { FeatureFlagModule } from 'src/engine/core-modules/feature-flag/feature-flag.module';
import { UsageModule } from 'src/engine/core-modules/usage/usage.module';
@@ -68,9 +66,7 @@ import { SaveCampaignTool } from 'src/modules/emailing/tools/save-campaign-tool'
TypeOrmModule.forFeature([
MessageChannelEntity,
EmailingDomainEntity,
- MessageSuppressionEntity,
UnsubscribeTopicEntity,
- CampaignDeliveryEntity,
WorkspaceEntity,
]),
],
@@ -100,9 +96,7 @@ import { SaveCampaignTool } from 'src/modules/emailing/tools/save-campaign-tool'
MessageSuppressionResolver,
UnsubscribeTopicResolver,
provideWorkspaceScopedRepository(EmailingDomainEntity),
- provideWorkspaceScopedRepository(MessageSuppressionEntity),
provideWorkspaceScopedRepository(UnsubscribeTopicEntity),
- provideWorkspaceScopedRepository(CampaignDeliveryEntity),
EmailingOngoingStaleCronCommand,
EmailingOngoingStaleCronJob,
ReconcileCampaignStatsCronCommand,
diff --git a/packages/twenty-server/src/modules/emailing/services/__tests__/message-campaign-batch-delivery.service.spec.ts b/packages/twenty-server/src/modules/emailing/services/__tests__/message-campaign-batch-delivery.service.spec.ts
index b814ec21877..ca0582f226d 100644
--- a/packages/twenty-server/src/modules/emailing/services/__tests__/message-campaign-batch-delivery.service.spec.ts
+++ b/packages/twenty-server/src/modules/emailing/services/__tests__/message-campaign-batch-delivery.service.spec.ts
@@ -1,4 +1,3 @@
-import { getDataSourceToken } from '@nestjs/typeorm';
import { Test, type TestingModule } from '@nestjs/testing';
import { EMAIL_DOCUMENT_SCHEMA_VERSION } from 'twenty-shared/utils';
@@ -10,11 +9,10 @@ import { CAMPAIGN_DELIVERY_STATE } from 'src/engine/core-modules/emailing-domain
import { type SendSlotRefusal } from 'src/engine/core-modules/emailing-domain/types/send-slot-refusal.type';
import { CAMPAIGN_FAILURE_REASON } from 'src/engine/core-modules/emailing-domain/constants/campaign-failure-reason.constant';
import { CLAIMABLE_CAMPAIGN_DELIVERY_STATES } from 'src/engine/core-modules/emailing-domain/constants/claimable-campaign-delivery-states.constant';
-import { CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
import { getQueueToken } from 'src/engine/core-modules/message-queue/utils/get-queue-token.util';
import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queue.constants';
-import { getWorkspaceScopedRepositoryToken } from 'src/engine/twenty-orm/workspace-scoped-repository/get-workspace-scoped-repository-token.util';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
+import { CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
import { CampaignSendSlotService } from 'src/modules/emailing/services/campaign-send-slot.service';
import { EmailBillingService } from 'src/modules/emailing/services/email-billing.service';
import { EmailingDomainSenderService } from 'src/modules/emailing/services/emailing-domain-sender.service';
@@ -52,9 +50,13 @@ const buildJobData = (recipientCount: number) => ({
// buildCampaignDeliverySettleQuery passes the settlement columns as parallel
// arrays; this reads one back as rows.
-const decodeSettleCall = (parameters: unknown[]) => {
- const [ids, states, , failureReasons, providerMessageIds] =
- parameters as string[][];
+const decodeSettleCall = (parameters: Record<string, unknown>) => {
+ const {
+ deliveryIds: ids,
+ states,
+ failureReasons,
+ providerMessageIds,
+ } = parameters as Record<string, string[]>;
return ids.map((id, index) => ({
deliveryId: id,
@@ -67,25 +69,33 @@ const decodeSettleCall = (parameters: unknown[]) => {
const buildHarness = () => {
const claimedIds: string[] = [];
- const queryBuilder = {
- update: () => queryBuilder,
- set: () => queryBuilder,
- where: () => queryBuilder,
- andWhere: () => queryBuilder,
- returning: () => queryBuilder,
- execute: jest.fn(async () => ({
- raw: claimedIds.map((id) => ({ id })),
- })),
+ const deliveryUpdateAssignments: Record<string, unknown>[] = [];
+
+ const buildDeliveryUpdateQueryBuilder = () => {
+ let isClaim = false;
+ const deliveryUpdateQueryBuilder = {
+ where: () => deliveryUpdateQueryBuilder,
+ update: () => deliveryUpdateQueryBuilder,
+ set: (assignments: Record<string, unknown>) => {
+ deliveryUpdateAssignments.push(assignments);
+ isClaim = assignments.state === CAMPAIGN_DELIVERY_STATE.SENDING;
+
+ return deliveryUpdateQueryBuilder;
+ },
+ returning: () => deliveryUpdateQueryBuilder,
+ execute: jest.fn(async () => ({
+ generatedMaps: isClaim ? claimedIds.map((id) => ({ id })) : [],
+ })),
+ };
+
+ return deliveryUpdateQueryBuilder;
};
const campaignDeliveryRepository = {
- createQueryBuilder: () => queryBuilder,
- update: jest.fn(
- async (
- _workspaceId: string,
- _criteria: unknown,
- _update: Record<string, unknown>,
- ) => ({ affected: claimedIds.length }),
+ createQueryBuilder: jest.fn(buildDeliveryUpdateQueryBuilder),
+ executeRaw: jest.fn(
+ async (_sql: string, _parameters: Record<string, unknown>) =>
+ claimedIds.map((id) => ({ id })),
),
};
@@ -110,6 +120,10 @@ const buildHarness = () => {
return associationRepository;
}
+ if (entity === CampaignDeliveryWorkspaceEntity) {
+ return campaignDeliveryRepository;
+ }
+
return personRepository;
}),
};
@@ -152,21 +166,11 @@ const buildHarness = () => {
) => [],
),
};
- const dataSource = {
- query: jest.fn(async (_sql: string, _parameters: unknown[]) =>
- claimedIds.map((id) => ({ id })),
- ),
- };
const buildService = async () => {
const module: TestingModule = await Test.createTestingModule({
providers: [
MessageCampaignBatchDeliveryService,
- {
- provide: getWorkspaceScopedRepositoryToken(CampaignDeliveryEntity),
- useValue: campaignDeliveryRepository,
- },
- { provide: getDataSourceToken(), useValue: dataSource },
{
provide: getQueueToken(MessageQueue.campaignSendQueue),
useValue: messageQueueService,
@@ -196,8 +200,8 @@ const buildHarness = () => {
return {
buildService,
claimedIds,
+ deliveryUpdateAssignments,
campaignDeliveryRepository,
- dataSource,
emailingDomainSenderService,
messageCampaignLifecycleService,
campaignSendSlotService,
@@ -248,17 +252,12 @@ describe('MessageCampaignBatchDeliveryService', () => {
await (await harness.buildService()).processSendBatchJob(buildJobData(1));
- const settleCall =
- harness.campaignDeliveryRepository.update.mock.calls.find(
- ([, , update]) =>
- (update as { failureReason?: string }).failureReason ===
- CAMPAIGN_FAILURE_REASON.SANDBOX_ACCOUNT,
- );
-
- expect(settleCall).toBeDefined();
- expect((settleCall?.[2] as { state: string }).state).toBe(
- CAMPAIGN_DELIVERY_STATE.FAILED,
+ const sandboxSettlement = harness.deliveryUpdateAssignments.find(
+ (assignments) =>
+ assignments.failureReason === CAMPAIGN_FAILURE_REASON.SANDBOX_ACCOUNT,
);
+
+ expect(sandboxSettlement?.state).toBe(CAMPAIGN_DELIVERY_STATE.FAILED);
});
it('rethrows a retriable provider failure so the job runs again', async () => {
@@ -288,7 +287,7 @@ describe('MessageCampaignBatchDeliveryService', () => {
suppressedRecipientIndexes: [],
});
// The settle statement fails once; the rescue reruns it.
- harness.dataSource.query
+ harness.campaignDeliveryRepository.executeRaw
.mockRejectedValueOnce(new Error('settle exploded'))
.mockResolvedValue([{ id: 'message-0' }]);
@@ -297,7 +296,7 @@ describe('MessageCampaignBatchDeliveryService', () => {
).rejects.toThrow('settle exploded');
const [rescued] = decodeSettleCall(
- harness.dataSource.query.mock.calls[1][1],
+ harness.campaignDeliveryRepository.executeRaw.mock.calls[1][1],
);
expect(CLAIMABLE_CAMPAIGN_DELIVERY_STATES).not.toContain(rescued.state);
@@ -318,7 +317,7 @@ describe('MessageCampaignBatchDeliveryService', () => {
],
suppressedRecipientIndexes: [],
});
- harness.dataSource.query
+ harness.campaignDeliveryRepository.executeRaw
.mockRejectedValueOnce(new Error('settle exploded'))
.mockResolvedValue([]);
@@ -326,7 +325,7 @@ describe('MessageCampaignBatchDeliveryService', () => {
(await harness.buildService()).processSendBatchJob(buildJobData(2)),
).rejects.toThrow('settle exploded');
- const rescuedRows = harness.dataSource.query.mock.calls
+ const rescuedRows = harness.campaignDeliveryRepository.executeRaw.mock.calls
.slice(1)
.flatMap(([, parameters]) => decodeSettleCall(parameters));
@@ -349,7 +348,7 @@ describe('MessageCampaignBatchDeliveryService', () => {
],
suppressedRecipientIndexes: [],
});
- harness.dataSource.query
+ harness.campaignDeliveryRepository.executeRaw
.mockRejectedValueOnce(new Error('settle exploded'))
.mockResolvedValue([]);
@@ -360,7 +359,7 @@ describe('MessageCampaignBatchDeliveryService', () => {
// Whatever the rescue does not reach is re-queued by the finally block, so
// the rows the provider took have to be settled by the first of the two.
const [acceptedFirst] = decodeSettleCall(
- harness.dataSource.query.mock.calls[1][1],
+ harness.campaignDeliveryRepository.executeRaw.mock.calls[1][1],
);
expect(acceptedFirst.deliveryId).toBe('message-0');
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts
index 8c725a02be2..c6fff21c537 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-batch-delivery.service.ts
@@ -1,11 +1,10 @@
import { Injectable, Logger } from '@nestjs/common';
-import { InjectDataSource } from '@nestjs/typeorm';
-import { DataSource, In } from 'typeorm';
+import { In } from 'typeorm';
import { isDefined } from 'twenty-shared/utils';
import { v4 } from 'uuid';
-import { CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
+import { CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
import { SEND_CAMPAIGN_EMAIL_BATCH_JOB } from 'src/engine/core-modules/emailing-domain/constants/send-campaign-email-batch-job.constant';
import { CAMPAIGN_DELIVERY_CLAIM_TTL_MS } from 'src/engine/core-modules/emailing-domain/constants/campaign-delivery-claim-ttl-ms.constant';
import { CAMPAIGN_DELIVERY_STATE } from 'src/engine/core-modules/emailing-domain/constants/campaign-delivery-state.constant';
@@ -23,9 +22,6 @@ import { MessageQueue } from 'src/engine/core-modules/message-queue/message-queu
import { MessageQueueService } from 'src/engine/core-modules/message-queue/services/message-queue.service';
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 { SKIP_EVENT_EMISSION } from 'src/modules/emailing/constants/skip-event-emission.constant';
import { CampaignSendSlotService } from 'src/modules/emailing/services/campaign-send-slot.service';
import { CampaignVariableService } from 'src/modules/emailing/services/campaign-variable.service';
import { EmailBillingService } from 'src/modules/emailing/services/email-billing.service';
@@ -38,6 +34,7 @@ import { type CampaignDeliverySettlement } from 'src/modules/emailing/types/camp
import { type UsageRefusal } from 'src/engine/core-modules/billing/types/usage-refusal.type';
import { buildCampaignBatchReplacements } from 'src/modules/emailing/utils/build-campaign-batch-replacements.util';
import { buildCampaignThreadExternalId } from 'src/modules/emailing/utils/build-campaign-thread-external-id.util';
+import { getCampaignDeliveryTableName } from 'src/modules/emailing/utils/get-campaign-delivery-table-name.util';
import { buildCampaignDeliverySettleQuery } from 'src/modules/emailing/utils/build-campaign-delivery-settle-query.util';
import { compileCampaignBatchTemplate } from 'src/modules/emailing/utils/compile-campaign-batch-template.util';
import { chunkRecipientsToAdmissibleSize } from 'src/modules/emailing/utils/chunk-recipients-to-admissible-size.util';
@@ -58,10 +55,6 @@ export class MessageCampaignBatchDeliveryService {
);
constructor(
- @InjectWorkspaceScopedRepository(CampaignDeliveryEntity)
- private readonly campaignDeliveryRepository: WorkspaceScopedRepository<CampaignDeliveryEntity>,
- @InjectDataSource()
- private readonly dataSource: DataSource,
@InjectMessageQueue(MessageQueue.campaignSendQueue)
private readonly messageQueueService: MessageQueueService,
private readonly workspaceOrmManager: WorkspaceOrmManager,
@@ -90,7 +83,6 @@ export class MessageCampaignBatchDeliveryService {
const claimToken = v4();
const claimedDeliveryIds = await this.claimBatch({
- workspaceId,
deliveryIds: data.recipients.map((recipient) => recipient.messageId),
claimToken,
});
@@ -114,7 +106,6 @@ export class MessageCampaignBatchDeliveryService {
});
} finally {
await this.requeueClaimsNeverHandedToProvider({
- workspaceId,
claimToken,
});
}
@@ -153,7 +144,6 @@ export class MessageCampaignBatchDeliveryService {
if (!isDefined(campaign)) {
await this.settleWholeBatchAs({
- workspaceId,
claimToken,
recipients: claimedRecipients,
state: CAMPAIGN_DELIVERY_STATE.SKIPPED,
@@ -165,7 +155,6 @@ export class MessageCampaignBatchDeliveryService {
if (isDefined(sendRefusal)) {
await this.settleWholeBatchAs({
- workspaceId,
claimToken,
recipients: claimedRecipients,
state: CAMPAIGN_DELIVERY_STATE.SKIPPED,
@@ -221,7 +210,6 @@ export class MessageCampaignBatchDeliveryService {
if (!isDefined(campaignStillRunning)) {
await this.settleWholeBatchAs({
- workspaceId,
claimToken,
recipients: claimedRecipients,
state: CAMPAIGN_DELIVERY_STATE.SKIPPED,
@@ -250,12 +238,10 @@ export class MessageCampaignBatchDeliveryService {
claimedRecipients: BatchRecipient[];
sendSlotRefusal: SendSlotRefusal;
}): Promise<void> {
- const { workspaceId } = data;
const attemptCount = (data.rateLimitedAttemptCount ?? 0) + 1;
if (attemptCount > SEND_SLOT_RETRY.attemptLimit) {
await this.settleWholeBatchAs({
- workspaceId,
claimToken,
recipients: claimedRecipients,
state: CAMPAIGN_DELIVERY_STATE.FAILED,
@@ -266,7 +252,6 @@ export class MessageCampaignBatchDeliveryService {
}
await this.settleWholeBatchAs({
- workspaceId,
claimToken,
recipients: claimedRecipients,
state: CAMPAIGN_DELIVERY_STATE.QUEUED,
@@ -375,7 +360,6 @@ export class MessageCampaignBatchDeliveryService {
})
.catch(async (error) => {
const { shouldRetry } = await this.recordBatchFailure({
- workspaceId,
campaignId,
claimToken,
claimedRecipients,
@@ -510,7 +494,7 @@ export class MessageCampaignBatchDeliveryService {
const messageRepository = this.workspaceOrmManager.getRepository(
MessageWorkspaceEntity,
{ shouldBypassPermissionChecks: true },
- SKIP_EVENT_EMISSION,
+ { shouldSkipEventEmission: true },
);
await messageRepository.update(deliveryId, {
@@ -522,7 +506,7 @@ export class MessageCampaignBatchDeliveryService {
const associationRepository = this.workspaceOrmManager.getRepository(
MessageChannelMessageAssociationWorkspaceEntity,
{ shouldBypassPermissionChecks: true },
- SKIP_EVENT_EMISSION,
+ { shouldSkipEventEmission: true },
);
await associationRepository.update(
@@ -532,13 +516,11 @@ export class MessageCampaignBatchDeliveryService {
}
private async recordBatchFailure({
- workspaceId,
campaignId,
claimToken,
claimedRecipients,
error,
}: {
- workspaceId: string;
campaignId: string;
claimToken: string;
claimedRecipients: BatchRecipient[];
@@ -548,7 +530,6 @@ export class MessageCampaignBatchDeliveryService {
resolveCampaignSendFailure(error);
await this.settleWholeBatchAs({
- workspaceId,
claimToken,
recipients: claimedRecipients,
state: shouldRetry ? CAMPAIGN_DELIVERY_STATE.QUEUED : state,
@@ -566,66 +547,72 @@ export class MessageCampaignBatchDeliveryService {
}
private async claimBatch({
- workspaceId,
deliveryIds,
claimToken,
}: {
- workspaceId: string;
deliveryIds: string[];
claimToken: string;
}): Promise<string[]> {
- const { raw } = await this.campaignDeliveryRepository
+ const { generatedMaps: claimedDeliveries } = await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
.createQueryBuilder()
+ .where({
+ id: In(deliveryIds),
+ state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES),
+ })
.update()
.set({
state: CAMPAIGN_DELIVERY_STATE.SENDING,
claimToken,
claimExpiresAt: new Date(Date.now() + CAMPAIGN_DELIVERY_CLAIM_TTL_MS),
})
- .where('"workspaceId" = :workspaceId', { workspaceId })
- .andWhere('id IN (:...deliveryIds)', { deliveryIds })
- .andWhere('state IN (:...claimableStates)', {
- claimableStates: CLAIMABLE_CAMPAIGN_DELIVERY_STATES,
- })
.returning(['id'])
.execute();
- return (raw as { id: string }[]).map((row) => row.id);
+ return claimedDeliveries.map((delivery) => delivery.id);
}
private async settleWholeBatchAs({
- workspaceId,
claimToken,
recipients,
state,
skipReason = null,
failureReason = null,
}: {
- workspaceId: string;
claimToken: string;
recipients: BatchRecipient[];
- state: CampaignDeliveryEntity['state'];
- skipReason?: CampaignDeliveryEntity['skipReason'];
- failureReason?: CampaignDeliveryEntity['failureReason'];
+ state: CampaignDeliveryWorkspaceEntity['state'];
+ skipReason?: CampaignDeliveryWorkspaceEntity['skipReason'];
+ failureReason?: CampaignDeliveryWorkspaceEntity['failureReason'];
}): Promise<void> {
if (recipients.length === 0) {
return;
}
- await this.campaignDeliveryRepository.update(
- workspaceId,
- {
+ await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
+ .createQueryBuilder()
+ .where({
id: In(recipients.map((recipient) => recipient.messageId)),
claimToken,
- },
- {
+ })
+ .update()
+ .set({
state,
skipReason,
failureReason,
claimToken: null,
claimExpiresAt: null,
- },
- );
+ })
+ .execute();
}
private async settleClaimedBatch({
@@ -642,35 +629,42 @@ export class MessageCampaignBatchDeliveryService {
}
const { sql, parameters } = buildCampaignDeliverySettleQuery({
- workspaceId,
+ campaignDeliveryTableName: getCampaignDeliveryTableName(workspaceId),
claimToken,
settlements,
});
- const settledRows: { id: string }[] = await this.dataSource.query(
- sql,
- parameters,
- );
+ const settledRows = await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
+ .executeRaw<{ id: string }>(sql, parameters);
return new Set(settledRows.map((row) => row.id));
}
private async requeueClaimsNeverHandedToProvider({
- workspaceId,
claimToken,
}: {
- workspaceId: string;
claimToken: string;
}): Promise<void> {
- await this.campaignDeliveryRepository.update(
- workspaceId,
- { claimToken },
- {
+ await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
+ .createQueryBuilder()
+ .where({ claimToken })
+ .update()
+ .set({
state: CAMPAIGN_DELIVERY_STATE.QUEUED,
claimToken: null,
claimExpiresAt: null,
- },
- );
+ })
+ .execute();
}
// Settling threw after the provider had already taken the batch, so the rows
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts
index 239dba8f98e..7e6be85c04a 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery-feedback.service.ts
@@ -1,20 +1,17 @@
import { Injectable } from '@nestjs/common';
-import { type QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
-
-import { CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
+import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
+import { CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { type CampaignProviderOutcome } from 'src/engine/core-modules/emailing-domain/types/campaign-provider-outcome.type';
import { buildCampaignDeliveryOutcomeUpdate } from 'src/engine/core-modules/emailing-domain/utils/build-campaign-delivery-outcome-update.util';
-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 { MessageCampaignStatisticsService } from 'src/modules/emailing/services/message-campaign-statistics.service';
import { isDefined } from 'twenty-shared/utils';
@Injectable()
export class MessageCampaignDeliveryFeedbackService {
constructor(
- @InjectWorkspaceScopedRepository(CampaignDeliveryEntity)
- private readonly campaignDeliveryRepository: WorkspaceScopedRepository<CampaignDeliveryEntity>,
+ private readonly workspaceOrmManager: WorkspaceOrmManager,
private readonly messageCampaignStatisticsService: MessageCampaignStatisticsService,
) {}
@@ -40,18 +37,22 @@ export class MessageCampaignDeliveryFeedbackService {
// update: providerMessageId is unique per workspace, so this settles the
// same single row, halves the queries a webhook costs, and closes the
// window where the row could change between the two.
- const { raw } = await this.campaignDeliveryRepository
- .createQueryBuilder()
- .update()
- .set(update as QueryDeepPartialEntity<CampaignDeliveryEntity>)
- .where('"workspaceId" = :workspaceId', { workspaceId })
- .andWhere('"providerMessageId" = :providerMessageId', {
- providerMessageId,
- })
- .returning(['campaignId'])
- .execute();
-
- const [updatedDelivery] = raw as { campaignId: string }[];
+ const {
+ generatedMaps: [updatedDelivery],
+ } = await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const campaignDeliveryRepository = this.workspaceOrmManager.getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
+ return campaignDeliveryRepository
+ .createQueryBuilder()
+ .where({ providerMessageId })
+ .update()
+ .set(update)
+ .returning(['campaignId'])
+ .execute();
+ }, buildSystemAuthContext(workspaceId));
if (!isDefined(updatedDelivery)) {
return;
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts
index e04ef84f259..7d1b5c4afd2 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-delivery.service.ts
@@ -2,7 +2,7 @@ import { Injectable, Logger } from '@nestjs/common';
import { In } from 'typeorm';
-import { CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
+import { CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
import { SEND_CAMPAIGN_EMAIL_JOB } from 'src/engine/core-modules/emailing-domain/constants/campaign.constant';
import { CLAIMABLE_CAMPAIGN_DELIVERY_STATES } from 'src/engine/core-modules/emailing-domain/constants/claimable-campaign-delivery-states.constant';
import { CAMPAIGN_SEND_RETRY_BACKOFF } from 'src/engine/core-modules/emailing-domain/constants/campaign-send-retry-backoff.constant';
@@ -17,8 +17,6 @@ import { MessageQueueService } from 'src/engine/core-modules/message-queue/servi
import { CAMPAIGN_DELIVERY_STATE } from 'src/engine/core-modules/emailing-domain/constants/campaign-delivery-state.constant';
import { CAMPAIGN_FAILURE_REASON } from 'src/engine/core-modules/emailing-domain/constants/campaign-failure-reason.constant';
import { CAMPAIGN_SKIP_REASON } from 'src/engine/core-modules/emailing-domain/constants/campaign-skip-reason.constant';
-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 { v4 } from 'uuid';
import { type EmailingDomainEmailContent } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-email-content.type';
import { type EmailingDomainSendEmailResult } from 'src/engine/core-modules/emailing-domain/drivers/types/emailing-domain-send-email-result.type';
@@ -26,7 +24,6 @@ import { type SendCampaignEmailJobData } from 'src/engine/core-modules/emailing-
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { type WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace-repository';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { SKIP_EVENT_EMISSION } from 'src/modules/emailing/constants/skip-event-emission.constant';
import { CampaignSendSlotService } from 'src/modules/emailing/services/campaign-send-slot.service';
import { CampaignVariableService } from 'src/modules/emailing/services/campaign-variable.service';
import { EmailBillingService } from 'src/modules/emailing/services/email-billing.service';
@@ -56,8 +53,6 @@ export class MessageCampaignDeliveryService {
private readonly logger = new Logger(MessageCampaignDeliveryService.name);
constructor(
- @InjectWorkspaceScopedRepository(CampaignDeliveryEntity)
- private readonly campaignDeliveryRepository: WorkspaceScopedRepository<CampaignDeliveryEntity>,
private readonly workspaceOrmManager: WorkspaceOrmManager,
private readonly emailingDomainSenderService: EmailingDomainSenderService,
private readonly emailBillingService: EmailBillingService,
@@ -73,13 +68,16 @@ export class MessageCampaignDeliveryService {
const { workspaceId, campaignId } = data;
await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
- const isStillClaimable = await this.campaignDeliveryRepository.existsBy(
- workspaceId,
- {
+ const isStillClaimable = await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
+ .existsBy({
id: data.messageId,
state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES),
- },
- );
+ });
if (!isStillClaimable) {
return;
@@ -114,7 +112,7 @@ export class MessageCampaignDeliveryService {
const messageRepository = this.workspaceOrmManager.getRepository(
MessageWorkspaceEntity,
{ shouldBypassPermissionChecks: true },
- SKIP_EVENT_EMISSION,
+ { shouldSkipEventEmission: true },
);
const sendContext = await this.loadSendContext({ data, campaign });
@@ -190,19 +188,26 @@ export class MessageCampaignDeliveryService {
campaignId: string;
messageId: string;
}): Promise<void> {
- const { affected } = await this.campaignDeliveryRepository.update(
- workspaceId,
- {
+ const { generatedMaps: failedDeliveries } = await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
+ .createQueryBuilder()
+ .where({
id: messageId,
state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES),
- },
- {
+ })
+ .update()
+ .set({
state: CAMPAIGN_DELIVERY_STATE.FAILED,
failureReason: CAMPAIGN_FAILURE_REASON.RATE_LIMITED,
- },
- );
+ })
+ .returning(['id'])
+ .execute();
- if (affected === 1) {
+ if (failedDeliveries.length === 1) {
this.logger.warn(
`Campaign ${campaignId} of workspace ${workspaceId} gave up on message ${messageId} after ${SEND_SLOT_RETRY.attemptLimit} refused send slots`,
);
@@ -221,7 +226,7 @@ export class MessageCampaignDeliveryService {
data: SendCampaignEmailJobData;
campaign: MessageCampaignWorkspaceEntity;
}): Promise<SendContext | null> {
- const { workspaceId, campaignId, messageId, personId } = data;
+ const { campaignId, messageId, personId } = data;
const campaignRepository = this.workspaceOrmManager.getRepository(
MessageCampaignWorkspaceEntity,
@@ -229,7 +234,6 @@ export class MessageCampaignDeliveryService {
);
const claimToken = await this.claimDeliveryForSending({
- workspaceId,
messageId,
});
@@ -244,7 +248,6 @@ export class MessageCampaignDeliveryService {
if (campaignAfterClaim?.status === MessageCampaignStatus.CANCELED) {
await this.settleClaimedDelivery({
- workspaceId,
messageId,
claimToken,
update: {
@@ -290,7 +293,6 @@ export class MessageCampaignDeliveryService {
if (isDefined(sendRefusal)) {
await this.settleClaimedDelivery({
- workspaceId,
messageId,
claimToken,
update: {
@@ -342,7 +344,6 @@ export class MessageCampaignDeliveryService {
}
const affected = await this.settleClaimedDelivery({
- workspaceId,
messageId,
claimToken,
update: {
@@ -398,7 +399,7 @@ export class MessageCampaignDeliveryService {
const associationRepository = this.workspaceOrmManager.getRepository(
MessageChannelMessageAssociationWorkspaceEntity,
{ shouldBypassPermissionChecks: true },
- SKIP_EVENT_EMISSION,
+ { shouldSkipEventEmission: true },
);
await associationRepository.update(
@@ -430,7 +431,6 @@ export class MessageCampaignDeliveryService {
);
} catch (error) {
await this.recordSendFailure({
- workspaceId,
messageId,
claimToken,
campaignId,
@@ -442,13 +442,11 @@ export class MessageCampaignDeliveryService {
}
private async recordSendFailure({
- workspaceId,
messageId,
claimToken,
campaignId,
error,
}: {
- workspaceId: string;
messageId: string;
claimToken: string;
campaignId: string;
@@ -458,7 +456,6 @@ export class MessageCampaignDeliveryService {
resolveCampaignSendFailure(error);
await this.settleClaimedDelivery({
- workspaceId,
messageId,
claimToken,
update: shouldRetry
@@ -480,42 +477,45 @@ export class MessageCampaignDeliveryService {
}
private async claimDeliveryForSending({
- workspaceId,
messageId,
}: {
- workspaceId: string;
messageId: string;
}): Promise<string | null> {
const claimToken = v4();
- const { affected } = await this.campaignDeliveryRepository.update(
- workspaceId,
- {
+ const { generatedMaps: claimedDeliveries } = await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
+ .createQueryBuilder()
+ .where({
id: messageId,
state: In(CLAIMABLE_CAMPAIGN_DELIVERY_STATES),
- },
- {
+ })
+ .update()
+ .set({
state: CAMPAIGN_DELIVERY_STATE.SENDING,
claimToken,
claimExpiresAt: new Date(Date.now() + CAMPAIGN_DELIVERY_CLAIM_TTL_MS),
- },
- );
+ })
+ .returning(['id'])
+ .execute();
- return affected === 1 ? claimToken : null;
+ return claimedDeliveries.length === 1 ? claimToken : null;
}
private async settleClaimedDelivery({
- workspaceId,
messageId,
claimToken,
update,
}: {
- workspaceId: string;
messageId: string;
claimToken: string;
update: Partial<
Pick<
- CampaignDeliveryEntity,
+ CampaignDeliveryWorkspaceEntity,
| 'state'
| 'skipReason'
| 'failureReason'
@@ -524,12 +524,19 @@ export class MessageCampaignDeliveryService {
>
>;
}): Promise<number> {
- const { affected } = await this.campaignDeliveryRepository.update(
- workspaceId,
- { id: messageId, claimToken },
- { ...update, claimToken: null, claimExpiresAt: null },
- );
-
- return affected ?? 0;
+ const { generatedMaps: settledDeliveries } = await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
+ .createQueryBuilder()
+ .where({ id: messageId, claimToken })
+ .update()
+ .set({ ...update, claimToken: null, claimExpiresAt: null })
+ .returning(['id'])
+ .execute();
+
+ return settledDeliveries.length;
}
}
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts
index 652ed72d9cf..f99a42c9767 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-lifecycle.service.ts
@@ -1,12 +1,10 @@
import { Injectable } from '@nestjs/common';
-import { CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
+import { CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
import { CAMPAIGN_DELIVERY_STATE } from 'src/engine/core-modules/emailing-domain/constants/campaign-delivery-state.constant';
import { CAMPAIGN_FAILURE_REASON } from 'src/engine/core-modules/emailing-domain/constants/campaign-failure-reason.constant';
import { UNFINISHED_CAMPAIGN_DELIVERY_STATES } from 'src/engine/core-modules/emailing-domain/constants/unfinished-campaign-delivery-states.constant';
import { CAMPAIGN_SKIP_REASON } from 'src/engine/core-modules/emailing-domain/constants/campaign-skip-reason.constant';
-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 { type FindOptionsWhere, In, IsNull, LessThan } from 'typeorm';
@@ -36,8 +34,6 @@ type CampaignStatusTransition = {
@Injectable()
export class MessageCampaignLifecycleService {
constructor(
- @InjectWorkspaceScopedRepository(CampaignDeliveryEntity)
- private readonly campaignDeliveryRepository: WorkspaceScopedRepository<CampaignDeliveryEntity>,
private readonly workspaceOrmManager: WorkspaceOrmManager,
private readonly userRoleService: UserRoleService,
private readonly messageCampaignStatisticsService: MessageCampaignStatisticsService,
@@ -255,10 +251,10 @@ export class MessageCampaignLifecycleService {
update,
}: {
workspaceId: string;
- criteria: FindOptionsWhere<CampaignDeliveryEntity>;
+ criteria: FindOptionsWhere<CampaignDeliveryWorkspaceEntity>;
update: Partial<
Pick<
- CampaignDeliveryEntity,
+ CampaignDeliveryWorkspaceEntity,
| 'state'
| 'skipReason'
| 'failureReason'
@@ -267,13 +263,24 @@ export class MessageCampaignLifecycleService {
>
>;
}): Promise<number> {
- const { affected } = await this.campaignDeliveryRepository.update(
- workspaceId,
- criteria,
- update,
- );
-
- return affected ?? 0;
+ const { generatedMaps: settledDeliveries } =
+ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const campaignDeliveryRepository =
+ this.workspaceOrmManager.getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
+ return campaignDeliveryRepository
+ .createQueryBuilder()
+ .where(criteria)
+ .update()
+ .set(update)
+ .returning(['id'])
+ .execute();
+ }, buildSystemAuthContext(workspaceId));
+
+ return settledDeliveries.length;
}
async finalizeCampaignIfComplete({
@@ -287,10 +294,18 @@ export class MessageCampaignLifecycleService {
// campaign. Counting reads every unfinished row only to compare it against
// zero; the probe stops at the first row the partial index yields.
const hasUnfinishedDelivery =
- await this.campaignDeliveryRepository.existsBy(workspaceId, {
- campaignId,
- state: In(UNFINISHED_CAMPAIGN_DELIVERY_STATES),
- });
+ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const campaignDeliveryRepository =
+ this.workspaceOrmManager.getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
+ return campaignDeliveryRepository.existsBy({
+ campaignId,
+ state: In(UNFINISHED_CAMPAIGN_DELIVERY_STATES),
+ });
+ }, buildSystemAuthContext(workspaceId));
if (hasUnfinishedDelivery) {
return;
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-materialization.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-materialization.service.ts
index e67e5a80ed1..dbd629f207a 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-materialization.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-materialization.service.ts
@@ -1,11 +1,9 @@
+import { CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
import { CAMPAIGN_SEND_RETRY_LIMIT } from 'src/engine/core-modules/emailing-domain/constants/campaign-send-retry-limit.constant';
import { CAMPAIGN_SEND_RETRY_BACKOFF } from 'src/engine/core-modules/emailing-domain/constants/campaign-send-retry-backoff.constant';
import { Injectable } from '@nestjs/common';
-import { CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
import { CAMPAIGN_DELIVERY_STATE } from 'src/engine/core-modules/emailing-domain/constants/campaign-delivery-state.constant';
-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 chunk from 'lodash.chunk';
import { In, type ObjectLiteral } from 'typeorm';
@@ -23,7 +21,6 @@ import { MessageQueueService } from 'src/engine/core-modules/message-queue/servi
import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
-import { SKIP_EVENT_EMISSION } from 'src/modules/emailing/constants/skip-event-emission.constant';
import { MessageCampaignLifecycleService } from 'src/modules/emailing/services/message-campaign-lifecycle.service';
import { MessageCampaignWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-campaign.workspace-entity';
import { type CampaignRecipient } from 'src/engine/core-modules/emailing-domain/types/campaign-recipient.type';
@@ -54,8 +51,6 @@ type CampaignMessageRow = {
@Injectable()
export class MessageCampaignMaterializationService {
constructor(
- @InjectWorkspaceScopedRepository(CampaignDeliveryEntity)
- private readonly campaignDeliveryRepository: WorkspaceScopedRepository<CampaignDeliveryEntity>,
private readonly workspaceOrmManager: WorkspaceOrmManager,
private readonly messageCampaignLifecycleService: MessageCampaignLifecycleService,
@InjectMessageQueue(MessageQueue.campaignQueue)
@@ -95,10 +90,16 @@ export class MessageCampaignMaterializationService {
recipients,
});
- const existingDeliveries = await this.campaignDeliveryRepository.find(
- workspaceId,
- { where: { campaignId }, select: { id: true, state: true } },
- );
+ const existingDeliveries = await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
+ .find({
+ where: { campaignId },
+ select: { id: true, state: true },
+ });
const existingMessageIds = new Set(
existingDeliveries.map((delivery) => delivery.id),
);
@@ -240,11 +241,11 @@ export class MessageCampaignMaterializationService {
}
// Driven by the whole chunk rather than by the recipients that still
- // needed message rows: a retry after a failed upsert sees their messages
+ // needed message rows: a retry after a failed insert sees their messages
// already materialized, and those recipients would otherwise never get a
- // delivery row and never be sent.
- await this.upsertQueuedDeliveries({
- workspaceId,
+ // delivery row and never be sent. Existing rows are left untouched so a
+ // retry cannot re-queue a delivery its send job already claimed or sent.
+ await this.insertMissingQueuedDeliveries({
campaignId,
recipients,
});
@@ -403,12 +404,10 @@ export class MessageCampaignMaterializationService {
});
}
- private async upsertQueuedDeliveries({
- workspaceId,
+ private async insertMissingQueuedDeliveries({
campaignId,
recipients,
}: {
- workspaceId: string;
campaignId: string;
recipients: CampaignMessageRecipient[];
}): Promise<void> {
@@ -416,17 +415,22 @@ export class MessageCampaignMaterializationService {
return;
}
- await this.campaignDeliveryRepository.upsert(
- workspaceId,
- recipients.map((recipient) => ({
- id: recipient.messageId,
- campaignId,
- personId: recipient.personId,
- recipientEmail: recipient.email,
- state: CAMPAIGN_DELIVERY_STATE.QUEUED,
- })),
- { conflictPaths: ['id'], skipUpdateIfNoValuesChanged: true },
- );
+ await this.workspaceOrmManager
+ .getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ )
+ .insert(
+ recipients.map((recipient) => ({
+ id: recipient.messageId,
+ campaignId,
+ personId: recipient.personId,
+ recipientEmail: recipient.email,
+ state: CAMPAIGN_DELIVERY_STATE.QUEUED,
+ })),
+ { onConflictDoNothing: true },
+ );
}
private async insertChunk({
@@ -452,7 +456,7 @@ export class MessageCampaignMaterializationService {
transactionScope.getRepository<T>(
objectName,
{ shouldBypassPermissionChecks: true },
- SKIP_EVENT_EMISSION,
+ { shouldSkipEventEmission: true },
);
await repositoryFor<MessageThreadWorkspaceEntity>(
diff --git a/packages/twenty-server/src/modules/emailing/services/message-campaign-statistics.service.ts b/packages/twenty-server/src/modules/emailing/services/message-campaign-statistics.service.ts
index e4123f6b5ae..a9d9db89a93 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-campaign-statistics.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-campaign-statistics.service.ts
@@ -1,3 +1,4 @@
+import { CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
import { CAMPAIGN_JOB_RETRY_LIMIT } from 'src/engine/core-modules/emailing-domain/constants/campaign-job-retry-limit.constant';
import { Injectable } from '@nestjs/common';
@@ -14,17 +15,15 @@ import {
REFRESH_CAMPAIGN_STATS_JOB,
} from 'src/engine/core-modules/emailing-domain/constants/campaign.constant';
import { type RefreshCampaignStatsJobData } from 'src/engine/core-modules/emailing-domain/types/refresh-campaign-stats-job-data.type';
-import { CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
import { type CampaignCountGroup } from 'src/engine/core-modules/emailing-domain/types/campaign-count-group.type';
import { type CampaignCounts } from 'src/engine/core-modules/emailing-domain/types/campaign-counts.type';
import { computeCampaignCounts } from 'src/engine/core-modules/emailing-domain/utils/compute-campaign-counts.util';
-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 { 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 { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
+import { getCampaignDeliveryTableName } from 'src/modules/emailing/utils/get-campaign-delivery-table-name.util';
import { MessageCampaignWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-campaign.workspace-entity';
const RECONCILIATION_WINDOW_MS = 7 * 24 * 60 * 60 * 1000;
@@ -33,8 +32,6 @@ const REFRESH_LOCK_TTL_MS = CAMPAIGN_STATS_REFRESH_DEBOUNCE_MS + 2_000;
@Injectable()
export class MessageCampaignStatisticsService {
constructor(
- @InjectWorkspaceScopedRepository(CampaignDeliveryEntity)
- private readonly campaignDeliveryRepository: WorkspaceScopedRepository<CampaignDeliveryEntity>,
private readonly workspaceOrmManager: WorkspaceOrmManager,
@InjectMessageQueue(MessageQueue.campaignQueue)
private readonly messageQueueService: MessageQueueService,
@@ -83,21 +80,30 @@ export class MessageCampaignStatisticsService {
workspaceId: string;
campaignId: string;
}): Promise<CampaignCounts> {
- const groups = await this.campaignDeliveryRepository
- .createQueryBuilder('delivery')
- .select('delivery.state', 'state')
- .addSelect('COUNT(*)', 'total')
- .addSelect('COUNT(delivery."deliveredAt")', 'deliveredCount')
- .addSelect('COUNT(delivery."bouncedAt")', 'bouncedCount')
- .addSelect('COUNT(delivery."complainedAt")', 'complainedCount')
- .addSelect(
- `COUNT(*) FILTER (WHERE delivery."rejectedAt" IS NOT NULL OR delivery."renderingFailedAt" IS NOT NULL)`,
- 'providerFailedCount',
- )
- .where('delivery."workspaceId" = :workspaceId', { workspaceId })
- .andWhere('delivery."campaignId" = :campaignId', { campaignId })
- .groupBy('delivery.state')
- .getRawMany<CampaignCountGroup>();
+ const groups = await this.workspaceOrmManager.executeInWorkspaceContext(
+ async () => {
+ const campaignDeliveryRepository =
+ this.workspaceOrmManager.getRepository(
+ CampaignDeliveryWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
+ return campaignDeliveryRepository.executeRaw<CampaignCountGroup>(
+ `SELECT
+ "state",
+ COUNT(*) AS "total",
+ COUNT("deliveredAt") AS "deliveredCount",
+ COUNT("bouncedAt") AS "bouncedCount",
+ COUNT("complainedAt") AS "complainedCount",
+ COUNT(*) FILTER (WHERE "rejectedAt" IS NOT NULL OR "renderingFailedAt" IS NOT NULL) AS "providerFailedCount"
+ FROM ${getCampaignDeliveryTableName(workspaceId)}
+ WHERE "campaignId" = :campaignId
+ GROUP BY "state"`,
+ { campaignId },
+ );
+ },
+ buildSystemAuthContext(workspaceId),
+ );
return computeCampaignCounts({ groups });
}
diff --git a/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts b/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts
index 9841f4f3f0c..e99a745c336 100644
--- a/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts
+++ b/packages/twenty-server/src/modules/emailing/services/message-suppression.service.ts
@@ -6,24 +6,24 @@ import {
isDefined,
isNonEmptyArray,
} from 'twenty-shared/utils';
-import { ILike, In, IsNull, Not, QueryFailedError } from 'typeorm';
+import { ILike, In, IsNull, Not } from 'typeorm';
-import { POSTGRESQL_ERROR_CODES } from 'src/engine/api/graphql/workspace-query-runner/constants/postgres-error-codes.constants';
-import { type QueryFailedErrorWithCode } from 'src/engine/api/graphql/workspace-query-runner/utils/workspace-query-runner-graphql-api-exception-handler.util';
+import { WorkspaceOrmManager } from 'src/engine/twenty-orm/workspace-orm.manager';
+import { buildSystemAuthContext } from 'src/engine/twenty-orm/utils/build-system-auth-context.util';
import { HARD_SUPPRESSION_REASONS } from 'src/engine/core-modules/emailing-domain/constants/hard-suppression-reasons.constant';
import {
EmailingDomainException,
EmailingDomainExceptionCode,
} from 'src/engine/core-modules/emailing-domain/exceptions/emailing-domain.exception';
-import { MessageSuppressionEntity } from 'src/engine/core-modules/emailing-domain/message-suppression.entity';
+import { MessageSuppressionWorkspaceEntity } from 'src/modules/emailing/standard-objects/message-suppression.workspace-entity';
import { MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';
import { MessageSuppressionSource } from 'src/engine/core-modules/emailing-domain/types/message-suppression-source.type';
import { type TopicOptOutState } from 'src/engine/core-modules/emailing-domain/types/topic-opt-out-state.type';
import { type UnsubscribeTopicEntity } from 'src/engine/core-modules/emailing-domain/unsubscribe-topic.entity';
-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 { UnsubscribeTopicService } from 'src/modules/emailing/services/unsubscribe-topic.service';
+const SUPPRESSION_INSERT_ATTEMPTS = 2;
+
type FindSuppressionsArgs = {
workspaceId: string;
reason?: MessageSuppressionReason;
@@ -74,8 +74,7 @@ type SetTopicOptOutsArgs = {
@Injectable()
export class MessageSuppressionService {
constructor(
- @InjectWorkspaceScopedRepository(MessageSuppressionEntity)
- private readonly suppressionRepository: WorkspaceScopedRepository<MessageSuppressionEntity>,
+ private readonly workspaceOrmManager: WorkspaceOrmManager,
private readonly unsubscribeTopicService: UnsubscribeTopicService,
) {}
@@ -87,26 +86,31 @@ export class MessageSuppressionService {
limit,
offset,
}: FindSuppressionsArgs): Promise<{
- records: MessageSuppressionEntity[];
+ records: MessageSuppressionWorkspaceEntity[];
totalCount: number;
}> {
- const [records, totalCount] = await this.suppressionRepository.findAndCount(
- workspaceId,
- {
- where: {
- ...(isDefined(reason) ? { reason } : {}),
- ...(isNonEmptyString(unsubscribeTopicId)
- ? { unsubscribeTopicId }
- : {}),
- ...(isNonEmptyString(searchTerm)
- ? { emailAddress: ILike(`%${escapeForIlike(searchTerm)}%`) }
- : {}),
- },
- order: { createdAt: 'DESC' },
- take: limit,
- skip: offset,
- },
- );
+ const [records, totalCount] =
+ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const suppressionRepository = this.workspaceOrmManager.getRepository(
+ MessageSuppressionWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
+ return suppressionRepository.findAndCount({
+ where: {
+ ...(isDefined(reason) ? { reason } : {}),
+ ...(isNonEmptyString(unsubscribeTopicId)
+ ? { unsubscribeTopicId }
+ : {}),
+ ...(isNonEmptyString(searchTerm)
+ ? { emailAddress: ILike(`%${escapeForIlike(searchTerm)}%`) }
+ : {}),
+ },
+ order: { createdAt: 'DESC' },
+ take: limit,
+ skip: offset,
+ });
+ }, buildSystemAuthContext(workspaceId));
return { records, totalCount };
}
@@ -115,24 +119,33 @@ export class MessageSuppressionService {
workspaceId,
emailAddresses,
unsubscribeTopicId,
- }: FindApplicableSuppressionsArgs): Promise<MessageSuppressionEntity[]> {
+ }: FindApplicableSuppressionsArgs): Promise<
+ MessageSuppressionWorkspaceEntity[]
+ > {
const normalizedAddresses = this.normalizeAddresses(emailAddresses);
if (!isNonEmptyArray(normalizedAddresses)) {
return [];
}
- return this.suppressionRepository.find(workspaceId, {
- where: [
- {
- emailAddress: In(normalizedAddresses),
- unsubscribeTopicId: IsNull(),
- },
- ...(isNonEmptyString(unsubscribeTopicId)
- ? [{ emailAddress: In(normalizedAddresses), unsubscribeTopicId }]
- : []),
- ],
- });
+ return this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const suppressionRepository = this.workspaceOrmManager.getRepository(
+ MessageSuppressionWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
+ return suppressionRepository.find({
+ where: [
+ {
+ emailAddress: In(normalizedAddresses),
+ unsubscribeTopicId: IsNull(),
+ },
+ ...(isNonEmptyString(unsubscribeTopicId)
+ ? [{ emailAddress: In(normalizedAddresses), unsubscribeTopicId }]
+ : []),
+ ],
+ });
+ }, buildSystemAuthContext(workspaceId));
}
async suppress({
@@ -160,71 +173,88 @@ export class MessageSuppressionService {
: IsNull(),
};
- const escalateExisting = async (): Promise<boolean> => {
- const existing = await this.suppressionRepository.findOneBy(
- workspaceId,
- whereKey,
+ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const suppressionRepository = this.workspaceOrmManager.getRepository(
+ MessageSuppressionWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
);
-
- if (!isDefined(existing)) {
- return false;
- }
-
- if (this.shouldEscalate(existing.reason, reason)) {
- await this.suppressionRepository.update(
- workspaceId,
- { id: existing.id },
- { reason, source, providerEventId },
+ const escalateExisting = async (): Promise<boolean> => {
+ const existing = await suppressionRepository.findOneBy(whereKey);
+
+ if (!isDefined(existing)) {
+ return false;
+ }
+
+ if (this.shouldEscalate(existing.reason, reason)) {
+ await suppressionRepository
+ .createQueryBuilder()
+ .where({ id: existing.id })
+ .update()
+ .set({ reason, source, providerEventId })
+ .execute();
+ }
+
+ return true;
+ };
+
+ for (
+ let insertAttempt = 1;
+ insertAttempt <= SUPPRESSION_INSERT_ATTEMPTS;
+ insertAttempt++
+ ) {
+ if (await escalateExisting()) {
+ return;
+ }
+
+ const { identifiers } = await suppressionRepository.insert(
+ {
+ emailAddress: normalizedEmailAddress,
+ reason,
+ source,
+ providerEventId,
+ unsubscribeTopicId: effectiveTopicId,
+ },
+ { onConflictDoNothing: true },
);
- }
-
- return true;
- };
- if (await escalateExisting()) {
- return;
- }
-
- try {
- await this.suppressionRepository.insert(workspaceId, {
- emailAddress: normalizedEmailAddress,
- reason,
- source,
- providerEventId,
- unsubscribeTopicId: effectiveTopicId,
- });
- } catch (error) {
- const isUniqueViolation =
- error instanceof QueryFailedError &&
- (error as QueryFailedErrorWithCode).code ===
- POSTGRESQL_ERROR_CODES.UNIQUE_VIOLATION;
-
- if (!isUniqueViolation || !(await escalateExisting())) {
- throw error;
+ if (identifiers.length > 0) {
+ return;
+ }
}
- }
+
+ throw new EmailingDomainException(
+ `Suppression for ${normalizedEmailAddress} kept conflicting with a row that disappeared before it could be read`,
+ EmailingDomainExceptionCode.MESSAGE_SUPPRESSION_NOT_FOUND,
+ );
+ }, buildSystemAuthContext(workspaceId));
}
async suppressManually({
workspaceId,
emailAddress,
unsubscribeTopicId,
- }: SuppressManuallyArgs): Promise<MessageSuppressionEntity> {
+ }: SuppressManuallyArgs): Promise<MessageSuppressionWorkspaceEntity> {
await this.recordUnsubscribe({
workspaceId,
emailAddress,
unsubscribeTopicId,
});
- const suppression = await this.suppressionRepository.findOneBy(
- workspaceId,
- {
- emailAddress: this.normalizeEmailAddress(emailAddress),
- unsubscribeTopicId: isNonEmptyString(unsubscribeTopicId)
- ? unsubscribeTopicId
- : IsNull(),
- },
- );
+ const suppression =
+ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const suppressionRepository = this.workspaceOrmManager.getRepository(
+ MessageSuppressionWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
+ return suppressionRepository.findOneBy({
+ emailAddress: this.normalizeEmailAddress(emailAddress),
+ unsubscribeTopicId: isNonEmptyString(unsubscribeTopicId)
+ ? unsubscribeTopicId
+ : IsNull(),
+ });
+ }, buildSystemAuthContext(workspaceId));
if (!isDefined(suppression)) {
throw new EmailingDomainException(
@@ -240,29 +270,35 @@ export class MessageSuppressionService {
workspaceId,
suppressionId,
}: RemoveSuppressionArgs): Promise<void> {
- const suppression = await this.suppressionRepository.findOneBy(
- workspaceId,
- { id: suppressionId },
- );
-
- if (!isDefined(suppression)) {
- throw new EmailingDomainException(
- `Suppression ${suppressionId} not found`,
- EmailingDomainExceptionCode.MESSAGE_SUPPRESSION_NOT_FOUND,
+ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const suppressionRepository = this.workspaceOrmManager.getRepository(
+ MessageSuppressionWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
);
- }
+ const suppression = await suppressionRepository.findOneBy({
+ id: suppressionId,
+ });
- const { affected } = await this.suppressionRepository.delete(workspaceId, {
- id: suppressionId,
- reason: Not(In(HARD_SUPPRESSION_REASONS)),
- });
+ if (!isDefined(suppression)) {
+ throw new EmailingDomainException(
+ `Suppression ${suppressionId} not found`,
+ EmailingDomainExceptionCode.MESSAGE_SUPPRESSION_NOT_FOUND,
+ );
+ }
- if (affected === 0) {
- throw new EmailingDomainException(
- `Suppression ${suppressionId} records a ${suppression.reason} and cannot be removed`,
- EmailingDomainExceptionCode.MESSAGE_SUPPRESSION_NOT_REMOVABLE,
- );
- }
+ const { affected } = await suppressionRepository.delete({
+ id: suppressionId,
+ reason: Not(In(HARD_SUPPRESSION_REASONS)),
+ });
+
+ if (affected === 0) {
+ throw new EmailingDomainException(
+ `Suppression ${suppressionId} records a ${suppression.reason} and cannot be removed`,
+ EmailingDomainExceptionCode.MESSAGE_SUPPRESSION_NOT_REMOVABLE,
+ );
+ }
+ }, buildSystemAuthContext(workspaceId));
}
async getTopicOptOutState({
@@ -282,20 +318,30 @@ export class MessageSuppressionService {
return [];
}
- const optOuts = await this.suppressionRepository.find(workspaceId, {
- where: [
- {
- emailAddress: normalizedEmailAddress,
- reason: MessageSuppressionReason.UNSUBSCRIBE,
- unsubscribeTopicId: In(visibleTopics.map((topic) => topic.id)),
- },
- {
- emailAddress: normalizedEmailAddress,
- reason: MessageSuppressionReason.UNSUBSCRIBE,
- unsubscribeTopicId: IsNull(),
- },
- ],
- });
+ const optOuts = await this.workspaceOrmManager.executeInWorkspaceContext(
+ async () => {
+ const suppressionRepository = this.workspaceOrmManager.getRepository(
+ MessageSuppressionWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
+ return suppressionRepository.find({
+ where: [
+ {
+ emailAddress: normalizedEmailAddress,
+ reason: MessageSuppressionReason.UNSUBSCRIBE,
+ unsubscribeTopicId: In(visibleTopics.map((topic) => topic.id)),
+ },
+ {
+ emailAddress: normalizedEmailAddress,
+ reason: MessageSuppressionReason.UNSUBSCRIBE,
+ unsubscribeTopicId: IsNull(),
+ },
+ ],
+ });
+ },
+ buildSystemAuthContext(workspaceId),
+ );
const optedOutTopicIds = new Set(
optOuts
@@ -413,13 +459,20 @@ export class MessageSuppressionService {
): Promise<void> {
const normalizedEmailAddress = this.normalizeEmailAddress(emailAddress);
- await this.suppressionRepository.delete(workspaceId, {
- emailAddress: normalizedEmailAddress,
- unsubscribeTopicId: isNonEmptyString(unsubscribeTopicId)
- ? unsubscribeTopicId
- : IsNull(),
- reason: MessageSuppressionReason.UNSUBSCRIBE,
- });
+ await this.workspaceOrmManager.executeInWorkspaceContext(async () => {
+ const suppressionRepository = this.workspaceOrmManager.getRepository(
+ MessageSuppressionWorkspaceEntity,
+ { shouldBypassPermissionChecks: true },
+ { shouldSkipEventEmission: true },
+ );
+ return suppressionRepository.delete({
+ emailAddress: normalizedEmailAddress,
+ unsubscribeTopicId: isNonEmptyString(unsubscribeTopicId)
+ ? unsubscribeTopicId
+ : IsNull(),
+ reason: MessageSuppressionReason.UNSUBSCRIBE,
+ });
+ }, buildSystemAuthContext(workspaceId));
}
private normalizeEmailAddress(emailAddress: string): string {
diff --git a/packages/twenty-server/src/modules/emailing/standard-objects/campaign-delivery.workspace-entity.ts b/packages/twenty-server/src/modules/emailing/standard-objects/campaign-delivery.workspace-entity.ts
new file mode 100644
index 00000000000..da86f357a21
--- /dev/null
+++ b/packages/twenty-server/src/modules/emailing/standard-objects/campaign-delivery.workspace-entity.ts
@@ -0,0 +1,25 @@
+import { type CampaignDeliveryState } from 'src/engine/core-modules/emailing-domain/types/campaign-delivery-state.type';
+import { type CampaignFailureReason } from 'src/engine/core-modules/emailing-domain/types/campaign-failure-reason.type';
+import { type CampaignSkipReason } from 'src/engine/core-modules/emailing-domain/types/campaign-skip-reason.type';
+
+export class CampaignDeliveryWorkspaceEntity {
+ id: string;
+ createdAt: Date;
+ updatedAt: Date;
+ deletedAt: Date | null;
+ campaignId: string;
+ personId: string;
+ recipientEmail: string;
+ state: CampaignDeliveryState;
+ skipReason: CampaignSkipReason | null;
+ failureReason: CampaignFailureReason | null;
+ claimToken: string | null;
+ claimExpiresAt: Date | null;
+ providerMessageId: string | null;
+ sentAt: Date | null;
+ deliveredAt: Date | null;
+ bouncedAt: Date | null;
+ complainedAt: Date | null;
+ rejectedAt: Date | null;
+ renderingFailedAt: Date | null;
+}
diff --git a/packages/twenty-server/src/modules/emailing/standard-objects/message-suppression.workspace-entity.ts b/packages/twenty-server/src/modules/emailing/standard-objects/message-suppression.workspace-entity.ts
new file mode 100644
index 00000000000..64d8cd76e70
--- /dev/null
+++ b/packages/twenty-server/src/modules/emailing/standard-objects/message-suppression.workspace-entity.ts
@@ -0,0 +1,14 @@
+import { type MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';
+import { type MessageSuppressionSource } from 'src/engine/core-modules/emailing-domain/types/message-suppression-source.type';
+
+export class MessageSuppressionWorkspaceEntity {
+ id: string;
+ createdAt: Date;
+ updatedAt: Date;
+ deletedAt: Date | null;
+ emailAddress: string;
+ reason: MessageSuppressionReason;
+ source: MessageSuppressionSource;
+ providerEventId: string | null;
+ unsubscribeTopicId: string | null;
+}
diff --git a/packages/twenty-server/src/modules/emailing/types/campaign-delivery-settlement.type.ts b/packages/twenty-server/src/modules/emailing/types/campaign-delivery-settlement.type.ts
index 37d03f90ec2..8a8ec369ee4 100644
--- a/packages/twenty-server/src/modules/emailing/types/campaign-delivery-settlement.type.ts
+++ b/packages/twenty-server/src/modules/emailing/types/campaign-delivery-settlement.type.ts
@@ -1,6 +1,6 @@
-import { type CampaignDeliveryEntity } from 'src/engine/core-modules/emailing-domain/campaign-delivery.entity';
+import { type CampaignDeliveryWorkspaceEntity } from 'src/modules/emailing/standard-objects/campaign-delivery.workspace-entity';
export type CampaignDeliverySettlement = Pick<
- CampaignDeliveryEntity,
+ CampaignDeliveryWorkspaceEntity,
'state' | 'skipReason' | 'failureReason' | 'providerMessageId' | 'sentAt'
> & { deliveryId: string };
diff --git a/packages/twenty-server/src/modules/emailing/utils/__tests__/build-campaign-delivery-settle-query.util.spec.ts b/packages/twenty-server/src/modules/emailing/utils/__tests__/build-campaign-delivery-settle-query.util.spec.ts
index f97f057691a..beb4c1f8034 100644
--- a/packages/twenty-server/src/modules/emailing/utils/__tests__/build-campaign-delivery-settle-query.util.spec.ts
+++ b/packages/twenty-server/src/modules/emailing/utils/__tests__/build-campaign-delivery-settle-query.util.spec.ts
@@ -19,7 +19,7 @@ const buildSettlement = (
describe('buildCampaignDeliverySettleQuery', () => {
it('keeps every settlement on its own row across the parallel arrays', () => {
const { parameters } = buildCampaignDeliverySettleQuery({
- workspaceId: 'workspace-1',
+ campaignDeliveryTableName: '"workspace_1"."campaignDelivery"',
claimToken: 'claim-1',
settlements: [
buildSettlement({
@@ -35,14 +35,14 @@ describe('buildCampaignDeliverySettleQuery', () => {
],
});
- const [
+ const {
deliveryIds,
states,
skipReasons,
failureReasons,
providerMessageIds,
sentAtValues,
- ] = parameters;
+ } = parameters;
expect(deliveryIds).toEqual(['delivery-a', 'delivery-b']);
expect(states).toEqual([
@@ -57,7 +57,7 @@ describe('buildCampaignDeliverySettleQuery', () => {
it('settles two people who share an email address as two separate deliveries', () => {
const { parameters } = buildCampaignDeliverySettleQuery({
- workspaceId: 'workspace-1',
+ campaignDeliveryTableName: '"workspace_1"."campaignDelivery"',
claimToken: 'claim-1',
settlements: [
buildSettlement({
@@ -73,26 +73,31 @@ describe('buildCampaignDeliverySettleQuery', () => {
],
});
- expect(parameters[0]).toEqual(['delivery-first', 'delivery-second']);
- expect(parameters[4]).toEqual(['provider-first', 'provider-second']);
+ expect(parameters.deliveryIds).toEqual([
+ 'delivery-first',
+ 'delivery-second',
+ ]);
+ expect(parameters.providerMessageIds).toEqual([
+ 'provider-first',
+ 'provider-second',
+ ]);
});
- it('scopes the update to the workspace and the claim that is being settled', () => {
+ it('scopes the update to the workspace table and the claim that is being settled', () => {
const { sql, parameters } = buildCampaignDeliverySettleQuery({
- workspaceId: 'workspace-1',
+ campaignDeliveryTableName: '"workspace_1"."campaignDelivery"',
claimToken: 'claim-1',
settlements: [buildSettlement({ deliveryId: 'delivery-a' })],
});
- expect(sql).toContain('delivery."workspaceId" = $7');
- expect(sql).toContain('delivery."claimToken" = $8');
- expect(parameters[6]).toBe('workspace-1');
- expect(parameters[7]).toBe('claim-1');
+ expect(sql).toContain('UPDATE "workspace_1"."campaignDelivery" delivery');
+ expect(sql).toContain('delivery."claimToken" = :claimToken');
+ expect(parameters.claimToken).toBe('claim-1');
});
it('returns the settled ids from a select so the driver reports rows rather than an update tuple', () => {
const { sql } = buildCampaignDeliverySettleQuery({
- workspaceId: 'workspace-1',
+ campaignDeliveryTableName: '"workspace_1"."campaignDelivery"',
claimToken: 'claim-1',
settlements: [buildSettlement({ deliveryId: 'delivery-a' })],
});
@@ -103,7 +108,7 @@ describe('buildCampaignDeliverySettleQuery', () => {
it('advances updatedAt so staleness checks see the settle', () => {
const { sql } = buildCampaignDeliverySettleQuery({
- workspaceId: 'workspace-1',
+ campaignDeliveryTableName: '"workspace_1"."campaignDelivery"',
claimToken: 'claim-1',
settlements: [buildSettlement({ deliveryId: 'delivery-a' })],
});
diff --git a/packages/twenty-server/src/modules/emailing/utils/build-campaign-delivery-settle-query.util.ts b/packages/twenty-server/src/modules/emailing/utils/build-campaign-delivery-settle-query.util.ts
index d6720748419..97c184bf07d 100644
--- a/packages/twenty-server/src/modules/emailing/utils/build-campaign-delivery-settle-query.util.ts
+++ b/packages/twenty-server/src/modules/emailing/utils/build-campaign-delivery-settle-query.util.ts
@@ -1,17 +1,17 @@
import { type CampaignDeliverySettlement } from 'src/modules/emailing/types/campaign-delivery-settlement.type';
export const buildCampaignDeliverySettleQuery = ({
- workspaceId,
+ campaignDeliveryTableName,
claimToken,
settlements,
}: {
- workspaceId: string;
+ campaignDeliveryTableName: string;
claimToken: string;
settlements: CampaignDeliverySettlement[];
-}): { sql: string; parameters: unknown[] } => ({
+}): { sql: string; parameters: Record<string, unknown> } => ({
sql: `
WITH settled AS (
- UPDATE "core"."campaignDelivery" delivery
+ UPDATE ${campaignDeliveryTableName} delivery
SET
"state" = source."state",
"skipReason" = source."skipReason",
@@ -21,23 +21,25 @@ WITH settled AS (
"updatedAt" = now(),
"claimToken" = NULL,
"claimExpiresAt" = NULL
- FROM unnest($1::uuid[], $2::text[], $3::text[], $4::text[], $5::text[], $6::timestamptz[])
+ FROM unnest(:deliveryIds::uuid[], :states::text[], :skipReasons::text[], :failureReasons::text[], :providerMessageIds::text[], :sentAtValues::timestamptz[])
AS source("id", "state", "skipReason", "failureReason", "providerMessageId", "sentAt")
WHERE delivery."id" = source."id"
- AND delivery."workspaceId" = $7
- AND delivery."claimToken" = $8
+ AND delivery."claimToken" = :claimToken
RETURNING delivery."id"
)
SELECT "id" FROM settled
`,
- parameters: [
- settlements.map(({ deliveryId }) => deliveryId),
- settlements.map(({ state }) => state),
- settlements.map(({ skipReason }) => skipReason ?? null),
- settlements.map(({ failureReason }) => failureReason ?? null),
- settlements.map(({ providerMessageId }) => providerMessageId ?? null),
- settlements.map(({ sentAt }) => sentAt ?? null),
- workspaceId,
+ parameters: {
+ deliveryIds: settlements.map(({ deliveryId }) => deliveryId),
+ states: settlements.map(({ state }) => state),
+ skipReasons: settlements.map(({ skipReason }) => skipReason ?? null),
+ failureReasons: settlements.map(
+ ({ failureReason }) => failureReason ?? null,
+ ),
+ providerMessageIds: settlements.map(
+ ({ providerMessageId }) => providerMessageId ?? null,
+ ),
+ sentAtValues: settlements.map(({ sentAt }) => sentAt ?? null),
claimToken,
- ],
+ },
});
diff --git a/packages/twenty-server/src/modules/emailing/utils/get-campaign-delivery-table-name.util.ts b/packages/twenty-server/src/modules/emailing/utils/get-campaign-delivery-table-name.util.ts
new file mode 100644
index 00000000000..1bde424877d
--- /dev/null
+++ b/packages/twenty-server/src/modules/emailing/utils/get-campaign-delivery-table-name.util.ts
@@ -0,0 +1,5 @@
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
+import { escapeIdentifier } from 'src/engine/workspace-manager/workspace-migration/utils/remove-sql-injection.util';
+
+export const getCampaignDeliveryTableName = (workspaceId: string): string =>
+ `${escapeIdentifier(getWorkspaceSchemaName(workspaceId))}.${escapeIdentifier('campaignDelivery')}`;
diff --git a/packages/twenty-server/test/integration/aws/suites/ses-inbound-webhook.integration-spec.ts b/packages/twenty-server/test/integration/aws/suites/ses-inbound-webhook.integration-spec.ts
index 5a13c6d7b05..e5d416e0cf7 100644
--- a/packages/twenty-server/test/integration/aws/suites/ses-inbound-webhook.integration-spec.ts
+++ b/packages/twenty-server/test/integration/aws/suites/ses-inbound-webhook.integration-spec.ts
@@ -3,10 +3,10 @@ import { randomUUID } from 'node:crypto';
import { http, HttpResponse } from 'msw';
import request from 'supertest';
-import { MessageSuppressionEntity } from 'src/engine/core-modules/emailing-domain/message-suppression.entity';
import { UnsubscribeTokenService } from 'src/engine/core-modules/emailing-domain/services/unsubscribe-token.service';
import { MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import {
snsNotification,
@@ -15,7 +15,6 @@ import {
} from 'test/integration/aws/mocks/sns-payload.util';
import { updateConfigVariable } from 'test/integration/twenty-config/utils/update-config-variable.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
import { setupHttpMock } from 'test/integration/utils/http-mock.util';
const ALLOWED_TOPIC_ARN =
@@ -54,9 +53,11 @@ describe('SES inbound webhook (integration)', () => {
let unsubscribeTokenService: UnsubscribeTokenService;
const findSuppressionReasons = async (emailAddress: string) => {
- const suppressions = await getCoreRepository<MessageSuppressionEntity>(
- MessageSuppressionEntity,
- ).findBy({ workspaceId: SEED_APPLE_WORKSPACE_ID, emailAddress });
+ const suppressions: { reason: MessageSuppressionReason }[] =
+ await global.testDataSource.query(
+ `SELECT "reason" FROM "${getWorkspaceSchemaName(SEED_APPLE_WORKSPACE_ID)}"."messageSuppression" WHERE "emailAddress" = $1`,
+ [emailAddress],
+ );
return suppressions.map((suppression) => suppression.reason);
};
diff --git a/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression.integration-spec.ts b/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression.integration-spec.ts
index f29117fd0d9..b5ca0fdc870 100644
--- a/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression.integration-spec.ts
+++ b/packages/twenty-server/test/integration/metadata/suites/emailing/message-suppression.integration-spec.ts
@@ -6,6 +6,9 @@ import { v4 } from 'uuid';
import { isDefined } from 'twenty-shared/utils';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
+
+const MESSAGE_SUPPRESSION_TABLE = `"${getWorkspaceSchemaName(SEED_APPLE_WORKSPACE_ID)}"."messageSuppression"`;
const CREATE_MESSAGE_SUPPRESSION = gql`
mutation CreateMessageSuppression($input: CreateMessageSuppressionInput!) {
@@ -60,7 +63,7 @@ describe('messageSuppressionResolver (integration)', () => {
afterEach(async () => {
for (const id of createdSuppressionIds) {
await testDataSource
- .query('DELETE FROM core."messageSuppression" WHERE id = $1', [id])
+ .query(`DELETE FROM ${MESSAGE_SUPPRESSION_TABLE} WHERE id = $1`, [id])
.catch(() => {});
}
createdSuppressionIds.length = 0;
@@ -86,10 +89,10 @@ describe('messageSuppressionResolver (integration)', () => {
const suppressionId = v4();
await testDataSource.query(
- `INSERT INTO core."messageSuppression"
- ("id", "workspaceId", "emailAddress", "reason", "source", "providerEventId", "unsubscribeTopicId")
- VALUES ($1, $2, $3, 'BOUNCE', 'WEBHOOK', NULL, NULL)`,
- [suppressionId, SEED_APPLE_WORKSPACE_ID, emailAddress],
+ `INSERT INTO ${MESSAGE_SUPPRESSION_TABLE}
+ ("id", "emailAddress", "reason", "source", "providerEventId", "unsubscribeTopicId")
+ VALUES ($1, $2, 'BOUNCE', 'WEBHOOK', NULL, NULL)`,
+ [suppressionId, emailAddress],
);
createdSuppressionIds.push(suppressionId);
diff --git a/packages/twenty-server/test/integration/resend/suites/resend-webhook.integration-spec.ts b/packages/twenty-server/test/integration/resend/suites/resend-webhook.integration-spec.ts
index 91713dbac09..57f03a9d905 100644
--- a/packages/twenty-server/test/integration/resend/suites/resend-webhook.integration-spec.ts
+++ b/packages/twenty-server/test/integration/resend/suites/resend-webhook.integration-spec.ts
@@ -2,14 +2,13 @@ import { createHmac, randomUUID } from 'node:crypto';
import request from 'supertest';
-import { MessageSuppressionEntity } from 'src/engine/core-modules/emailing-domain/message-suppression.entity';
import { UnsubscribeTokenService } from 'src/engine/core-modules/emailing-domain/services/unsubscribe-token.service';
import { MessageSuppressionReason } from 'src/engine/core-modules/emailing-domain/types/message-suppression-reason.type';
import { SEED_APPLE_WORKSPACE_ID } from 'src/engine/workspace-manager/dev-seeder/core/constants/seeder-workspaces.constant';
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
import { updateConfigVariable } from 'test/integration/twenty-config/utils/update-config-variable.util';
import { getAppProviderByClassName } from 'test/integration/utils/get-app-provider-by-class-name.util';
-import { getCoreRepository } from 'test/integration/utils/get-core-repository.util';
const SECRET_BYTES = Buffer.from('resend-integration-signing-secret');
const SIGNING_SECRET = `whsec_${SECRET_BYTES.toString('base64')}`;
@@ -56,9 +55,11 @@ describe('Resend webhook (integration)', () => {
let unsubscribeTokenService: UnsubscribeTokenService;
const readSuppressionReasons = async (emailAddress: string) => {
- const suppressions = await getCoreRepository<MessageSuppressionEntity>(
- MessageSuppressionEntity,
- ).findBy({ workspaceId: SEED_APPLE_WORKSPACE_ID, emailAddress });
+ const suppressions: { reason: MessageSuppressionReason }[] =
+ await global.testDataSource.query(
+ `SELECT "reason" FROM "${getWorkspaceSchemaName(SEED_APPLE_WORKSPACE_ID)}"."messageSuppression" WHERE "emailAddress" = $1`,
+ [emailAddress],
+ );
return suppressions.map((suppression) => suppression.reason);
};
@@ -79,9 +80,7 @@ describe('Resend webhook (integration)', () => {
};
const readSuppressionReasonsAfterSettle = async (emailAddress: string) => {
- await new Promise((resolve) =>
- setTimeout(resolve, SUPPRESSION_SETTLE_MS),
- );
+ await new Promise((resolve) => setTimeout(resolve, SUPPRESSION_SETTLE_MS));
return readSuppressionReasons(emailAddress);
};
@@ -154,9 +153,7 @@ describe('Resend webhook (integration)', () => {
);
expect(response.status).toBe(200);
- expect(
- await readSuppressionReasonsAfterSettle(emailAddress),
- ).toEqual([]);
+ expect(await readSuppressionReasonsAfterSettle(emailAddress)).toEqual([]);
}, 60000);
it('suppresses nothing for a bounce without a workspace tag', async () => {
@@ -174,9 +171,7 @@ describe('Resend webhook (integration)', () => {
);
expect(response.status).toBe(200);
- expect(
- await readSuppressionReasonsAfterSettle(emailAddress),
- ).toEqual([]);
+ expect(await readSuppressionReasonsAfterSettle(emailAddress)).toEqual([]);
}, 60000);
it('suppresses the sender of a received email addressed to the unsubscribe mailbox', async () => {
diff --git a/packages/twenty-server/test/integration/upgrade/suites/campaign-delivery-claim.integration-spec.ts b/packages/twenty-server/test/integration/upgrade/suites/campaign-delivery-claim.integration-spec.ts
index ce7acf3b7db..de9fdca50df 100644
--- a/packages/twenty-server/test/integration/upgrade/suites/campaign-delivery-claim.integration-spec.ts
+++ b/packages/twenty-server/test/integration/upgrade/suites/campaign-delivery-claim.integration-spec.ts
@@ -3,6 +3,8 @@ import { isDefined } from 'twenty-shared/utils';
import { DataSource } from 'typeorm';
import { v4 } from 'uuid';
+import { getWorkspaceSchemaName } from 'src/engine/workspace-datasource/utils/get-workspace-schema-name.util';
+
jest.useRealTimers();
config({
@@ -14,7 +16,7 @@ const CLAIM_TTL_MS = 5 * 60 * 1000;
describe('campaignDelivery claim protocol (integration)', () => {
let dataSource: DataSource;
- let workspaceId: string;
+ let campaignDeliveryTableName: string;
const seededDeliveryIds: string[] = [];
const claim = async (
@@ -23,7 +25,7 @@ describe('campaignDelivery claim protocol (integration)', () => {
const claimToken = v4();
const [, affected] = await dataSource.query(
- `UPDATE "core"."campaignDelivery"
+ `UPDATE ${campaignDeliveryTableName}
SET "state" = 'SENDING', "claimToken" = $1, "claimExpiresAt" = $2
WHERE "id" = $3 AND "state" IN ('QUEUED', 'FAILED')`,
[claimToken, new Date(Date.now() + CLAIM_TTL_MS), deliveryId],
@@ -37,7 +39,7 @@ describe('campaignDelivery claim protocol (integration)', () => {
claimToken: string,
): Promise<number> => {
const [, affected] = await dataSource.query(
- `UPDATE "core"."campaignDelivery"
+ `UPDATE ${campaignDeliveryTableName}
SET "state" = 'SENT', "claimToken" = NULL, "claimExpiresAt" = NULL
WHERE "id" = $1 AND "claimToken" = $2`,
[deliveryId, claimToken],
@@ -50,10 +52,10 @@ describe('campaignDelivery claim protocol (integration)', () => {
const deliveryId = v4();
await dataSource.query(
- `INSERT INTO "core"."campaignDelivery"
- ("id", "workspaceId", "campaignId", "personId", "recipientEmail", "state")
- VALUES ($1, $2, $3, $4, $5, 'QUEUED')`,
- [deliveryId, workspaceId, v4(), v4(), `claim-test-${deliveryId}@example.com`],
+ `INSERT INTO ${campaignDeliveryTableName}
+ ("id", "campaignId", "personId", "recipientEmail", "state")
+ VALUES ($1, $2, $3, $4, 'QUEUED')`,
+ [deliveryId, v4(), v4(), `claim-test-${deliveryId}@example.com`],
);
seededDeliveryIds.push(deliveryId);
@@ -65,7 +67,7 @@ describe('campaignDelivery claim protocol (integration)', () => {
deliveryId: string,
): Promise<{ state: string; claimToken: string | null }> => {
const [row] = await dataSource.query(
- `SELECT "state", "claimToken" FROM "core"."campaignDelivery" WHERE "id" = $1`,
+ `SELECT "state", "claimToken" FROM ${campaignDeliveryTableName} WHERE "id" = $1`,
[deliveryId],
);
@@ -92,13 +94,13 @@ describe('campaignDelivery claim protocol (integration)', () => {
);
}
- workspaceId = seedWorkspaceRow.workspaceId;
+ campaignDeliveryTableName = `"${getWorkspaceSchemaName(seedWorkspaceRow.workspaceId)}"."campaignDelivery"`;
});
afterAll(async () => {
if (seededDeliveryIds.length > 0) {
await dataSource.query(
- `DELETE FROM "core"."campaignDelivery" WHERE "id" = ANY($1)`,
+ `DELETE FROM ${campaignDeliveryTableName} WHERE "id" = ANY($1)`,
[seededDeliveryIds],
);
}
@@ -141,13 +143,13 @@ describe('campaignDelivery claim protocol (integration)', () => {
const abandoned = await claim(deliveryId);
await dataSource.query(
- `UPDATE "core"."campaignDelivery"
+ `UPDATE ${campaignDeliveryTableName}
SET "claimExpiresAt" = $1 WHERE "id" = $2`,
[new Date(Date.now() - 1), deliveryId],
);
await dataSource.query(
- `UPDATE "core"."campaignDelivery"
+ `UPDATE ${campaignDeliveryTableName}
SET "state" = 'FAILED', "failureReason" = 'CLAIM_EXPIRED',
"claimToken" = NULL, "claimExpiresAt" = NULL
WHERE "id" = $1 AND "state" = 'SENDING' AND "claimExpiresAt" < now()`,
@@ -160,28 +162,4 @@ describe('campaignDelivery claim protocol (integration)', () => {
expect(await settle(deliveryId, abandoned.claimToken)).toBe(0);
expect(await settle(deliveryId, reclaimed.claimToken)).toBe(1);
});
-
- it('never leaves a claim half written', async () => {
- const deliveryId = await seedQueuedDelivery();
-
- await expect(
- dataSource.query(
- `UPDATE "core"."campaignDelivery"
- SET "claimToken" = $1, "claimExpiresAt" = NULL WHERE "id" = $2`,
- [v4(), deliveryId],
- ),
- ).rejects.toThrow(/CHK_CAMPAIGN_DELIVERY_CLAIM_IS_WHOLE/);
- });
-
- it('never leaves a sending delivery without a lease', async () => {
- const deliveryId = await seedQueuedDelivery();
-
- await expect(
- dataSource.query(
- `UPDATE "core"."campaignDelivery"
- SET "state" = 'SENDING' WHERE "id" = $1`,
- [deliveryId],
- ),
- ).rejects.toThrow(/CHK_CAMPAIGN_DELIVERY_CLAIM_HAS_LEASE/);
- });
});
diff --git a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap
index 1248cf12c9f..91a98a83576 100644
--- a/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap
+++ b/packages/twenty-shared/src/metadata/__tests__/__snapshots__/standardObjectUniversalIdentifiers.test.ts.snap
@@ -1097,6 +1097,85 @@ exports[`STANDARD_OBJECTS universal identifiers should never change without an e
},
},
},
+ "campaignDelivery": {
+ "fields": {
+ "bouncedAt": {
+ "universalIdentifier": "c3db41d4-3c48-4110-b3b3-a68cb82a1a78",
+ },
+ "campaignId": {
+ "universalIdentifier": "5b3b48cd-71ec-4ff6-bd4f-8ea99965d611",
+ },
+ "claimExpiresAt": {
+ "universalIdentifier": "ba84a4ba-65ca-43dd-b72c-4b0f2f5b2f44",
+ },
+ "claimToken": {
+ "universalIdentifier": "66b78eb0-7a53-4ad6-929a-156183490eb3",
+ },
+ "complainedAt": {
+ "universalIdentifier": "322301c5-62d6-428a-bc33-89f8eee75a47",
+ },
+ "createdAt": {
+ "universalIdentifier": "6a2b1c95-9877-5704-9929-d159312b98f9",
+ },
+ "deletedAt": {
+ "universalIdentifier": "a3516f3f-a16c-511f-9f7d-a628dd6d26dd",
+ },
+ "deliveredAt": {
+ "universalIdentifier": "2cba1c4e-df5c-496d-8d0d-9f43fc371b5f",
+ },
+ "failureReason": {
+ "universalIdentifier": "5a080f14-de17-41a8-a2d7-e9287628db30",
+ },
+ "id": {
+ "universalIdentifier": "1eccf29f-4463-54e4-8aec-5cba33ea074d",
+ },
+ "personId": {
+ "universalIdentifier": "d12ac3bc-7d2c-4317-9c80-663e58ffbea2",
+ },
+ "providerMessageId": {
+ "universalIdentifier": "a560bd1a-716b-4fc3-b931-a34ff46bca6f",
+ },
+ "recipientEmail": {
+ "universalIdentifier": "28e61664-054b-4b41-b33b-d06b2fc7618f",
+ },
+ "rejectedAt": {
+ "universalIdentifier": "de3599c8-d91b-42fb-a76f-34cd1826dd04",
+ },
+ "renderingFailedAt": {
+ "universalIdentifier": "eca2b84e-a8d0-4641-bf16-48005e1826bd",
+ },
+ "sentAt": {
+ "universalIdentifier": "c4db7935-d927-49bd-80bd-01a6f39685a4",
+ },
+ "skipReason": {
+ "universalIdentifier": "86e995b9-467f-4570-a8f8-a647772e0944",
+ },
+ "state": {
+ "universalIdentifier": "668eb863-852e-4846-b3f6-f74fc5d25cf9",
+ },
+ "updatedAt": {
+ "universalIdentifier": "64e19382-6927-5380-8736-6aceb944caf2",
+ },
+ },
+ "indexes": {
+ "campaignPersonUniqueIndex": {
+ "universalIdentifier": "8d719548-d34f-4891-bbc9-e0e09f0e363b",
+ },
+ "claimTokenIndex": {
+ "universalIdentifier": "91640dcd-3f6b-4378-b284-bb02cc8b81ec",
+ },
+ "countsIndex": {
+ "universalIdentifier": "1ea1ae7a-158f-436a-95a0-e9c998ad94f7",
+ },
+ "expiredClaimIndex": {
+ "universalIdentifier": "a4d7e8ed-0008-4f6a-a20c-a2b821487481",
+ },
+ "providerMessageIdUniqueIndex": {
+ "universalIdentifier": "4de6f73d-ef3a-4c80-b71a-88739213f1c0",
+ },
+ },
+ "universalIdentifier": "0c76066d-26f7-4f57-b0bd-0eb61465fb1a",
+ },
"company": {
"fields": {
"accountOwner": {
@@ -2108,6 +2187,43 @@ exports[`STANDARD_OBJECTS universal identifiers should never change without an e
},
},
},
+ "messageSuppression": {
+ "fields": {
+ "createdAt": {
+ "universalIdentifier": "93195ec3-cddc-5b8e-b018-9b5be8ad4748",
+ },
+ "deletedAt": {
+ "universalIdentifier": "e171cb63-5ae1-5e1b-aeec-b1ce1931ce55",
+ },
+ "emailAddress": {
+ "universalIdentifier": "d44cd615-c3ff-4ac5-a0cc-bfbda700df8e",
+ },
+ "id": {
+ "universalIdentifier": "d515248e-7879-5b29-a852-7822b3ea8620",
+ },
+ "providerEventId": {
+ "universalIdentifier": "4959b0da-3ce2-42f7-8cc0-36fd20799a20",
+ },
+ "reason": {
+ "universalIdentifier": "2829a0be-f463-423c-810f-abf7b7a38454",
+ },
+ "source": {
+ "universalIdentifier": "c0111315-babb-44ab-b4bb-8393ca7a4f98",
+ },
+ "unsubscribeTopicId": {
+ "universalIdentifier": "42c74315-d6d3-47f7-8f72-d7d40e41cc84",
+ },
+ "updatedAt": {
+ "universalIdentifier": "f5986304-7eb7-5ef1-aa47-abea42b95655",
+ },
+ },
+ "indexes": {
+ "emailAddressTopicUniqueIndex": {
+ "universalIdentifier": "a6c1f4dc-d925-49f9-8205-3e7f95545966",
+ },
+ },
+ "universalIdentifier": "41410724-723c-48ab-8312-9b85131b4d84",
+ },
"messageThread": {
"fields": {
"createdAt": {
diff --git a/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts
index d5048ce801a..dfb3ef93549 100644
--- a/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts
+++ b/packages/twenty-shared/src/metadata/constants/standard-object-fields.constant.ts
@@ -162,6 +162,56 @@ export const STANDARD_OBJECT_FIELDS = {
comment: { universalIdentifier: 'f5531d3b-c8f5-4d92-bf72-d5fd8e2697b0' },
turn: { universalIdentifier: 'c67ddcf0-2812-476a-87dc-cf8a683805aa' },
},
+ campaignDelivery: {
+ ...buildStandardObjectBaseFields(
+ STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.campaignDelivery,
+ ),
+ campaignId: { universalIdentifier: '5b3b48cd-71ec-4ff6-bd4f-8ea99965d611' },
+ personId: { universalIdentifier: 'd12ac3bc-7d2c-4317-9c80-663e58ffbea2' },
+ recipientEmail: {
+ universalIdentifier: '28e61664-054b-4b41-b33b-d06b2fc7618f',
+ },
+ state: { universalIdentifier: '668eb863-852e-4846-b3f6-f74fc5d25cf9' },
+ skipReason: { universalIdentifier: '86e995b9-467f-4570-a8f8-a647772e0944' },
+ failureReason: {
+ universalIdentifier: '5a080f14-de17-41a8-a2d7-e9287628db30',
+ },
+ claimToken: { universalIdentifier: '66b78eb0-7a53-4ad6-929a-156183490eb3' },
+ claimExpiresAt: {
+ universalIdentifier: 'ba84a4ba-65ca-43dd-b72c-4b0f2f5b2f44',
+ },
+ providerMessageId: {
+ universalIdentifier: 'a560bd1a-716b-4fc3-b931-a34ff46bca6f',
+ },
+ sentAt: { universalIdentifier: 'c4db7935-d927-49bd-80bd-01a6f39685a4' },
+ deliveredAt: {
+ universalIdentifier: '2cba1c4e-df5c-496d-8d0d-9f43fc371b5f',
+ },
+ bouncedAt: { universalIdentifier: 'c3db41d4-3c48-4110-b3b3-a68cb82a1a78' },
+ complainedAt: {
+ universalIdentifier: '322301c5-62d6-428a-bc33-89f8eee75a47',
+ },
+ rejectedAt: { universalIdentifier: 'de3599c8-d91b-42fb-a76f-34cd1826dd04' },
+ renderingFailedAt: {
+ universalIdentifier: 'eca2b84e-a8d0-4641-bf16-48005e1826bd',
+ },
+ },
+ messageSuppression: {
+ ...buildStandardObjectBaseFields(
+ STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.messageSuppression,
+ ),
+ emailAddress: {
+ universalIdentifier: 'd44cd615-c3ff-4ac5-a0cc-bfbda700df8e',
+ },
+ reason: { universalIdentifier: '2829a0be-f463-423c-810f-abf7b7a38454' },
+ source: { universalIdentifier: 'c0111315-babb-44ab-b4bb-8393ca7a4f98' },
+ providerEventId: {
+ universalIdentifier: '4959b0da-3ce2-42f7-8cc0-36fd20799a20',
+ },
+ unsubscribeTopicId: {
+ universalIdentifier: '42c74315-d6d3-47f7-8f72-d7d40e41cc84',
+ },
+ },
timelineActivity: {
...buildStandardObjectSystemFields(
STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.timelineActivity,
diff --git a/packages/twenty-shared/src/metadata/constants/standard-object-universal-identifiers.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object-universal-identifiers.constant.ts
index 60ce90502ee..c61712d7788 100644
--- a/packages/twenty-shared/src/metadata/constants/standard-object-universal-identifiers.constant.ts
+++ b/packages/twenty-shared/src/metadata/constants/standard-object-universal-identifiers.constant.ts
@@ -10,6 +10,8 @@ export const STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS = {
agentMessage: '62d0354c-3b99-4769-b0f5-4e2651c2ca7d',
agentMessagePart: '214bacb0-df89-494e-be42-e5b11c99cff6',
agentTurnEvaluation: '73741409-7835-426f-8425-9de13af22302',
+ campaignDelivery: '0c76066d-26f7-4f57-b0bd-0eb61465fb1a',
+ messageSuppression: '41410724-723c-48ab-8312-9b85131b4d84',
timelineActivity: '20202020-6736-4337-b5c4-8b39fae325a5',
attachment: '20202020-bd3d-4c60-8dca-571c71d4447a',
blocklist: '20202020-0408-4f38-b8a8-4d5e3e26e24d',
diff --git a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts b/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
index 9f75fc5152f..dce3fdc0e97 100644
--- a/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
+++ b/packages/twenty-shared/src/metadata/constants/standard-object.constant.ts
@@ -1456,6 +1456,37 @@ export const STANDARD_OBJECTS = {
},
},
},
+ campaignDelivery: {
+ universalIdentifier: STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.campaignDelivery,
+ fields: STANDARD_OBJECT_FIELDS.campaignDelivery,
+ indexes: {
+ campaignPersonUniqueIndex: {
+ universalIdentifier: '8d719548-d34f-4891-bbc9-e0e09f0e363b',
+ },
+ expiredClaimIndex: {
+ universalIdentifier: 'a4d7e8ed-0008-4f6a-a20c-a2b821487481',
+ },
+ countsIndex: {
+ universalIdentifier: '1ea1ae7a-158f-436a-95a0-e9c998ad94f7',
+ },
+ claimTokenIndex: {
+ universalIdentifier: '91640dcd-3f6b-4378-b284-bb02cc8b81ec',
+ },
+ providerMessageIdUniqueIndex: {
+ universalIdentifier: '4de6f73d-ef3a-4c80-b71a-88739213f1c0',
+ },
+ },
+ },
+ messageSuppression: {
+ universalIdentifier:
+ STANDARD_OBJECT_UNIVERSAL_IDENTIFIERS.messageSuppression,
+ fields: STANDARD_OBJECT_FIELDS.messageSuppression,
+ indexes: {
+ emailAddressTopicUniqueIndex: {
+ universalIdentifier: 'a6c1f4dc-d925-49f9-8205-3e7f95545966',
+ },
+ },
+ },
} as const satisfies Record<
string,
{