rez_core 3.1.107 → 3.1.110

package/package.json

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

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

@@ -842,7 +842,6 @@ export class IntegrationService {
         message,
         type,
         priority = 'medium',
-        subject,
         html,
         cc,
         bcc,
@@ -854,6 +853,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 +914,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 +923,7 @@ export class IntegrationService {
                 variables = templateData.variables;
                 externalTemplateId = templateData.externalTemplateId;
                 richText = templateData.rich_text;
+                // subject = templateData.subject;
               }
 
               // Merge config with enhanced parameters
@@ -1011,6 +1013,7 @@ export class IntegrationService {
               variables = templateData.variables;
               externalTemplateId = templateData.externalTemplateId;
               richText = templateData.rich_text;
+              // subject = templateData.subject;
             }
 
             // Merge config with enhanced parameters
@@ -1293,6 +1296,7 @@ export class IntegrationService {
 
       return {
         rich_text: richText,
+        // subject: commTemplate.subject,
       };
     }
 

package/src/module/mapper/repository/mapper.repository.ts

@@ -12,8 +12,4 @@ export class MapperRepository {
   async findById(id: number) {
     return await this.mapperRepository.findById(id);
   }
-
-  async deleteById(id: number) {
-    return await this.mapperRepository.deleteById(id);
-  }
 }

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

@@ -63,8 +63,7 @@ export class MapperService extends EntityServiceImpl {
 
     await this.fieldMapperRepository.deleteByMapperId(entityId);
 
-    await this.mapperRepository.deleteById(entityId);
-
+    await super.deleteEntity(entityType, entityId, loggedInUser);
     return {
       success: true,
       message: `Mapper deleted successfully.`,

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,