admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix post merge conflicts on messaging services

Browse Source
This commit is contained in:
Charles Bochet
2024-08-27 19:30:25 +02:00
parent e6a55f270b
commit 8dd772aee2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts
View File

@ -72,7 +72,7 @@ export class MessageChannelMessageAssociationWorkspaceEntity extends BaseWorkspa
color: 'blue', color: 'blue',
}, },
], ],
defaultValue: MessageDirection.INCOMING, defaultValue: `'${MessageDirection.INCOMING}'`,
}) })
direction: MessageDirection; direction: MessageDirection;

2
packages/twenty-server/src/modules/messaging/message-import-manager/jobs/messaging-ongoing-stale.job.ts
View File

@ -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`, `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, messageChannel.id,
); );