rez_core 5.0.10 → 5.0.12

package/package.json

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

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

@@ -1,15 +1,10 @@
-import { level } from 'winston';
 import { BadRequestException, Injectable } from '@nestjs/common';
-import {
-  ENTITYTYPE_ENTITYMASTER,
-  STATUS_ACTIVE,
-} from 'src/constant/global.constant';
+import { STATUS_ACTIVE } from 'src/constant/global.constant';
 import { DataSource } from 'typeorm';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { MediaDataService } from './media-data.service';
 import { ResolverService } from './resolver.service';
 import { ConfigService } from '@nestjs/config';
-import { EntityMasterService } from './entity-master.service';
 import { EntityMasterRepository } from '../repository/entity-master.repository';
 
 @Injectable()
@@ -20,7 +15,8 @@ export class EntityDynamicService {
     private readonly resolverService: ResolverService,
     private readonly configService: ConfigService,
     private readonly entityMasterRepo: EntityMasterRepository,
-  ) {}
+  ) {
+  }
 
   // -----------------------------
   async createEntity(
@@ -38,7 +34,10 @@ export class EntityDynamicService {
     );
 
     const statusList = await this.dataSource.query(
-      `SELECT id FROM frm_list_master_items WHERE code = $1 AND organization_id = $2`,
+      `SELECT id
+       FROM frm_list_master_items
+       WHERE code = $1
+         AND organization_id = $2`,
       [STATUS_ACTIVE, loggedInUser?.organization_id || 0],
     );
 
@@ -59,8 +58,8 @@ export class EntityDynamicService {
     if (!entityData.code && loggedInUser) {
       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`,
+         FROM ${tableName}
+         WHERE entity_type = $1`,
         [entityData.entity_type],
       );
 
@@ -142,7 +141,8 @@ export class EntityDynamicService {
 
     const placeholders = columns.map(() => '?').join(', ');
     const escapedColumns = columns.map((col) => `\`${col}\``).join(', ');
-    const insertQuery = `INSERT INTO \`${tableName}\` (${escapedColumns}) VALUES (${placeholders})`;
+    const insertQuery = `INSERT INTO ${tableName} (${escapedColumns})
+                         VALUES (${placeholders})`;
 
     const result = await this.dataSource.query(insertQuery, values);
     return result;
@@ -159,7 +159,10 @@ export class EntityDynamicService {
     const organizationId = loggedInUser.organization_id;
 
     const getRelation = await this.dataSource.query(
-      `SELECT * FROM frm_entity_relation WHERE organization_id = $1 AND source_entity_type = $2`,
+      `SELECT *
+       FROM frm_entity_relation
+       WHERE organization_id = $1
+         AND source_entity_type = $2`,
       [organizationId, entityType],
     );
 
@@ -200,7 +203,9 @@ export class EntityDynamicService {
           );
 
           await this.dataSource.query(
-            `INSERT INTO frm_entity_relation_data (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) VALUES ($1, $2, $3, $4, $5, $6)`,
+            `INSERT INTO frm_entity_relation_data (organization_id, source_entity_id, source_entity_type,
+                                                   target_entity_id, target_entity_type, relation_type)
+             VALUES ($1, $2, $3, $4, $5, $6)`,
             [
               organizationId,
               mainID,
@@ -236,8 +241,10 @@ export class EntityDynamicService {
     );
 
     const relatedEntities = await this.dataSource.query(
-      `SELECT * FROM frm_entity_relation_data WHERE  source_entity_id = $1 AND target_entity_type IN (
-      SELECT target_entity_type FROM frm_entity_relation WHERE source_entity_type = $2)`,
+      `SELECT *
+       FROM frm_entity_relation_data
+       WHERE source_entity_id = $1
+         AND target_entity_type IN (SELECT target_entity_type FROM frm_entity_relation WHERE source_entity_type = $2)`,
       [id, entityType],
     );
 
@@ -308,7 +315,10 @@ export class EntityDynamicService {
 
     if (mappedEntities) {
       const getRelationDefs = await this.dataSource.query(
-        `SELECT * FROM frm_entity_relation WHERE organization_id = $1 AND source_entity_type = $2`,
+        `SELECT *
+         FROM frm_entity_relation
+         WHERE organization_id = $1
+           AND source_entity_type = $2`,
         [organizationId, entityType],
       );
 
@@ -327,7 +337,11 @@ export class EntityDynamicService {
 
         // Delete previous relations and related entities
         const existingRelationsForType = await this.dataSource.query(
-          `SELECT * FROM frm_entity_relation_data WHERE source_entity_type = $1 AND source_entity_id = $2 AND target_entity_type = $3`,
+          `SELECT *
+           FROM frm_entity_relation_data
+           WHERE source_entity_type = $1
+             AND source_entity_id = $2
+             AND target_entity_type = $3`,
           [entityType, id, targetEntityType],
         );
 
@@ -384,9 +398,10 @@ export class EntityDynamicService {
 
             // Insert relation as per new entity created
             await this.dataSource.query(
-              `INSERT INTO frm_entity_relation_data 
-            (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type, relation_type) 
-            VALUES ($1, $2, $3, $4, $5, $6)`,
+              `INSERT INTO frm_entity_relation_data
+               (organization_id, source_entity_id, source_entity_type, target_entity_id, target_entity_type,
+                relation_type)
+               VALUES ($1, $2, $3, $4, $5, $6)`,
               [
                 organizationId,
                 id,
@@ -435,100 +450,59 @@ export class EntityDynamicService {
     const organizationId = loggedInUser.organization_id;
 
     const tableName = await this.getTableName(entityType, organizationId);
-    const validAttributes = await this.getAttributeCodes(
-      entityType,
-      organizationId,
-    );
+    const validAttributes = await this.getAttributeCodes(entityType, organizationId);
 
     const updates: string[] = [];
     const values: any[] = [];
+    let idx = 1;
 
+    // Auto fields
     entityData.modified_date = new Date();
     if (loggedInUser) {
       entityData.modified_by = loggedInUser.id;
+
       if (!entityData.organization_id && entityData.entity_type !== 'ORG')
         entityData.organization_id = loggedInUser.organization_id;
+
       if (!entityData.enterprise_id)
         entityData.enterprise_id = loggedInUser.enterprise_id;
     }
 
-    // Set parent_id if mainID is provided
     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: 'modified_date',
-        db_datatype: 'datetime',
-        element_type: 'date',
-        is_hidden: false,
-      },
-      {
-        attribute_key: 'modified_by',
-        db_datatype: 'int',
-        element_type: 'number',
-        is_hidden: false,
-      },
-      {
-        attribute_key: 'organization_id',
-        db_datatype: 'int',
-        element_type: 'number',
-        is_hidden: false,
-      },
-      {
-        attribute_key: 'enterprise_id',
-        db_datatype: 'int',
-        element_type: 'number',
-        is_hidden: false,
-      },
-      {
-        attribute_key: 'level_type',
-        db_datatype: 'varchar',
-        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,
-      },
+    // Add bypass columns if needed
+    const bypassColumns = [
+      'created_date',
+      'created_by',
+      'modified_date',
+      'modified_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((attr) => attr.attribute_key === col)) {
+        validAttributes.push({
+          attribute_key: col,
+          db_datatype: 'text',
+          element_type: 'text',
+          is_hidden: false,
+        });
+      }
+    }
 
+    // Build SET clause
     for (const key of Object.keys(entityData)) {
       if (validAttributes.some((attr) => attr.attribute_key === key)) {
-        updates.push(`\`${key}\` = ?`);
+        updates.push(`${key} = $${idx++}`);
         values.push(entityData[key]);
       }
     }
@@ -537,11 +511,17 @@ export class EntityDynamicService {
       throw new Error('No valid attributes to update.');
     }
 
-    const updateQuery = `UPDATE \`${tableName}\` SET ${updates.join(', ')} WHERE id = $1`;
-    values.push(id); // Add id for WHERE clause
+    // WHERE clause placeholder
+    const idPlaceholder = `$${idx}`;
+    values.push(id);
 
-    const result = await this.dataSource.query(updateQuery, values);
-    return result;
+    const updateQuery = `
+        UPDATE ${tableName}
+        SET ${updates.join(', ')}
+        WHERE id = ${idPlaceholder}
+    `;
+
+    return await this.dataSource.query(updateQuery, values);
   }
 
   async getEntityByDataSource(
@@ -564,7 +544,9 @@ export class EntityDynamicService {
     const columns = validAttributes
       .map((attr) => `${attr.attribute_key}`)
       .join(', ');
-    const selectQuery = `SELECT ${columns} FROM ${dataSource} WHERE id = $1`;
+    const selectQuery = `SELECT ${columns}
+                         FROM ${dataSource}
+                         WHERE id = $1`;
 
     const result = await this.dataSource.query(selectQuery, [id]);
     if (!result.length) return null;
@@ -585,15 +567,16 @@ export class EntityDynamicService {
         row[attr.attribute_key] =
           row[attr.attribute_key] != null
             ? await this.mediaDataService.getMediaDownloadUrl(
-                Number(row[attr.attribute_key]),
-                loggedInUser,
-              )
+              Number(row[attr.attribute_key]),
+              loggedInUser,
+            )
             : null;
       }
     }
 
     return row;
   }
+
   // -----------------------------
   //TODO : make it normal getEntity function make another function if for resolve data
   async getEntity(
@@ -616,7 +599,9 @@ export class EntityDynamicService {
     const columns = validAttributes
       .map((attr) => `${attr.attribute_key}`)
       .join(', ');
-    const selectQuery = `SELECT ${columns} FROM ${tableName} WHERE id = $1`;
+    const selectQuery = `SELECT ${columns}
+                         FROM ${tableName}
+                         WHERE id = $1`;
 
     const result = await this.dataSource.query(selectQuery, [id]);
     if (!result.length) return null;
@@ -637,9 +622,9 @@ export class EntityDynamicService {
         row[attr.attribute_key] =
           row[attr.attribute_key] != null
             ? await this.mediaDataService.getMediaDownloadUrl(
-                Number(row[attr.attribute_key]),
-                loggedInUser,
-              )
+              Number(row[attr.attribute_key]),
+              loggedInUser,
+            )
             : null;
       }
     }
@@ -667,16 +652,15 @@ export class EntityDynamicService {
     entityType: string,
     organizationId: string,
   ): Promise<string> {
-    const result = await this.dataSource.query(
-      `SELECT db_table_name FROM frm_entity_master WHERE organization_id = $1 AND mapped_entity_type = $2`,
-      [organizationId, entityType],
-    );
 
-    if (!result.length) {
+    let entityMaster = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, organizationId);
+
+    if (!entityMaster) {
       console.log(`Entity type '${entityType}' not found in frm_entity_master`);
+      throw new BadRequestException();
     }
 
-    return result[0].db_table_name;
+    return entityMaster.db_table_name;
   }
 
   private async getAttributeCodes(
@@ -719,7 +703,9 @@ export class EntityDynamicService {
 
     const tableName = await this.getTableName(entityType, organizationId);
 
-    const deleteQuery = `DELETE FROM \`${tableName}\` WHERE id = $1`;
+    const deleteQuery = `DELETE
+                         FROM \`${tableName}\`
+                         WHERE id = $1`;
     const result = await this.dataSource.query(deleteQuery, [id]);
     return result;
   }
@@ -732,7 +718,9 @@ export class EntityDynamicService {
   ): Promise<any> {
     const organizationId = loggedInUser.organization_id;
 
-    let query = `SELECT name as label,mapped_entity_type as value FROM frm_entity_master WHERE organization_id = $1`;
+    let query = `SELECT name as label, mapped_entity_type as value
+                 FROM frm_entity_master
+                 WHERE organization_id = $1`;
     const params = [organizationId];
 
     if (appcode) {
@@ -749,9 +737,10 @@ export class EntityDynamicService {
 
     // 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`,
+      `SELECT db_table_name
+       FROM frm_entity_master
+       WHERE mapped_entity_type = $1
+         AND organization_id = $2`,
       [entityType, organizationId],
     );
 
@@ -766,8 +755,8 @@ export class EntityDynamicService {
     // 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
-     FROM \`${tableName}\`
-     WHERE entity_type = $1`,
+       FROM \`${tableName}\`
+       WHERE entity_type = $1`,
       [entityType],
     );
 
@@ -825,7 +814,7 @@ export class EntityDynamicService {
 
   async queryWithSchema(sql: string, params: any[] = []) {
     await this.dataSource.query('BEGIN');
-    const schema = this.configService.get<string>('DB_SCHEMA')
+    const schema = this.configService.get<string>('DB_SCHEMA');
     await this.dataSource.query(`SET LOCAL search_path TO ${schema}`);
     const result = await this.dataSource.query(sql, params);
     await this.dataSource.query('COMMIT');

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

@@ -102,9 +102,9 @@ export class EntityServiceImpl implements EntityService<BaseEntity> {
     const statusList = await repo.query(
       `SELECT id
        FROM frm_list_master_items
-       WHERE code = ?
-         AND organization_id = ?`,
-      [STATUS_ACTIVE, loggedInUser?.organization_id || -1],
+       WHERE code = $1
+         AND organization_id = $2`,
+      [STATUS_ACTIVE, loggedInUser?.organization_id || 0],
     );
 
     console.log('Status List:', statusList); // Debug log