rez_core 4.0.83 → 4.0.85

package/package.json

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

package/src/module/mapper/service/field-mapper.service.ts

@@ -93,6 +93,8 @@ export class FieldMapperService extends EntityServiceImpl {
     userData: UserData,
     inputJson?: Record<string, any>,
     mappedEntities?: Record<string, any>,
+    overwrite?: boolean,
+    entity_data?: any
   ) {
     // Fetch field mappings for this mapper
     const fieldMappers =
@@ -129,65 +131,69 @@ export class FieldMapperService extends EntityServiceImpl {
                 userData,
               );
           } else {
-            const relations = await this.datasource.query(
-              `SELECT target_entity_id
-             FROM frm_entity_relation_data
-             WHERE source_entity_type = ?
-               AND source_entity_id = ?
-               AND target_entity_type = ?`,
-              [parent_type, parent_id, field.mapped_entity_type],
-            );
+            if (overwrite && entity_data && entity_data[field.mapped_entity_type]) {
+              inMemory[entityType][filterCode] = entity_data;
+            } else {
+              const relations = await this.datasource.query(
+                `SELECT target_entity_id
+                 FROM frm_entity_relation_data
+                 WHERE source_entity_type = ?
+                   AND source_entity_id = ?
+                   AND target_entity_type = ?`,
+                [parent_type, parent_id, field.mapped_entity_type],
+              );
 
-            const targetEntityIds = relations.map((r) => r.target_entity_id);
+              const targetEntityIds = relations.map((r) => r.target_entity_id);
 
-            this.loggingService.log(
-              'package',
-              'fieldMapperService',
-              'targetEntityIds',
-              targetEntityIds,
-            );
+              this.loggingService.log(
+                'package',
+                'fieldMapperService',
+                'targetEntityIds',
+                targetEntityIds,
+              );
 
-            if (targetEntityIds.length > 0) {
-              if (filterCode && filterCode !== 'default') {
-                let filterResponse =
-                  await this.filterService.applyFilterWrapper({
-                    entity_type: entityType,
-                    savedFilterCode: filterCode,
-                    quickFilter: [
-                      {
-                        filter_attribute: 'id',
-                        filter_operator: 'equal',
-                        filter_value: targetEntityIds,
-                        filter_entity_type: entityType,
-                      },
-                    ],
-                    attributeFilter: [],
-                    loggedInUser: userData,
-                    queryParams: {},
-                  });
-
-                this.loggingService.log(
-                  'package',
-                  'fieldMapperService',
-                  'filterResponse',
-                  `${filterResponse}`,
-                );
-
-                inMemory[entityType][filterCode] =
-                  filterResponse?.data?.entity_list[0];
-              } else {
-                let firstId = targetEntityIds[0];
-                if (mappedEntities && mappedEntities[entityType])
-                  firstId = mappedEntities[entityType];
-                inMemory[entityType][filterCode] =
-                  await super.getResolvedEntityData(
-                    entityType,
-                    firstId,
-                    userData,
+              if (targetEntityIds.length > 0) {
+                if (filterCode && filterCode !== 'default') {
+                  let filterResponse =
+                    await this.filterService.applyFilterWrapper({
+                      entity_type: entityType,
+                      savedFilterCode: filterCode,
+                      quickFilter: [
+                        {
+                          filter_attribute: 'id',
+                          filter_operator: 'equal',
+                          filter_value: targetEntityIds,
+                          filter_entity_type: entityType,
+                        },
+                      ],
+                      attributeFilter: [],
+                      loggedInUser: userData,
+                      queryParams: {},
+                    });
+
+                  this.loggingService.log(
+                    'package',
+                    'fieldMapperService',
+                    'filterResponse',
+                    `${filterResponse}`,
                   );
+
+                  inMemory[entityType][filterCode] =
+                    filterResponse?.data?.entity_list[0];
+                } else {
+                  let firstId = targetEntityIds[0];
+                  if (mappedEntities && mappedEntities[entityType])
+                    firstId = mappedEntities[entityType];
+                  inMemory[entityType][filterCode] =
+                    await super.getResolvedEntityData(
+                      entityType,
+                      firstId,
+                      userData,
+                    );
+                }
+              } else {
+                inMemory[entityType][filterCode] = null;
               }
-            } else {
-              inMemory[entityType][filterCode] = null;
             }
           }
         }

package/src/module/workflow/controller/comm-template.controller.ts

@@ -35,7 +35,9 @@ export class CommTemplateController {
 
   @Post('/resolve-message')
   @HttpCode(HttpStatus.OK)
-  async resolveMessage(@Body() payload: any) {
-    return await this.commTemplateService.getResolvedTemplateMsg(payload);
+  async resolveMessage(@Body() payload: any,
+                       @Req() req: Request & { user: any },) {
+    const loggedInUser = req.user.userData;
+    return await this.commTemplateService.getResolvedTemplateMsg(payload, loggedInUser);
   }
 }

package/src/module/workflow/service/comm-template.service.ts

@@ -125,7 +125,7 @@ export class CommTemplateService extends EntityServiceImpl {
     return response;
   }
 
-  async getResolvedTemplateMsg(payload: any) {
+  async getResolvedTemplateMsg(payload: any, loggedInUser: UserData) {
     let commTemplate = await this.commTemplateRepository.findByCodeAndLevelIdAndLevelTypeAndAppCode(
       payload.template_code,
       payload.level_id,
@@ -134,7 +134,7 @@ export class CommTemplateService extends EntityServiceImpl {
     );
 
     let variables;
-    if (commTemplate && ! commTemplate.template_id) {
+    if (commTemplate && !commTemplate.template_id) {
 
       if (commTemplate.mapper_id) {
         variables = await this.fieldMapperService.resolveData(
@@ -142,7 +142,11 @@ export class CommTemplateService extends EntityServiceImpl {
           'LOOKUP',
           payload.entity_type,
           payload.entity_id,
-          {} as any,
+          loggedInUser,
+          undefined,
+          undefined,
+          payload.overwrite || false,
+          payload.entity_data || null,
         );
       }
 
@@ -170,7 +174,7 @@ export class CommTemplateService extends EntityServiceImpl {
         };
       }
     } else {
-      throw new BadRequestException("Editing is disabled for external templates");
+      throw new BadRequestException('Editing is disabled for external templates');
     }
   }
 }