Merging Next into --> Main (#1094)

Author: thisismayuresh

apps/queue-manager/src/consumers/send-bubble-data.consumer.ts

@@ -164,6 +164,13 @@ export class SendBubbleDataConsumer extends BaseConsumer {
         Object.keys(extra).forEach((extraObjKey) => {
           defaultValueObj[`extra.${extraObjKey}`] = extra[extraObjKey];
         });
+        if (uploadata.customRecordFormat && uploadata.customRecordFormat.includes('{{extra.uploadId}}')) {
+          defaultValueObj['extra.uploadId'] = _uploadId;
+        }
+
+        if (uploadata.customRecordFormat && uploadata.customRecordFormat.includes('{{extra.userId}}')) {
+          defaultValueObj['extra.userId'] = await this.uploadRepository.getUserIdFromUploadId(_uploadId);
+        }
       } catch (error) {}
     }
 

libs/dal/src/repositories/upload/upload.repository.ts

@@ -307,4 +307,21 @@ export class UploadRepository extends BaseRepository<UploadEntity> {
 
     return (environment[0].apiKeys[0]._userId as unknown as UserEntity).email;
   }
+
+  async getUserIdFromUploadId(uploadId: string): Promise<string> {
+    const uploadInfoWithTemplate = await Upload.findById(uploadId).populate([
+      {
+        path: '_templateId',
+      },
+    ]);
+    const environment = await Environment.find({
+      _projectId: (uploadInfoWithTemplate._templateId as unknown as TemplateEntity)._projectId,
+    }).populate([
+      {
+        path: 'apiKeys._userId',
+      },
+    ]);
+
+    return (environment[0].apiKeys[0]._userId as unknown as UserEntity)._id;
+  }
 }