rez_core 4.0.141 → 4.0.142

package/dist/utils/service/reflection-helper.service.js

@@ -53,7 +53,7 @@ let ReflectionHelper = class ReflectionHelper {
     async getEntityData(id, tableName) {
         const entityList = await this.dataSource.query(`SELECT *
                                                     FROM ${tableName}
-                                                    WHERE id = ?`, [id]);
+                                                    WHERE id = $1`, [id]);
         return entityList.length > 0 ? entityList[0] : null;
     }
 };

package/dist/utils/service/reflection-helper.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"reflection-helper.service.js","sourceRoot":"","sources":["../../../src/utils/service/reflection-helper.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAyC;AACzC,qCAAiD;AACjD,6CAAqD;AAG9C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACU,SAAoB,EACpB,UAAsB;QADtB,cAAS,GAAT,SAAS,CAAW;QACpB,eAAU,GAAV,UAAU,CAAY;IAEhC,CAAC;IAED,cAAc,CAAC,UAAkB;QAC/B,MAAM,cAAc,GAAQ,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAC9D,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,IAAI,KAAK,UAAU;YACxB,CAAC,IAAI,CAAC,MAAM,IAAK,IAAI,CAAC,MAAc,CAAC,IAAI,KAAK,UAAU,CAAC,CAC5D,CAAC;QAEF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,WAAW,UAAU,iCAAiC,CAAC,CAAC;YACtE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CACvB,IAAA,4BAAkB,EAAC,cAAc,CAAC,MAAM,CAAC,EACzC,EAAE,MAAM,EAAE,KAAK,EAAE,CAClB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,mBAAmB,UAAU,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAC1E,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAI,QAAgB;QAC/B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAI,QAAe,EAAE;gBACtD,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,CAAC,KAAK,CAAC,SAAS,QAAQ,2BAA2B,CAAC,CAAC;gBAC5D,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,SAAS,QAAQ,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,SAAiB;QAC/C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;2DACQ,SAAS;iEACH,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAErE,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtD,CAAC;CACF,CAAA;AAvDY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAGU,gBAAS;QACR,oBAAU;GAHrB,gBAAgB,CAuD5B"}
+{"version":3,"file":"reflection-helper.service.js","sourceRoot":"","sources":["../../../src/utils/service/reflection-helper.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,uCAAyC;AACzC,qCAAiD;AACjD,6CAAqD;AAG9C,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACU,SAAoB,EACpB,UAAsB;QADtB,cAAS,GAAT,SAAS,CAAW;QACpB,eAAU,GAAV,UAAU,CAAY;IAEhC,CAAC;IAED,cAAc,CAAC,UAAkB;QAC/B,MAAM,cAAc,GAAQ,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAC9D,CAAC,IAAI,EAAE,EAAE,CACP,IAAI,CAAC,IAAI,KAAK,UAAU;YACxB,CAAC,IAAI,CAAC,MAAM,IAAK,IAAI,CAAC,MAAc,CAAC,IAAI,KAAK,UAAU,CAAC,CAC5D,CAAC;QAEF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,CAAC,KAAK,CAAC,WAAW,UAAU,iCAAiC,CAAC,CAAC;YACtE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CACvB,IAAA,4BAAkB,EAAC,cAAc,CAAC,MAAM,CAAC,EACzC,EAAE,MAAM,EAAE,KAAK,EAAE,CAClB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,mBAAmB,UAAU,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAC1E,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAI,QAAgB;QAC/B,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAI,QAAe,EAAE;gBACtD,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO,CAAC,KAAK,CAAC,SAAS,QAAQ,2BAA2B,CAAC,CAAC;gBAC5D,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,SAAS,QAAQ,cAAc,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YAC9D,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,SAAiB;QAC/C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;2DACQ,SAAS;kEACF,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtE,OAAO,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACtD,CAAC;CACF,CAAA;AAvDY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAGU,gBAAS;QACR,oBAAU;GAHrB,gBAAgB,CAuD5B"}

package/package.json

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

package/src/module/filter/repository/saved-filter.repository.ts

@@ -148,7 +148,7 @@ export class SavedFilterRepositoryService {
     const [filterMaster] = await this.dataSource.query(
       `SELECT id, name, code 
      FROM frm_saved_filter_master 
-     WHERE code = ? AND organization_id = ? 
+     WHERE code = $1 AND organization_id = $2 
      LIMIT 1
 `,
       [code, loggedInUser.organization_id],

package/src/module/filter/service/filter-evaluator.service.ts

@@ -27,7 +27,7 @@ export class FilterEvaluatorService {
     const triggerFilters: SavedFilterDetail[] = await this.dataSource.query(
       `SELECT * 
        FROM frm_saved_filter_detail 
-       WHERE mapped_filter_code = ?`,
+       WHERE mapped_filter_code = $1`,
       [savedFilterCode],
     );
 

package/src/module/filter/service/filter.service.ts

@@ -366,7 +366,7 @@ export class FilterService {
     const layoutPreference = await this.dataSource.query(
       `SELECT mapped_json 
        FROM frm_entity_layout_pref
-       WHERE user_id = ? AND mapped_entity_type = ? AND mapped_level_id = ? AND mapped_level_type = ? AND type = 'layout'`,
+       WHERE user_id = $1 AND mapped_entity_type = $2 AND mapped_level_id = $3 AND mapped_level_type = $4 AND type = 'layout'`,
       [user_id, entity_type, level_id, level_type],
     );
 

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

@@ -32,8 +32,8 @@ export class WrapperService {
       );
       const configs = await this.datasource.query(
         `SELECT * FROM frm_integration_config 
-         WHERE level_id = ? 
-           AND level_type = ? 
+         WHERE level_id = $1
+           AND level_type = $2 
            AND status = 1
            AND integration_type = 'EMAIL'`,
         [level_id, level_type],
@@ -47,7 +47,7 @@ export class WrapperService {
           `Looking up templateCode=${payload.templateCode} for current level`,
         );
         const template = await this.datasource.query(
-          `SELECT rich_text FROM frm_wf_comm_template WHERE code = ? AND level_id = ? AND level_type = ? LIMIT 1`,
+          `SELECT rich_text FROM frm_wf_comm_template WHERE code = $1 AND level_id = $2 AND level_type = $3 LIMIT 1`,
           [payload.templateCode, level_id, level_type],
         );
         this.logger.debug(
@@ -220,9 +220,9 @@ export class WrapperService {
 
           templates = await this.datasource.query(
             `SELECT id FROM frm_wf_comm_template 
-           WHERE code = ? 
+           WHERE code = $1 
              AND level_type = 'ORG' 
-             AND organization_id = ? 
+             AND organization_id = $2 
            LIMIT 1`,
             [entity.template_code, organization_id],
           );
@@ -393,7 +393,7 @@ export class WrapperService {
     const configRes = await this.datasource.query(
       `SELECT config_json 
        FROM frm_integration_config 
-       WHERE id = ?`,
+       WHERE id = $1`,
       [configId],
     );
     this.logger.debug(`Config fetch result: ${JSON.stringify(configRes)}`);
@@ -413,10 +413,11 @@ export class WrapperService {
     if (payload.template_code) {
       let templates = await this.datasource.query(
         `SELECT id FROM frm_wf_comm_template 
-         WHERE code = ? 
-         ORDER BY 1 DESC 
+         WHERE code = $1 
+           AND level_id = $2 
+           AND level_type = $3 
          LIMIT 1`,
-        [payload.template_code],
+        [payload.template_code, levelId, levelType],
       );
       this.logger.log(`template by code  ${JSON.stringify(payload)}`);
       if (templates && templates.length > 0) {

package/src/module/listmaster/service/list-master-item.service.ts

@@ -192,7 +192,7 @@ export class ListMasterItemService extends EntityServiceImpl {
     const data = await this.dataSource.query(
       `SELECT name AS label, type AS value
      FROM frm_list_master
-     WHERE organization_id = ? AND source = ?`,
+     WHERE organization_id = $1 AND source = $2`,
       [loggedInUser.organization_id, source],
     );
     return data;

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

@@ -142,9 +142,9 @@ export class FieldMapperService extends EntityServiceImpl {
               const relations = await this.datasource.query(
                 `SELECT target_entity_id
                  FROM frm_entity_relation_data
-                 WHERE source_entity_type = ?
-                   AND source_entity_id = ?
-                   AND target_entity_type = ?`,
+                 WHERE source_entity_type = $1
+                   AND source_entity_id = $2
+                   AND target_entity_type = $3`,
                 [parent_type, parent_id, field.mapped_entity_type],
               );
 

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

@@ -22,7 +22,7 @@ export class MapperService extends EntityServiceImpl {
     const mappers = await this.dataSource.query(
       `SELECT id, name, code, status
        FROM frm_mapper_master
-       WHERE mapped_entity_type = ? AND organization_id = ? AND (-1 = ? OR name LIKE ? OR code LIKE ?)`,
+       WHERE mapped_entity_type = $1 AND organization_id = $2 AND (-1 = $3 OR name LIKE $4 OR code LIKE $5)`,
       [mappedEntityType,loggedInUser.organization_id, filter || -1, `%${filter}%`, `%${filter}%`],
     );
 
@@ -34,7 +34,7 @@ export class MapperService extends EntityServiceImpl {
     const statusMap = new Map();
     if (distinctStatuses.length > 0) {
       const statuses = await this.dataSource.query(
-        `SELECT id, name FROM frm_list_master_items WHERE id IN (?)`,
+        `SELECT id, name FROM frm_list_master_items WHERE id IN ($1)`,
         [distinctStatuses],
       );
       statuses.forEach((status) => {

package/src/module/meta/repository/attribute-master.repository.ts

@@ -82,7 +82,7 @@ export class AttributeMasterRepository {
     loggedInUser: UserData,
   ): Promise<string | null> {
     const result = await this.dataSource.query(
-      `SELECT db_table_name FROM frm_entity_master WHERE mapped_entity_type = ? AND organization_id = ?`,
+      `SELECT db_table_name FROM frm_entity_master WHERE mapped_entity_type = $1 AND organization_id = $2`,
       [entityType, loggedInUser.organization_id],
     );
     return result.length ? result[0].db_table_name : null;
@@ -93,7 +93,7 @@ export class AttributeMasterRepository {
     columnName: string,
   ): Promise<boolean> {
     const result = await this.dataSource.query(
-      `SHOW COLUMNS FROM \`${tableName}\` LIKE ?`,
+      `SHOW COLUMNS FROM \`${tableName}\` LIKE $1`,
       [columnName],
     );
     return result.length > 0;

package/src/module/meta/repository/entity-master.repository.ts

@@ -55,7 +55,7 @@ export class EntityMasterRepository {
     const organization_id = loggedInUser.organization_id;
 
     const attributes = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = ? AND data_type = 'DATE' AND organization_id = ?`,
+      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND data_type = 'DATE' AND organization_id = $2`,
       [entity_type, organization_id],
     );
 

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

@@ -33,7 +33,7 @@ export class EntityDynamicService {
     );
 
     const statusList = await this.dataSource.query(
-      `SELECT id FROM frm_list_master_items WHERE code = ? AND organization_id = ?`,
+      `SELECT id FROM frm_list_master_items WHERE code = $1 AND organization_id = $2`,
       [STATUS_ACTIVE, loggedInUser?.organization_id || 0],
     );
 
@@ -55,7 +55,7 @@ export class EntityDynamicService {
       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 = ?`,
+     WHERE entity_type = $1`,
         [entityData.entity_type],
       );
 
@@ -148,7 +148,7 @@ export class EntityDynamicService {
     const organizationId = loggedInUser.organization_id;
 
     const getRelation = await this.dataSource.query(
-      `SELECT * FROM frm_entity_relation WHERE organization_id = ? AND source_entity_type = ?`,
+      `SELECT * FROM frm_entity_relation WHERE organization_id = $1 AND source_entity_type = $2`,
       [organizationId, entityType],
     );
 
@@ -189,7 +189,7 @@ 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 (?, ?, ?, ?, ?,?)`,
+            `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,
@@ -225,8 +225,8 @@ export class EntityDynamicService {
     );
 
     const relatedEntities = await this.dataSource.query(
-      `SELECT * FROM frm_entity_relation_data WHERE  source_entity_id = ? AND target_entity_type IN (
-      SELECT target_entity_type FROM frm_entity_relation WHERE source_entity_type = ?)`,
+      `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],
     );
 
@@ -297,7 +297,7 @@ export class EntityDynamicService {
 
     if (mappedEntities) {
       const getRelationDefs = await this.dataSource.query(
-        `SELECT * FROM frm_entity_relation WHERE organization_id = ? AND source_entity_type = ?`,
+        `SELECT * FROM frm_entity_relation WHERE organization_id = $1 AND source_entity_type = $2`,
         [organizationId, entityType],
       );
 
@@ -316,7 +316,7 @@ 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 = ? AND source_entity_id = ? AND target_entity_type = ?`,
+          `SELECT * FROM frm_entity_relation_data WHERE source_entity_type = $1 AND source_entity_id = $2 AND target_entity_type = $3`,
           [entityType, id, targetEntityType],
         );
 
@@ -375,7 +375,7 @@ 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 (?, ?, ?, ?, ?,?)`,
+            VALUES ($1, $2, $3, $4, $5, $6)`,
               [
                 organizationId,
                 id,
@@ -517,7 +517,7 @@ export class EntityDynamicService {
       throw new Error('No valid attributes to update.');
     }
 
-    const updateQuery = `UPDATE \`${tableName}\` SET ${updates.join(', ')} WHERE id = ?`;
+    const updateQuery = `UPDATE \`${tableName}\` SET ${updates.join(', ')} WHERE id = $1`;
     values.push(id); // Add id for WHERE clause
 
     const result = await this.dataSource.query(updateQuery, values);
@@ -544,7 +544,7 @@ export class EntityDynamicService {
     const columns = validAttributes
       .map((attr) => `\`${attr.attribute_key}\``)
       .join(', ');
-    const selectQuery = `SELECT ${columns} FROM \`${dataSource}\` WHERE id = ?`;
+    const selectQuery = `SELECT ${columns} FROM \`${dataSource}\` WHERE id = $1`;
 
     const result = await this.dataSource.query(selectQuery, [id]);
     if (!result.length) return null;
@@ -596,7 +596,7 @@ export class EntityDynamicService {
     const columns = validAttributes
       .map((attr) => `\`${attr.attribute_key}\``)
       .join(', ');
-    const selectQuery = `SELECT ${columns} FROM \`${tableName}\` WHERE id = ?`;
+    const selectQuery = `SELECT ${columns} FROM \`${tableName}\` WHERE id = $1`;
 
     const result = await this.dataSource.query(selectQuery, [id]);
     if (!result.length) return null;
@@ -632,7 +632,7 @@ export class EntityDynamicService {
     organizationId: string,
   ): Promise<string> {
     const result = await this.dataSource.query(
-      `SELECT data_source, db_table_name FROM frm_entity_master WHERE organization_id = ? AND mapped_entity_type = ?`,
+      `SELECT data_source, db_table_name FROM frm_entity_master WHERE organization_id = $1 AND mapped_entity_type = $2`,
       [organizationId, entityType],
     );
     if (!result.length) {
@@ -648,7 +648,7 @@ export class EntityDynamicService {
     organizationId: string,
   ): Promise<string> {
     const result = await this.dataSource.query(
-      `SELECT db_table_name FROM frm_entity_master WHERE organization_id = ? AND mapped_entity_type = ?`,
+      `SELECT db_table_name FROM frm_entity_master WHERE organization_id = $1 AND mapped_entity_type = $2`,
       [organizationId, entityType],
     );
 
@@ -713,7 +713,7 @@ export class EntityDynamicService {
 
     const tableName = await this.getTableName(entityType, organizationId);
 
-    const deleteQuery = `DELETE FROM \`${tableName}\` WHERE id = ?`;
+    const deleteQuery = `DELETE FROM \`${tableName}\` WHERE id = $1`;
     const result = await this.dataSource.query(deleteQuery, [id]);
     return result;
   }
@@ -726,11 +726,11 @@ 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 = ?`;
+    let query = `SELECT name as label,mapped_entity_type as value FROM frm_entity_master WHERE organization_id = $1`;
     const params = [organizationId];
 
     if (appcode) {
-      query += ` AND appcode = ?`;
+      query += ` AND appcode = $2`;
       params.push(appcode);
     }
 
@@ -745,7 +745,7 @@ export class EntityDynamicService {
     const result = await this.dataSource.query(
       `SELECT db_table_name 
      FROM frm_entity_master 
-     WHERE mapped_entity_type = ? AND organization_id = ?`,
+     WHERE mapped_entity_type = $1 AND organization_id = $2`,
       [entityType, organizationId],
     );
 
@@ -761,7 +761,7 @@ export class EntityDynamicService {
     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 = ?`,
+     WHERE entity_type = $1`,
       [entityType],
     );
 

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

@@ -91,8 +91,8 @@ export class EntityMasterService {
     const attributes = await this.dataSource.query(
       `SELECT * 
      FROM frm_entity_attribute 
-     WHERE mapped_entity_type = ? 
-       AND organization_id = ? `,
+     WHERE mapped_entity_type = $1 
+       AND organization_id = $2 `,
       [entityMasterData.mapped_entity_type, loggedInUser.organization_id],
     );
 

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

@@ -16,7 +16,7 @@ export class EntityRelationService extends EntityServiceImpl {
     const relations = await this.dataSource.query(
       `SELECT name as label, target_entity_type as value, id 
        FROM frm_entity_relation 
-       WHERE source_entity_type = ? AND organization_id = ?`,
+       WHERE source_entity_type = $1 AND organization_id = $2`,
       [entityType, loggedInUser.organization_id],
     );
   
@@ -24,7 +24,7 @@ export class EntityRelationService extends EntityServiceImpl {
       const [entity] = await this.dataSource.query(
         `SELECT name as label 
          FROM frm_entity_master 
-         WHERE mapped_entity_type = ? AND organization_id = ?`,
+         WHERE mapped_entity_type = $1 AND organization_id = $2`,
         [entityType, loggedInUser.organization_id],
       );
   
@@ -53,10 +53,10 @@ export class EntityRelationService extends EntityServiceImpl {
       `
       SELECT DISTINCT source_entity_id
       FROM frm_entity_relation_data
-      WHERE source_entity_type = ?
-        AND target_entity_type = ?
-        AND target_entity_id IN (?)
-        AND organization_id = ?
+      WHERE source_entity_type = $1
+        AND target_entity_type = $2
+        AND target_entity_id IN ($3)
+        AND organization_id = $4
       `,
       [sourceEntity, targetEntity, targetIds, orgId],
     );

package/src/module/meta/service/media-data.service.ts

@@ -198,7 +198,7 @@ export class MediaDataService extends EntityServiceImpl {
 
     // --- ORG ---
     let organizationData = await this.dataSource.query(
-      'SELECT * FROM sso_organization WHERE id = ?',
+      'SELECT * FROM sso_organization WHERE id = $1',
       [loggedInUser.organization_id],
     );
     replacements['org_code'] = organizationData[0].code;
@@ -222,13 +222,13 @@ export class MediaDataService extends EntityServiceImpl {
 
     // Get entity data for level_code
     const getEntityData = await this.dataSource.query(
-      `SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? and organization_id = ?`,
+      `SELECT * FROM cr_entity_master WHERE mapped_entity_type = $1 and organization_id = $2`,
       [levelEntityType, loggedInUser.organization_id],
     );
 
     if (getEntityData.length == 0) return null;
     const levelEntityDataResult = await this.dataSource.query(
-      `SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = ?`,
+      `SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = $1`,
       [levelEntityId],
     );
 
@@ -270,13 +270,13 @@ export class MediaDataService extends EntityServiceImpl {
 
       // Get entity data for level_code
       const getEntityData = await this.dataSource.query(
-        `SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? and organization_id = ?`,
+        `SELECT * FROM cr_entity_master WHERE mapped_entity_type = $1 and organization_id = $2`,
         [mappedEntityType, loggedInUser.organization_id],
       );
 
       if (getEntityData.length == 0) return null;
       const levelEntityDataResult = await this.dataSource.query(
-        `SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = ?`,
+        `SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = $1`,
         [mappedEntityId],
       );
 
@@ -290,13 +290,13 @@ export class MediaDataService extends EntityServiceImpl {
         pathTemplate = '${org_code}/template/${template_code}';
       } else {
         const getEntityData = await this.dataSource.query(
-          `SELECT * FROM cr_entity_master WHERE mapped_entity_type = ? and organization_id = ?`,
+          `SELECT * FROM cr_entity_master WHERE mapped_entity_type = $1 and organization_id = $2`,
           [mappedEntityType, loggedInUser.organization_id],
         );
 
         if (getEntityData.length == 0) return null;
         const levelEntityDataResult = await this.dataSource.query(
-          `SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = ?`,
+          `SELECT * FROM ${getEntityData[0]?.db_table_name} WHERE id = $1`,
           [mappedEntityId],
         );
 
@@ -418,11 +418,11 @@ export class MediaDataService extends EntityServiceImpl {
         });
     } else {
       organizationData = await this.dataSource.query(
-        'SELECT * FROM adm_org_profile WHERE id = ?',
+        'SELECT * FROM adm_org_profile WHERE id = $1',
         [loggedInUser.organization_id],
       );
       levelData = await this.dataSource.query(
-        'SELECT * FROM adm_school_profile WHERE id = ?',
+        'SELECT * FROM adm_school_profile WHERE id = $1',
         [loggedInUser.level_id],
       );
     }

package/src/module/meta/service/resolver.service.ts

@@ -32,7 +32,7 @@ export class ResolverService {
     entityType: string,
   ): Promise<any> {
     const attributeItems = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = ? AND organization_id = ?`,
+      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND organization_id = $2`,
       [entityType, loggedInUser.organization_id],
     );
 
@@ -129,7 +129,7 @@ export class ResolverService {
 
     // fetch attribute meta only for the given attributeKey
     const [attr] = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = ? AND organization_id = ? AND attribute_key = ?`,
+      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND organization_id = $2 AND attribute_key = $3`,
       [entityType, loggedInUser.organization_id, attrKey],
     );
 
@@ -138,7 +138,7 @@ export class ResolverService {
     // -------- ENTITY data_source_type --------
     if (attr.data_source_type === 'entity') {
       const [entityDef] = await this.dataSource.query(
-        `SELECT * FROM frm_entity_master WHERE mapped_entity_type = ? AND organization_id = ?`,
+        `SELECT * FROM frm_entity_master WHERE mapped_entity_type = $1 AND organization_id = $2`,
         [attr.datasource_list, loggedInUser.organization_id],
       );
 
@@ -151,8 +151,8 @@ export class ResolverService {
         for (const code of rawValue) {
           const query =
             tableName === 'sso_organization'
-              ? `SELECT * FROM ${tableName} WHERE code = ?`
-              : `SELECT * FROM ${tableName} WHERE id = ? AND organization_id = ?`;
+              ? `SELECT * FROM ${tableName} WHERE code = $1`
+              : `SELECT * FROM ${tableName} WHERE id = $1 AND organization_id = $2`;
 
           const params =
             tableName === 'sso_organization'
@@ -166,8 +166,8 @@ export class ResolverService {
       } else {
         const query =
           tableName === 'sso_organization'
-            ? `SELECT * FROM ${tableName} WHERE id = ?`
-            : `SELECT * FROM ${tableName} WHERE id = ? AND organization_id = ?`;
+            ? `SELECT * FROM ${tableName} WHERE id = $1`
+            : `SELECT * FROM ${tableName} WHERE id = $1 AND organization_id = $2`;
 
         const params =
           tableName === 'sso_organization'
@@ -185,7 +185,7 @@ export class ResolverService {
         const resolvedValues: string[] = [];
         for (const code of rawValue) {
           const [item] = await this.dataSource.query(
-            `SELECT * FROM frm_list_master_items WHERE id = ? AND organization_id = ?`,
+            `SELECT * FROM frm_list_master_items WHERE id = $1 AND organization_id = $2`,
             [code, loggedInUser.organization_id],
           );
           resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
@@ -193,7 +193,7 @@ export class ResolverService {
         return resolvedValues;
       } else {
         const [item] = await this.dataSource.query(
-          `SELECT * FROM frm_list_master_items WHERE id = ? AND organization_id = ?`,
+          `SELECT * FROM frm_list_master_items WHERE id = $1 AND organization_id = $2`,
           [rawValue, loggedInUser.organization_id],
         );
         return item?.[attr.data_source_attribute] ?? rawValue;
@@ -220,7 +220,7 @@ export class ResolverService {
     // fetch attribute meta
     const [attr] = await this.dataSource.query(
       `SELECT * FROM frm_entity_attribute 
-       WHERE mapped_entity_type = ? AND organization_id = ? AND attribute_key = ?`,
+       WHERE mapped_entity_type = $1 AND organization_id = $2 AND attribute_key = $3`,
       [entityType, loggedInUser.organization_id, attrKey],
     );
 
@@ -230,7 +230,7 @@ export class ResolverService {
     if (attr.data_source_type === 'entity') {
       const [entityDef] = await this.dataSource.query(
         `SELECT * FROM frm_entity_master 
-         WHERE mapped_entity_type = ? AND organization_id = ?`,
+         WHERE mapped_entity_type = $1 AND organization_id = $2`,
         [attr.datasource_list, loggedInUser.organization_id],
       );
 
@@ -240,8 +240,8 @@ export class ResolverService {
 
       const query =
         tableName === 'sso_organization'
-          ? `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = ?`
-          : `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`;
+          ? `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = $1`
+          : `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = $1 AND organization_id = $2`;
 
       const params =
         tableName === 'sso_organization'
@@ -256,7 +256,7 @@ export class ResolverService {
     else if (attr.data_source_type === 'master') {
       const [item] = await this.dataSource.query(
         `SELECT id FROM frm_list_master_items 
-         WHERE ${attr.data_source_attribute} = ? AND organization_id = ? AND listtype = ?`,
+         WHERE ${attr.data_source_attribute} = $1 AND organization_id = $2 AND listtype = $3`,
         [displayValue, loggedInUser.organization_id, attr.datasource_list],
       );
       return item?.id ?? displayValue;

package/src/module/notification/service/notification.service.ts

@@ -151,7 +151,7 @@ export class NotificationsService {
     const query = `
     UPDATE frm_notification
     SET is_read = 1
-    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
+    WHERE user_id = $1 AND level_id = $2 AND level_type = $3 AND is_read = 0
   `;
 
     const params = [id, level_id, level_type];

package/src/module/user/service/login.service.ts

@@ -239,7 +239,7 @@ export class LoginService {
       const brandId = brnAccesses[0].level_id;
 
       const rows = await this.dataSource.query(
-        `SELECT id FROM sso_school WHERE brand_id = ? ORDER BY id ASC LIMIT 1`,
+        `SELECT id FROM sso_school WHERE brand_id = $1 ORDER BY id ASC LIMIT 1`,
         [brandId],
       );
 

package/src/module/user/service/user-session.service.ts

@@ -92,7 +92,7 @@ export class UserSessionService {
       // Check if user has any role mappings for the given appcode
       getUserDetails = await this.dataSource.query(
         `
-        SELECT * from sso_user where id = ?
+        SELECT * from sso_user where id = $1
       `,
         [currentUser.id],
       );
@@ -103,7 +103,7 @@ export class UserSessionService {
     }
 
     await this.dataSource.query(
-      `UPDATE sso_user SET last_app_access  = ? , last_level_type = ?, last_level_id = ? WHERE id = ?`,
+      `UPDATE sso_user SET last_app_access  = $1 , last_level_type = $2, last_level_id = $3 WHERE id = $4`,
       [data.appcode, data.level_type, data.level_id, currentUser.id],
     );
 
@@ -150,7 +150,7 @@ export class UserSessionService {
     //DONE
     // If BRN, resolve first SCH under this brand
     const schools = await this.dataSource.query(
-      `SELECT id FROM sso_school WHERE brand_id = ? ORDER BY id ASC LIMIT 1`,
+      `SELECT id FROM sso_school WHERE brand_id = $1 ORDER BY id ASC LIMIT 1`,
       [mapping.level_id],
     );
 

package/src/module/workflow/repository/action-data.repository.ts

@@ -40,7 +40,7 @@ export class ActionDataRepository extends EntityServiceImpl {
     if (action.length > 0) {
       for (const act of action) {
         const is_mandatory = await this.dataSource.query(
-          `SELECT code FROM frm_list_master_items WHERE id = ? and organization_id = ? LIMIT 1;`,
+          `SELECT code FROM frm_list_master_items WHERE id = $1 and organization_id = $2 LIMIT 1;`,
           [act.action_requirement, loggedInUser.organization_id],
         );
         const isFirst = act.sequence == minSequence;
@@ -100,13 +100,13 @@ export class ActionDataRepository extends EntityServiceImpl {
           // THEN INSERT SDFM IN RELATION TASK TABLE
 
           let relationData = await this.dataSource.query(
-            `SELECT * FROM frm_entity_relation WHERE source_entity_type = ?  AND target_entity_type = ?`,
+            `SELECT * FROM frm_entity_relation WHERE source_entity_type = $1  AND target_entity_type = $2`,
             [createdEntity.mapped_entity_type, createdEntity.entity_type],
           );
 
           if (relationData) {
             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 (?, ?, ?, ?, ?,?)`,
+              `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)`,
               [
                 loggedInUser.organization_id,
                 createdEntity.mapped_entity_id,
@@ -256,7 +256,7 @@ export class ActionDataRepository extends EntityServiceImpl {
 
         // Reset status (optional: set to something like 'pending' if needed)
         const pendingListMasterItemId = await this.dataSource.query(
-          `SELECT id FROM frm_list_master_items WHERE code = 'in_progress' AND organization_id = ? AND listtype = 'TKST' LIMIT 1;`,
+          `SELECT id FROM frm_list_master_items WHERE code = 'in_progress' AND organization_id = $1 AND listtype = 'TKST' LIMIT 1;`,
           [organization_id],
         );
         task.status = pendingListMasterItemId[0]?.id ?? task.status;