rez_core 4.0.52 → 4.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "4.0.52",
+  "version": "4.0.53",
   "description": "",
   "author": "",
   "private": false,

package/src/module/integration/service/integration.service.ts

@@ -57,6 +57,7 @@ export interface GenericMessageDto {
   entity_type?: string;
   entity_id?: number;
   organization_id?: number;
+  mapped_entities?: any;
 }
 
 export interface IntegrationConfigWithConfig extends IntegrationConfig {
@@ -890,6 +891,7 @@ export class IntegrationService {
         entity_id,
         entity_type,
         organization_id,
+        mapped_entities,
       } = messageDto;
 
       let subject = messageDto.subject;
@@ -967,6 +969,7 @@ export class IntegrationService {
                   entity_type,
                   entity_id,
                   loggedInUser,
+                  mapped_entities,
                 );
                 variables = templateData.variables;
                 externalTemplateId = templateData.externalTemplateId;
@@ -1060,6 +1063,7 @@ export class IntegrationService {
                 entity_type,
                 entity_id,
                 loggedInUser,
+                mapped_entities,
               );
               variables = templateData.variables;
               externalTemplateId = templateData.externalTemplateId;
@@ -1310,6 +1314,7 @@ export class IntegrationService {
     entity_type: any,
     entity_id: any,
     loggedInUser?: any,
+    mappedEntities?: Record<string, any>,
   ): Promise<{
     variables?: Record<string, any>;
     externalTemplateId?: string;
@@ -1337,6 +1342,7 @@ export class IntegrationService {
         entity_id,
         loggedInUser,
         {} as any,
+        mappedEntities,
       );
     }
 

package/src/module/integration/service/wrapper.service.ts

@@ -288,7 +288,11 @@ export class WrapperService {
    * Wrapper for scheduling meeting
    */
 
-  async scheduleMeetingWrapper(payload: any, loggedInUser: any) {
+  async scheduleMeetingWrapper(
+    payload: any,
+    loggedInUser: any,
+    mapped_entities?: any,
+  ) {
     try {
       this.logger.log(
         `scheduleMeetingWrapper called by user=${loggedInUser?.id || 'unknown'} Payload=${JSON.stringify(payload)}`,
@@ -336,6 +340,7 @@ export class WrapperService {
             payload.level_type,
             payload.app_code,
             loggedInUser.organization_id,
+            mapped_entities,
           ),
         };
       }
@@ -371,6 +376,7 @@ export class WrapperService {
             'ORG',
             'DEFAULT',
             loggedInUser.organization_id,
+            mapped_entities,
           ),
         };
       }
@@ -404,6 +410,7 @@ export class WrapperService {
     levelType: string,
     appCode: string,
     organizationId: number,
+    mapped_entities?: any,
   ) {
     this.logger.log(`Generating ICS file. Payload: ${JSON.stringify(payload)}`);
 
@@ -476,6 +483,7 @@ export class WrapperService {
       entity_id: payload.entity_id,
       entity_type: payload.entity_type,
       organization_id: organizationId,
+      mapped_entities,
     };
 
     this.logger.debug(

package/src/module/meta/service/resolver.service.ts

@@ -102,8 +102,8 @@ export class ResolverService {
 
       // --------UPLOAD / IMAGE --------
       else if (
-        attr.element_type === 'upload' ||
-        attr.element_type === 'image'
+        (attr.element_type === 'upload' || attr.element_type === 'image') &&
+        typeof resolvedEntityData[field] !== 'object'
       ) {
         const mediaService = await this.getMediaDataService();
         const uploadData = await mediaService.getMediaDownloadUrl(