rez_core 5.0.12 → 5.0.14

package/package.json

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

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

@@ -28,124 +28,124 @@ export class EntityDynamicService {
     const organizationId = loggedInUser.organization_id;
 
     const tableName = await this.getTableName(entityType, organizationId);
-    const validAttributes = await this.getAttributeCodes(
-      entityType,
-      organizationId,
-    );
-
-    const statusList = await this.dataSource.query(
-      `SELECT id
-       FROM frm_list_master_items
-       WHERE code = $1
-         AND organization_id = $2`,
-      [STATUS_ACTIVE, loggedInUser?.organization_id || 0],
-    );
+    const validAttributes = await this.getAttributeCodes(entityType, organizationId);
 
+    // -------------------------------------------------------
+    // AUTO fields
+    // -------------------------------------------------------
     entityData.created_date = new Date();
+
     if (loggedInUser) {
       entityData.created_by = loggedInUser.id;
+
       if (!entityData.organization_id)
         entityData.organization_id = loggedInUser.organization_id;
+
       if (!entityData.enterprise_id)
         entityData.enterprise_id = loggedInUser.enterprise_id;
+
       if (!entityData.level_type)
         entityData.level_type = loggedInUser.level_type;
-      if (!entityData.level_id) entityData.level_id = loggedInUser.level_id;
-      if (!entityData.status) entityData.status = statusList[0].id;
-      if (!entityData.entity_type) entityData.entity_type = entityType;
+
+      if (!entityData.level_id)
+        entityData.level_id = loggedInUser.level_id;
+
+      if (!entityData.entity_type)
+        entityData.entity_type = entityType;
     }
 
-    if (!entityData.code && loggedInUser) {
+    // -------------------------------------------------------
+    // STATUS
+    // -------------------------------------------------------
+    const statusList = await this.dataSource.query(
+      `
+          SELECT id
+          FROM frm_list_master_items
+          WHERE code = $1
+            AND organization_id = $2
+      `,
+      [STATUS_ACTIVE, organizationId],
+    );
+
+    if (!entityData.status) entityData.status = statusList[0]?.id;
+
+    // -------------------------------------------------------
+    // AUTO-CODE GENERATION (POSTGRES SAFE)
+    // -------------------------------------------------------
+    if (!entityData.code && entityData.entity_type) {
+      // Extract integer suffix
       const result = await this.dataSource.query(
-        `SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
-         FROM ${tableName}
-         WHERE entity_type = $1`,
+        `
+            SELECT MAX(id) AS max_seq_no
+            FROM ${tableName}
+            WHERE entity_type = $1
+        `,
         [entityData.entity_type],
       );
 
-      // result will be like [ { max_seq_no: 12 } ]
-      let maxSeqNo = result?.[0]?.max_seq_no ? Number(result[0].max_seq_no) : 0;
-
-      maxSeqNo += 1;
-      entityData.code = `${entityData.entity_type}${maxSeqNo}`;
+      let maxSeq = Number(result?.[0]?.max_seq_no) || 0;
+      maxSeq++;
+      entityData.code = `${entityData.entity_type}${maxSeq}`;
     }
 
-    // Set parent_id if mainID is provided
+    // -------------------------------------------------------
+    // Parent ID
+    // -------------------------------------------------------
     if (mainID) {
       entityData.parent_id = mainID;
     }
 
-    const bypassColumn = [
-      {
-        attribute_key: 'created_date',
-        db_datatype: 'datetime',
-        element_type: 'date',
-        is_hidden: false,
-      },
-      {
-        attribute_key: 'created_by',
-        db_datatype: 'int',
-        element_type: 'number',
-        is_hidden: false,
-      },
-      {
-        attribute_key: 'organization_id',
-        db_datatype: 'datetime',
-        element_type: 'date',
-        is_hidden: false,
-      },
-      {
-        attribute_key: 'enterprise_id',
-        db_datatype: 'int',
-        element_type: 'number',
-        is_hidden: false,
-      },
-      { attribute_key: 'level_type', db_datatype: 'int', element_type: 'text', is_hidden: false },
-      { attribute_key: 'level_id', db_datatype: 'int', element_type: 'number', is_hidden: false },
-      { attribute_key: 'status', db_datatype: 'varchar', element_type: 'text', is_hidden: false },
-      {
-        attribute_key: 'entity_type',
-        db_datatype: 'varchar',
-        element_type: 'text',
-        is_hidden: false,
-      },
-      { attribute_key: 'code', db_datatype: 'varchar', element_type: 'text', is_hidden: false },
-      {
-        attribute_key: 'parent_id',
-        db_datatype: 'int',
-        element_type: 'number',
-        is_hidden: false,
-      },
+    // -------------------------------------------------------
+    // BYPASS COLUMNS
+    // -------------------------------------------------------
+    const bypassColumns = [
+      'created_date',
+      'created_by',
+      'organization_id',
+      'enterprise_id',
+      'level_type',
+      'level_id',
+      'status',
+      'entity_type',
+      'code',
+      'parent_id',
     ];
 
-    // Only push bypassColumn attributes that don't already exist in validAttributes
-    const existingAttributeKeys = validAttributes.map(
-      (attr) => attr.attribute_key,
-    );
-    const newBypassColumns = bypassColumn.filter(
-      (bypass) => !existingAttributeKeys.includes(bypass.attribute_key),
-    );
-    validAttributes.push(...newBypassColumns);
+    for (const col of bypassColumns) {
+      if (!validAttributes.some(a => a.attribute_key === col)) {
+        validAttributes.push({
+          attribute_key: col,
+          is_hidden: false,
+          db_datatype: 'text',
+          element_type: 'text',
+        });
+      }
+    }
 
+    // -------------------------------------------------------
+    // BUILD INSERT QUERY (POSTGRES FORMAT)
+    // -------------------------------------------------------
     const columns: string[] = [];
     const values: any[] = [];
+    let idx = 1;
+    const placeholders: string[] = [];
 
-    validAttributes.forEach((attr) => {
+    for (const attr of validAttributes) {
       columns.push(attr.attribute_key);
-      values.push(
-        attr.attribute_key in entityData
-          ? entityData[attr.attribute_key]
-          : null,
-      );
-    });
+      values.push(entityData[attr.attribute_key] ?? null);
+      placeholders.push(`$${idx++}`);
+    }
 
-    const placeholders = columns.map(() => '?').join(', ');
-    const escapedColumns = columns.map((col) => `\`${col}\``).join(', ');
-    const insertQuery = `INSERT INTO ${tableName} (${escapedColumns})
-                         VALUES (${placeholders})`;
+    const colList = columns.map(c => `"${c}"`).join(', ');
+    const placeholderList = placeholders.join(', ');
 
-    const result = await this.dataSource.query(insertQuery, values);
-    return result;
+    const sql = `
+        INSERT INTO ${tableName} (${colList})
+        VALUES (${placeholderList}) RETURNING id
+    `;
+
+    const result = await this.dataSource.query(sql, values);
+    return result[0];
   }
 
   // ----------------------------- get entity with relations
@@ -736,25 +736,20 @@ export class EntityDynamicService {
     const organizationId = loggedInUser.organization_id;
 
     // 1. Get db_table_name from entity master
-    const result = await this.dataSource.query(
-      `SELECT db_table_name
-       FROM frm_entity_master
-       WHERE mapped_entity_type = $1
-         AND organization_id = $2`,
-      [entityType, organizationId],
-    );
 
-    if (!result.length) {
+    const result = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, organizationId);
+
+    if (!result) {
       throw new Error(
         `Entity type '${entityType}' not found in frm_entity_master for org '${organizationId}'`,
       );
     }
 
-    const tableName = result[0].db_table_name;
+    const tableName = result.db_table_name;
 
     // 2. Get current max sequence number from that table
     const seqResult = await this.dataSource.query(
-      `SELECT MAX(CAST(SUBSTRING(code, LENGTH(entity_type) + 1) AS UNSIGNED)) AS max_seq_no
+      `SELECT MAX(id) AS max_seq_no
        FROM \`${tableName}\`
        WHERE entity_type = $1`,
       [entityType],

package/src/module/workflow/service/action-template-mapping.service.ts

@@ -35,7 +35,7 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       SELECT id
       FROM frm_list_master_items 
       WHERE organization_id = $1 
-        AND listtype = "MOD" AND code = $2
+        AND listtype = 'MOD' AND code = $2
     `,
           [loggedInUser.organization_id, 'email'],
         );
@@ -46,7 +46,7 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
         `
   SELECT code as value, name as label , id
   FROM frm_wf_comm_template
-  WHERE mode = $1 AND organization_id = $2 AND level_type = $3 AND level_id = $4 AND status IN (SELECT id FROM frm_list_master_items WHERE code = "STATUS_ACTIVE" AND organization_id = $5)
+  WHERE mode = $1 AND organization_id = $2 AND level_type = $3 AND level_id = $4 AND status IN (SELECT id FROM frm_list_master_items WHERE code = 'STATUS_ACTIVE' AND organization_id = $5)
   `,
         [
           modeId,
@@ -89,15 +89,15 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       `
   SELECT code as value, name as label , id
   FROM frm_wf_comm_template
-  WHERE code IN ($1) AND mode = $2 AND organization_id = $3 AND level_type = $4 AND level_id = $5 AND status IN (SELECT id FROM frm_list_master_items WHERE code = "STATUS_ACTIVE" AND organization_id = $6)
+  WHERE code IN ($1) AND mode = $2 AND organization_id = $3 AND level_type = $4 AND level_id = $5 AND status IN (SELECT id FROM frm_list_master_items WHERE code = 'STATUS_ACTIVE' AND organization_id = $6)
   `,
       [
         templateCodes,
         mode,
         loggedInUser.organization_id,
         loggedInUser.level_type,
-        loggedInUser.level_id,
-        loggedInUser.organization_id,
+        Number(loggedInUser.level_id),
+        Number(loggedInUser.organization_id),
       ],
     );