rez_core 4.0.223 → 5.0.1

package/package.json

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

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

@@ -15,14 +15,17 @@ export class EntityMasterRepository {
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
     @InjectRepository(EntityRelation)
-    private readonly entityRelationRepo: Repository<EntityRelation>
-  ) {}
+    private readonly entityRelationRepo: Repository<EntityRelation>,
+  ) {
+  }
 
   async getEntityById(id: number): Promise<EntityMaster | null> {
     let data = await this.entityMasterRepository.findOne({ where: { id } });
     if (data) {
       let listMasterData = await this.entityMasterRepository.query(
-        `SELECT * FROM frm_list_master_items where id = $1`,
+        `SELECT *
+         FROM frm_list_master_items
+         where id = $1`,
         [data?.status],
       );
       data.status = listMasterData?.[0].name;
@@ -30,35 +33,40 @@ export class EntityMasterRepository {
     return data;
   }
 
-  async getAllEntityDropdownData(entity_type:string,loggedInUser) : Promise<{ label: string; value: any }[]> {
-
+  async getAllEntityDropdownData(entity_type: string, loggedInUser): Promise<{ label: string; value: any }[]> {
 
 
-let relations = await this.entityRelationRepo
-  .createQueryBuilder('rel')
-  .select([
-    'rel.name AS label',
-    'rel.target_entity_type AS value',
-  ])
-  .where('rel.source_entity_type = :entityType', { entityType: entity_type })
-  .andWhere('rel.organization_id = :orgId', { orgId: loggedInUser.organization_id })
-  .getRawMany();
+    let relations = await this.entityRelationRepo
+      .createQueryBuilder('rel')
+      .select([
+        'rel.name AS label',
+        'rel.target_entity_type AS value',
+      ])
+      .where('rel.source_entity_type = :entityType', { entityType: entity_type })
+      .andWhere('rel.organization_id = :orgId', { orgId: loggedInUser.organization_id })
+      .getRawMany();
 
-  // console.log(relations,"-------------")
- let parentEntityLabelName = await this.entityMasterRepository.findOne({where:{organization_id: loggedInUser.organization_id,mapped_entity_type:entity_type}});
-let dropdownData :any[]=[...relations];
-if(parentEntityLabelName) {
-   dropdownData.push({label:parentEntityLabelName.name,value:entity_type
-  });
-}
+    // console.log(relations,"-------------")
+    let parentEntityLabelName = await this.entityMasterRepository.findOne({
+      where: {
+        organization_id: loggedInUser.organization_id,
+        mapped_entity_type: entity_type,
+      },
+    });
+    let dropdownData: any[] = [...relations];
+    if (parentEntityLabelName) {
+      dropdownData.push({
+        label: parentEntityLabelName.name, value: entity_type,
+      });
+    }
 
-return dropdownData.length ? dropdownData:[];
-}
+    return dropdownData.length ? dropdownData : [];
+  }
 
 
   async getEntityByMappedEntityType(
     mappedEntityType: string,
-    organizationId: number,
+    organizationId: any,
   ): Promise<EntityMaster | null> {
     return await this.entityMasterRepository.findOne({
       where: {
@@ -85,7 +93,11 @@ return dropdownData.length ? dropdownData:[];
     const organization_id = loggedInUser.organization_id;
 
     const attributes = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND data_type = 'DATE' AND organization_id = $2`,
+      `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

@@ -1,5 +1,5 @@
 import { level } from 'winston';
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import {
   ENTITYTYPE_ENTITYMASTER,
   STATUS_ACTIVE,
@@ -9,6 +9,8 @@ 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()
 export class EntityDynamicService {
@@ -17,6 +19,7 @@ export class EntityDynamicService {
     private readonly mediaDataService: MediaDataService,
     private readonly resolverService: ResolverService,
     private readonly configService: ConfigService,
+    private readonly entityMasterRepo: EntityMasterRepository,
   ) {}
 
   // -----------------------------
@@ -649,15 +652,14 @@ export class EntityDynamicService {
     organizationId: string,
   ): Promise<string> {
 
-    const result = await this.queryWithSchema(`SELECT data_source, db_table_name FROM frm_entity_master WHERE organization_id = $1 AND mapped_entity_type = $2`,
-      [organizationId, entityType]
-      );
+    const result = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, organizationId);
 
-    if (!result.length) {
+    if (!result) {
       console.log(`Entity type '${entityType}' not found in frm_entity_master`);
+      throw new BadRequestException();
     }
 
-    return result[0].data_source;
+    return result.data_source;
   }
 
   // -----------------------------

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

@@ -50,34 +50,35 @@ export class EntityRelationService extends EntityServiceImpl {
     if (!targetIds.length) return [];
 
     let paramIndex = 1;
+    const params: any[] = [];
 
-    // first three params
-    const params: any[] = [
-      String(sourceEntity),  // $1
-      String(targetEntity),  // $2
-    ];
+    // $1 and $2 are text (entity types)
+    params.push(sourceEntity); // do NOT convert to string, pg will treat as text
+    const sourceEntityParam = `$${paramIndex++}`;
 
-    // build placeholders for targetIds
+    params.push(targetEntity);
+    const targetEntityParam = `$${paramIndex++}`;
+
+    // Build placeholders for IDs → IDs must remain NUMBER
     const idPlaceholders = targetIds
       .map((id) => {
-        params.push(String(id));
-        paramIndex++;
-        return `$${paramIndex}`;
+        params.push(Number(id));   // ✔ FIX: Use Number
+        return `$${paramIndex++}`;
       })
       .join(", ");
 
-    // now orgId
-    params.push(String(orgId));
-    paramIndex++;
+    // org id
+    params.push(Number(orgId));   // ✔ FIX: Use Number
+    const orgPlaceholder = `$${paramIndex}`;
 
     const sql = `
-    SELECT DISTINCT source_entity_id
-    FROM frm_entity_relation_data
-    WHERE source_entity_type = $1
-      AND target_entity_type = $2
-      AND target_entity_id IN (${idPlaceholders})
-      AND organization_id = $${paramIndex}
-  `;
+        SELECT DISTINCT source_entity_id
+        FROM frm_entity_relation_data
+        WHERE source_entity_type = ${sourceEntityParam}
+          AND target_entity_type = ${targetEntityParam}
+          AND target_entity_id IN (${idPlaceholders})
+          AND organization_id = ${orgPlaceholder}
+    `;
 
     const rows = await this.dataSource.query(sql, params);