rez_core 3.1.98 → 3.1.100

package/package.json

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

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

@@ -5,14 +5,13 @@ import { MapperRepository } from '../repository/mapper.repository';
 import { FieldMapperRepository } from '../repository/field-mapper.repository';
 import { FieldLovsRepository } from '../repository/field-lovs.repository';
 
-
 @Injectable()
 export class MapperService extends EntityServiceImpl {
-
-  constructor(private readonly dataSource: DataSource,
-              private mapperRepository: MapperRepository,
-              private fieldMapperRepository: FieldMapperRepository,
-              private fieldLovsRepository: FieldLovsRepository,
+  constructor(
+    private readonly dataSource: DataSource,
+    private mapperRepository: MapperRepository,
+    private fieldMapperRepository: FieldMapperRepository,
+    private fieldLovsRepository: FieldLovsRepository,
   ) {
     super();
   }
@@ -21,24 +20,42 @@ export class MapperService extends EntityServiceImpl {
     if (!mappedEntityType) return [];
 
     const mappers = await this.dataSource.query(
-      `SELECT id, name, code
+      `SELECT id, name, code, status
        FROM cr_mapper
        WHERE mapped_entity_type = ?`,
       [mappedEntityType],
     );
 
+    const distinctStatuses = [
+      ...new Set(mappers.map((m) => m.status).filter((s) => s !== null)),
+    ];
+
+    // get all statuses in one query
+    const statusMap = new Map();
+    if (distinctStatuses.length > 0) {
+      const statuses = await this.dataSource.query(
+        `SELECT id, name FROM cr_list_master_items WHERE id IN (?)`,
+        [distinctStatuses],
+      );
+      statuses.forEach((status) => {
+        statusMap.set(status.id, status.name);
+      });
+    }
+
+    // map status names to mappers
+
     return mappers.map((m) => ({
       id: m.id,
       label: m.name,
       value: m.id,
       code: m.code,
-      status: m.status,
+      status: statusMap.get(m.status) || null,
     }));
   }
 
   async deleteEntity(entityType: string, entityId: number, loggedInUser) {
-
-    let fieldMappers = await this.fieldMapperRepository.findByMapperId(entityId);
+    let fieldMappers =
+      await this.fieldMapperRepository.findByMapperId(entityId);
 
     for (const fieldMapper of fieldMappers) {
       await this.fieldLovsRepository.deleteByMapperFieldId(fieldMapper.id);
@@ -53,4 +70,4 @@ export class MapperService extends EntityServiceImpl {
       message: `Mapper deleted successfully.`,
     };
   }
-}
+}

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

@@ -187,8 +187,9 @@ export class EntityDynamicService {
           );
 
           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 (?, ?, ?, ?, ?)`,
             [
+              organizationId,
               mainID,
               entityType,
               createdRelatedEntity.insertId,

package/src/module/workflow/service/workflow-meta.service.ts

@@ -155,7 +155,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
         status: firstStage.status,
         current_user_id: loggedInUser.id,
         stage_action_mapping_id: firstStage.id,
-        orgnization_id: loggedInUser.organization_id,
+        organization_id: loggedInUser.organization_id,
         stage_group_id: stageGroup.id,
         stage_id: firstStage.id,
         start_date: new Date(),