From 8dd772aee2007fc33d8d085e1014624182280edd Mon Sep 17 00:00:00 2001 From: Charles Bochet Date: Tue, 27 Aug 2024 19:30:25 +0200 Subject: [PATCH] Fix post merge conflicts on messaging services --- .../message-channel-message-association.workspace-entity.ts | 2 +- .../message-import-manager/jobs/messaging-ongoing-stale.job.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts index 8dc839927..162a48c8f 100644 --- a/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts +++ b/packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts @@ -72,7 +72,7 @@ export class MessageChannelMessageAssociationWorkspaceEntity extends BaseWorkspa color: 'blue', }, ], - defaultValue: MessageDirection.INCOMING, + defaultValue: `'${MessageDirection.INCOMING}'`, }) direction: MessageDirection; diff --git a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-ongoing-stale.job.ts b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-ongoing-stale.job.ts index a2d47cc97..20d23e71a 100644 --- a/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-ongoing-stale.job.ts +++ b/packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-ongoing-stale.job.ts @@ -55,7 +55,7 @@ export class MessagingOngoingStaleJob { `Sync for message channel ${messageChannel.id} and workspace ${workspaceId} is stale. Setting sync stage to MESSAGES_IMPORT_PENDING`, ); - await this.messagingChannelSyncStatusService.resetSyncStageStartedAt( + await this.messageChannelSyncStatusService.resetSyncStageStartedAt( messageChannel.id, );