rez_core 3.1.108 → 3.1.111

package/package.json

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

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

@@ -87,12 +87,12 @@ export class IntegrationService {
     private readonly gmailApiStrategy: GmailApiStrategy,
     private readonly sendGridApiStrategy: SendGridApiStrategy,
     private readonly configService: ConfigService,
-    @Inject('FieldMapperService')
-    private readonly fieldMapperService: FieldMapperService,
+    @Inject('FieldMapperService') private readonly fieldMapperService: FieldMapperService,
     private readonly entityService: EntityServiceImpl,
     @Inject(forwardRef(() => IntegrationQueueService))
     private readonly queueService?: IntegrationQueueService,
-  ) {}
+  ) {
+  }
 
   private deriveServiceType(
     integration_type: string,
@@ -104,15 +104,15 @@ export class IntegrationService {
   }
 
   async sendMessage({
-    levelId,
-    levelType,
-    app_code,
-    to,
-    message,
-    mode,
-    priority = 1,
-    user_id,
-  }: SendMessageDto): Promise<IntegrationResult> {
+                      levelId,
+                      levelType,
+                      app_code,
+                      to,
+                      message,
+                      mode,
+                      priority = 1,
+                      user_id,
+                    }: SendMessageDto): Promise<IntegrationResult> {
     try {
       // Get active communication configs for the level
       const configs = await this.getActiveConfigs(
@@ -192,9 +192,7 @@ export class IntegrationService {
       .where('config.level_id = :levelId', { levelId })
       .andWhere('config.level_type = :levelType', { levelType })
       .andWhere('config.app_code = :app_code', { app_code })
-      .andWhere('config.integration_type = :integration_type', {
-        integration_type,
-      })
+      .andWhere('config.integration_type = :integration_type', { integration_type })
       .andWhere('config.status = 1')
       .orderBy('config.is_default', 'DESC')
       .addOrderBy('config.priority', 'ASC')
@@ -705,7 +703,7 @@ export class IntegrationService {
             if (configJson?.[field]) {
               safeConfig[
                 `has${field.charAt(0).toUpperCase() + field.slice(1)}`
-              ] = true;
+                ] = true;
             }
           });
 
@@ -842,7 +840,6 @@ export class IntegrationService {
         message,
         type,
         priority = 'medium',
-        subject,
         html,
         cc,
         bcc,
@@ -854,6 +851,8 @@ export class IntegrationService {
         entity_type,
       } = messageDto;
 
+      let subject = messageDto.subject;
+
       // Auto-detect communication type if not specified
       const communicationType = this.detectCommunicationType(to, type);
 
@@ -913,7 +912,7 @@ export class IntegrationService {
               let variables;
               let richText;
               let externalTemplateId: string | undefined = undefined;
-              if (templateId && entity_type && entity_id) {
+              if (templateId) {
                 const templateData = await this.processTemplate(
                   parseInt(templateId, 10),
                   entity_type,
@@ -922,6 +921,7 @@ export class IntegrationService {
                 variables = templateData.variables;
                 externalTemplateId = templateData.externalTemplateId;
                 richText = templateData.rich_text;
+                subject = templateData.subject;
               }
 
               // Merge config with enhanced parameters
@@ -1011,6 +1011,7 @@ export class IntegrationService {
               variables = templateData.variables;
               externalTemplateId = templateData.externalTemplateId;
               richText = templateData.rich_text;
+              subject = templateData.subject;
             }
 
             // Merge config with enhanced parameters
@@ -1019,7 +1020,7 @@ export class IntegrationService {
               ...enhancedConfig,
               templateId: externalTemplateId,
               variables,
-              richText,
+              richText
             };
 
             // Handle user integration if user_id provided
@@ -1035,7 +1036,11 @@ export class IntegrationService {
               }
             }
 
-            const result = await strategy.sendMessage(to, message, finalConfig);
+            const result = await strategy.sendMessage(
+              to,
+              message,
+              finalConfig,
+            );
 
             if (result.success) {
               this.logger.log(
@@ -1255,16 +1260,8 @@ export class IntegrationService {
     templateId: number,
     entity_type: any,
     entity_id: any,
-  ): Promise<{
-    variables?: Record<string, any>;
-    externalTemplateId?: string;
-    rich_text?: string;
-  }> {
-    const commTemplate: any = await this.entityService.getEntityData(
-      COMM_TEMPLATE,
-      templateId,
-      {} as any,
-    );
+  ): Promise<{ variables?: Record<string, any>; externalTemplateId?: string; rich_text?: string; subject?: string }> {
+    const commTemplate: any = await this.entityService.getEntityData(COMM_TEMPLATE, templateId, {} as any);
     if (!commTemplate) {
       return {
         variables: {},
@@ -1276,7 +1273,7 @@ export class IntegrationService {
     if (commTemplate.mapper_id) {
       variables = await this.fieldMapperService.resolveData(
         commTemplate.mapper_id,
-        'LOOKUP',
+        "LOOKUP",
         entity_type,
         entity_id,
         {} as any,
@@ -1293,6 +1290,7 @@ export class IntegrationService {
 
       return {
         rich_text: richText,
+        subject: commTemplate.subject
       };
     }
 
@@ -1980,10 +1978,10 @@ export class IntegrationService {
 
   async getIntegrationConfigById(hubId: number): Promise<
     | (IntegrationConfig & {
-        config: IntegrationConfig;
-        linkedSource?: string;
-        configDetails?: any;
-      })
+    config: IntegrationConfig;
+    linkedSource?: string;
+    configDetails?: any;
+  })
     | null
   > {
     try {
@@ -2475,8 +2473,7 @@ export class IntegrationService {
       if (!userIntegration) {
         return {
           success: false,
-          error:
-            'User integration mapping not found. Please configure agent details.',
+          error: 'User integration mapping not found. Please configure agent details.',
         };
       }
 

package/src/module/meta/service/entity-dynamic.service.ts

@@ -370,9 +370,16 @@ export class EntityDynamicService {
           // Insert relation
           await this.dataSource.query(
             `INSERT INTO cr_entity_relation_data 
-          (source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) 
-          VALUES (?, ?, ?, ?, ?)`,
-            [id, entityType, targetEntityId, targetEntityType, relationType],
+          (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) 
+          VALUES (?, ?, ?, ?, ?,?)`,
+            [
+              organizationId,
+              id,
+              entityType,
+              targetEntityId,
+              targetEntityType,
+              relationType,
+            ],
           );
 
           if (relationType === 'ONE_TO_MANY') {

package/src/module/workflow/service/task.service.ts

@@ -109,8 +109,9 @@ export class TaskService extends EntityServiceImpl {
 
     if (relationData) {
       await this.dataSource.query(
-        `INSERT INTO cr_entity_relation_data (source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) VALUES (?, ?, ?, ?, ?)`,
+        `INSERT INTO cr_entity_relation_data (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) VALUES (?, ?, ?, ?, ?)`,
         [
+          loggedInUser.organization_id,
           createdEntity.mapped_entity_id,
           createdEntity.mapped_entity_type,
           createdEntity.id,