Emit message event with actual message object (#11548)

Events were emitted with the wrong object. We were using
messageWithParticipant instead of actual message object

packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts

@@ -17,7 +17,10 @@ export class MessagingMessageService {
     messages: MessageWithParticipants[],
     messageChannelId: string,
     transactionManager: EntityManager,
-  ): Promise<Map<string, string>> {
+  ): Promise<{
+    createdMessages: Partial<MessageWorkspaceEntity>[];
+    messageExternalIdsAndIdsMap: Map<string, string>;
+  }> {
     const messageChannelMessageAssociationRepository =
       await this.twentyORMManager.getRepository<MessageChannelMessageAssociationWorkspaceEntity>(
         'messageChannelMessageAssociation',
@@ -34,6 +37,7 @@ export class MessagingMessageService {
       );
 
     const messageExternalIdsAndIdsMap = new Map<string, string>();
+    const createdMessages: Partial<MessageWorkspaceEntity>[] = [];
 
     for (const message of messages) {
       const existingMessageChannelMessageAssociation =
@@ -101,18 +105,18 @@ export class MessagingMessageService {
       }
 
       const newMessageId = v4();
-
+      const messageToCreate = {
-      await messageRepository.insert(
-        {
         id: newMessageId,
         headerMessageId: message.headerMessageId,
         subject: message.subject,
         receivedAt: message.receivedAt,
         text: message.text,
         messageThreadId: newOrExistingMessageThreadId,
-        },
+      };
-        transactionManager,
+
-      );
+      await messageRepository.insert(messageToCreate, transactionManager);
+
+      createdMessages.push(messageToCreate);
 
       messageExternalIdsAndIdsMap.set(message.externalId, newMessageId);
 
@@ -128,6 +132,9 @@ export class MessagingMessageService {
       );
     }
 
-    return messageExternalIdsAndIdsMap;
+    return {
+      createdMessages,
+      messageExternalIdsAndIdsMap,
+    };
   }
 }

packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.spec.ts

@@ -119,12 +119,16 @@ describe('MessagingSaveMessagesAndEnqueueContactCreationService', () => {
         {
           provide: MessagingMessageService,
           useValue: {
-            saveMessagesWithinTransaction: jest.fn().mockResolvedValue(
+            saveMessagesWithinTransaction: jest.fn().mockResolvedValue({
-              new Map([
+              messageExternalIdsAndIdsMap: new Map([
                 ['message-1', 'db-message-id-1'],
                 ['message-2', 'db-message-id-2'],
               ]),
-            ),
+              createdMessages: [
+                { id: 'db-message-id-1' },
+                { id: 'db-message-id-2' },
+              ],
+            }),
           },
         },
         {

packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-save-messages-and-enqueue-contact-creation.service.ts

@@ -53,9 +53,10 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService {
 
     const workspaceDataSource = await this.twentyORMManager.getDatasource();
 
-    const participantsWithMessageId = await workspaceDataSource?.transaction(
+    const createdMessagesWithParticipants =
+      await workspaceDataSource?.transaction(
         async (transactionManager: EntityManager) => {
-        const messageExternalIdsAndIdsMap =
+          const { messageExternalIdsAndIdsMap, createdMessages } =
             await this.messageService.saveMessagesWithinTransaction(
               messagesToSave,
               messageChannel.id,
@@ -65,13 +66,15 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService {
           const participantsWithMessageId: (ParticipantWithMessageId & {
             shouldCreateContact: boolean;
           })[] = messagesToSave.flatMap((message) => {
-          const messageId = messageExternalIdsAndIdsMap.get(message.externalId);
+            const messageId = messageExternalIdsAndIdsMap.get(
+              message.externalId,
+            );
 
             return messageId
               ? message.participants.map((participant: Participant) => {
                   const fromHandle =
-                  message.participants.find((p) => p.role === 'from')?.handle ||
+                    message.participants.find((p) => p.role === 'from')
-                  '';
+                      ?.handle || '';
 
                   const isMessageSentByConnectedAccount =
                     handleAliases.includes(fromHandle) ||
@@ -114,10 +117,13 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService {
             transactionManager,
           );
 
-        return participantsWithMessageId;
+          return { participantsWithMessageId, createdMessages };
         },
       );
 
+    const { participantsWithMessageId, createdMessages } =
+      createdMessagesWithParticipants;
+
     const messageMetadata = await this.objectMetadataRepository.findOneOrFail({
       where: { nameSingular: 'message', workspaceId },
     });
@@ -125,9 +131,9 @@ export class MessagingSaveMessagesAndEnqueueContactCreationService {
     this.workspaceEventEmitter.emitDatabaseBatchEvent({
       objectMetadataNameSingular: 'message',
       action: DatabaseEventAction.CREATED,
-      events: messagesToSave.map((message) => {
+      events: createdMessages.map((message) => {
         return {
-          recordId: message.headerMessageId,
+          recordId: message.id ?? '',
           objectMetadata: messageMetadata,
           properties: {
             after: message,