rez_core 5.0.88 → 5.0.90

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

@@ -1,171 +1,171 @@
-import { forwardRef, Inject, Injectable } from '@nestjs/common';
-import { DataSource, Repository } from 'typeorm';
-import { InjectRepository } from '@nestjs/typeorm';
-import { EntityMaster } from '../entity/entity-master.entity';
-import { EntityMasterRepository } from '../repository/entity-master.repository';
-import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
-import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
-import { AttributeMasterRepository } from '../repository/attribute-master.repository';
-
-@Injectable()
-export class EntityMasterService {
-  constructor(
-    @InjectRepository(EntityMaster)
-    private entityMasterRepository: Repository<EntityMaster>,
-    private attributeMasterRepo: AttributeMasterRepository,
-    private entityMasterRepo: EntityMasterRepository,
-    private readonly dataSource: DataSource,
-    @Inject('ListMasterService')
-    private readonly listMasterService: ListMasterService,
-    private readonly savedFilterRepoService: SavedFilterRepositoryService,
-  ) {}
-
-  async getEntityById(id: number): Promise<EntityMaster | null> {
-    return this.entityMasterRepo.getEntityById(id);
-  }
-
-  async getAllEntityDropDown(entity_type:string,loggedInUser): Promise<{ label: string; value: any }[]>{
-    return this.entityMasterRepo.getAllEntityDropdownData(entity_type,loggedInUser);
-  }
-
-  async getEntityData(
-    mappedEntityType: string | null,
-    loggedInUser,
-    mapped_entity_id?: number,
-  ): Promise<EntityMaster> {
-    if (mappedEntityType) {
-      let filterCondition = {
-        mapped_entity_type: mappedEntityType,
-        organization_id: loggedInUser.organization_id,
-      };
-      if (mapped_entity_id) {
-        filterCondition['id'] = mapped_entity_id;
-      }
-      const entityMaster = await this.entityMasterRepository.findOne({
-        where: filterCondition,
-      });
-
-      if (!entityMaster) {
-        throw new Error(
-          `Entity with mappedEntityType "${mappedEntityType}" not found.`,
-        );
-      }
-
-      return entityMaster;
-    } else {
-      throw new Error();
-    }
-  }
-
-  async getEntityByTableName(tableName: string) {
-    const entityMaster = await this.entityMasterRepository.findOne({
-      where: { db_table_name: tableName },
-    });
-    return entityMaster;
-  }
-
-  async save(entityMaster: EntityMaster) {
-    return await this.entityMasterRepository.save(entityMaster);
-  }
-
-  async update(id: number, entityMaster: EntityMaster) {
-    return await this.entityMasterRepository.update(id, entityMaster);
-  }
-
-  async findByMappedEntityType(mappedEntityType: string) {
-    return await this.entityMasterRepository.findOne({
-      where: { mapped_entity_type: mappedEntityType },
-    });
-  }
-
-  async getFilterMetaData(entityType: string, loggedInUser: any) {
-    // Step 1: Get entity_master record by mapped_entity_type
-    const entityMasterData =
-      await this.entityMasterRepo.getEntityByMappedEntityType(
-        entityType,
-        loggedInUser.organization_id,
-      );
-
-    if (!entityMasterData) {
-      throw new Error(
-        `Entity master with mapped_entity_type "${entityType}" not found.`,
-      );
-    }
-
-    // Step 2: Get attribute_master (instead of entity_table_column)
-
-    const attributes = await this.attributeMasterRepo.findAttributesByMappedEntityType(entityMasterData.mapped_entity_type, loggedInUser);
-
-    // Step 3: Attach column_list from attribute_master
-    entityMasterData['attribute_list'] = attributes;
-
-    // Step 4: Keep existing operation_list logic
-    entityMasterData['operation_list'] = {
-      text: await this.listMasterService.getDropdownOptions(
-        'OPT',
-        {},
-        [],
-        loggedInUser,
-      ),
-      number: await this.listMasterService.getDropdownOptions(
-        'OPN',
-        {},
-        [],
-        loggedInUser,
-      ),
-      date: await this.listMasterService.getDropdownOptions(
-        'OPD',
-        {},
-        [],
-        loggedInUser,
-      ),
-      select: await this.listMasterService.getDropdownOptions(
-        'OPS',
-        {},
-        [],
-        loggedInUser,
-      ),
-      multiselect: await this.listMasterService.getDropdownOptions(
-        'OPM',
-        {},
-        [],
-        loggedInUser,
-      ),
-      year: await this.listMasterService.getDropdownOptions(
-        'OPY',
-        {},
-        [],
-        loggedInUser,
-      ),
-    };
-
-    // Step 5: Keep filters as is
-    entityMasterData['default_filter'] =
-      await this.savedFilterRepoService.getDefaultFilterByEntityType(
-        entityType,
-      );
-
-    if (loggedInUser.id) {
-      entityMasterData['saved_filter'] =
-        await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
-          loggedInUser.id,
-          entityType,
-        );
-    }
-
-    return entityMasterData;
-  }
-
-  async getOperationList(loggedInUser: any) {
-    return await this.entityMasterRepo.getOperationList(loggedInUser);
-  }
-
-  async getAttributesOfTypeDate(entityType: string, loggedInUser: any) {
-    return await this.entityMasterRepo.getAttributesOfTypeDate(
-      entityType,
-      loggedInUser,
-    );
-  }
-
-
-}
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
+import { DataSource, Repository } from 'typeorm';
+import { InjectRepository } from '@nestjs/typeorm';
+import { EntityMaster } from '../entity/entity-master.entity';
+import { EntityMasterRepository } from '../repository/entity-master.repository';
+import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { SavedFilterRepositoryService } from 'src/module/filter/repository/saved-filter.repository';
+import { AttributeMasterRepository } from '../repository/attribute-master.repository';
+
+@Injectable()
+export class EntityMasterService {
+  constructor(
+    @InjectRepository(EntityMaster)
+    private entityMasterRepository: Repository<EntityMaster>,
+    private attributeMasterRepo: AttributeMasterRepository,
+    private entityMasterRepo: EntityMasterRepository,
+    private readonly dataSource: DataSource,
+    @Inject('ListMasterService')
+    private readonly listMasterService: ListMasterService,
+    private readonly savedFilterRepoService: SavedFilterRepositoryService,
+  ) {}
+
+  async getEntityById(id: number): Promise<EntityMaster | null> {
+    return this.entityMasterRepo.getEntityById(id);
+  }
+
+  async getAllEntityDropDown(entity_type:string,loggedInUser): Promise<{ label: string; value: any }[]>{
+    return this.entityMasterRepo.getAllEntityDropdownData(entity_type,loggedInUser);
+  }
+
+  async getEntityData(
+    mappedEntityType: string | null,
+    loggedInUser,
+    mapped_entity_id?: number,
+  ): Promise<EntityMaster> {
+    if (mappedEntityType) {
+      let filterCondition = {
+        mapped_entity_type: mappedEntityType,
+        organization_id: loggedInUser.organization_id,
+      };
+      if (mapped_entity_id) {
+        filterCondition['id'] = mapped_entity_id;
+      }
+      const entityMaster = await this.entityMasterRepository.findOne({
+        where: filterCondition,
+      });
+
+      if (!entityMaster) {
+        throw new Error(
+          `Entity with mappedEntityType "${mappedEntityType}" not found.`,
+        );
+      }
+
+      return entityMaster;
+    } else {
+      throw new Error();
+    }
+  }
+
+  async getEntityByTableName(tableName: string) {
+    const entityMaster = await this.entityMasterRepository.findOne({
+      where: { db_table_name: tableName },
+    });
+    return entityMaster;
+  }
+
+  async save(entityMaster: EntityMaster) {
+    return await this.entityMasterRepository.save(entityMaster);
+  }
+
+  async update(id: number, entityMaster: EntityMaster) {
+    return await this.entityMasterRepository.update(id, entityMaster);
+  }
+
+  async findByMappedEntityType(mappedEntityType: string) {
+    return await this.entityMasterRepository.findOne({
+      where: { mapped_entity_type: mappedEntityType },
+    });
+  }
+
+  async getFilterMetaData(entityType: string, loggedInUser: any) {
+    // Step 1: Get entity_master record by mapped_entity_type
+    const entityMasterData =
+      await this.entityMasterRepo.getEntityByMappedEntityType(
+        entityType,
+        loggedInUser.organization_id,
+      );
+
+    if (!entityMasterData) {
+      throw new Error(
+        `Entity master with mapped_entity_type "${entityType}" not found.`,
+      );
+    }
+
+    // Step 2: Get attribute_master (instead of entity_table_column)
+
+    const attributes = await this.attributeMasterRepo.findAttributesByMappedEntityType(entityMasterData.mapped_entity_type, loggedInUser);
+
+    // Step 3: Attach column_list from attribute_master
+    entityMasterData['attribute_list'] = attributes;
+
+    // Step 4: Keep existing operation_list logic
+    entityMasterData['operation_list'] = {
+      text: await this.listMasterService.getDropdownOptions(
+        'OPT',
+        {},
+        [],
+        loggedInUser,
+      ),
+      number: await this.listMasterService.getDropdownOptions(
+        'OPN',
+        {},
+        [],
+        loggedInUser,
+      ),
+      date: await this.listMasterService.getDropdownOptions(
+        'OPD',
+        {},
+        [],
+        loggedInUser,
+      ),
+      select: await this.listMasterService.getDropdownOptions(
+        'OPS',
+        {},
+        [],
+        loggedInUser,
+      ),
+      multiselect: await this.listMasterService.getDropdownOptions(
+        'OPM',
+        {},
+        [],
+        loggedInUser,
+      ),
+      year: await this.listMasterService.getDropdownOptions(
+        'OPY',
+        {},
+        [],
+        loggedInUser,
+      ),
+    };
+
+    // Step 5: Keep filters as is
+    entityMasterData['default_filter'] =
+      await this.savedFilterRepoService.getDefaultFilterByEntityType(
+        entityType,
+      );
+
+    if (loggedInUser.id) {
+      entityMasterData['saved_filter'] =
+        await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(
+          loggedInUser.id,
+          entityType,
+        );
+    }
+
+    return entityMasterData;
+  }
+
+  async getOperationList(loggedInUser: any) {
+    return await this.entityMasterRepo.getOperationList(loggedInUser);
+  }
+
+  async getAttributesOfTypeDate(entityType: string, loggedInUser: any) {
+    return await this.entityMasterRepo.getAttributesOfTypeDate(
+      entityType,
+      loggedInUser,
+    );
+  }
+
+
+}

package/src/module/meta/service/entity-realation-data.service.ts

@@ -1,9 +1,9 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from './entity-service-impl.service';
-
-@Injectable()
-export class EntityRelationDataService extends EntityServiceImpl {
-  constructor() {
-    super();
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from './entity-service-impl.service';
+
+@Injectable()
+export class EntityRelationDataService extends EntityServiceImpl {
+  constructor() {
+    super();
+  }
+}

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

@@ -1,87 +1,69 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from './entity-service-impl.service';
-import { DataSource } from 'typeorm';
-import { EntityMasterRepository } from '../repository/entity-master.repository';
-
-@Injectable()
-export class EntityRelationService extends EntityServiceImpl {
-  constructor(private readonly dataSource: DataSource,
-              private entityMasterRepo: EntityMasterRepository) {
-    super();
-  }
-
-  async getEntityRelations(
-    entityType: string,
-    loggedInUser: any,
-    includeSelf = false,
-  ): Promise<any> {
-    const relations = await this.dataSource.query(
-      `SELECT name as label, target_entity_type as value, id 
-       FROM frm_entity_relation 
-       WHERE source_entity_type = $1 AND organization_id = $2`,
-      [entityType, loggedInUser.organization_id],
-    );
-  
-    if (includeSelf) {
-      const entity = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.organization_id);
-  
-      if (entity) {
-        relations.unshift({
-          label: entity.name,
-          value: entityType,
-          id: null, // or some special marker
-        });
-      }
-    }
-  
-    return relations;
-  }
-
-  async getRelatedEntityIds(
-    sourceEntity: string,
-    targetEntity: string,
-    targetIds: number[],
-    orgId: number,
-  ): Promise<number[]> {
-
-    if (!targetIds.length) return [];
-
-    let paramIndex = 1;
-    const params: any[] = [];
-
-    // $1 and $2 are text (entity types)
-    params.push(sourceEntity); // do NOT convert to string, pg will treat as text
-    const sourceEntityParam = `$${paramIndex++}`;
-
-    params.push(targetEntity);
-    const targetEntityParam = `$${paramIndex++}`;
-
-    // Build placeholders for IDs → IDs must remain NUMBER
-    const idPlaceholders = targetIds
-      .map((id) => {
-        params.push(Number(id));   // ✔ FIX: Use Number
-        return `$${paramIndex++}`;
-      })
-      .join(", ");
-
-    // 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 = ${sourceEntityParam}
-          AND target_entity_type = ${targetEntityParam}
-          AND target_entity_id IN (${idPlaceholders})
-          AND organization_id = ${orgPlaceholder}
-    `;
-
-    const rows = await this.dataSource.query(sql, params);
-
-    return rows.map((r: any) => Number(r.source_entity_id));
-  }
-  
-  
-  
-}
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from './entity-service-impl.service';
+import { DataSource } from 'typeorm';
+import { EntityMasterRepository } from '../repository/entity-master.repository';
+
+@Injectable()
+export class EntityRelationService extends EntityServiceImpl {
+  constructor(private entityMasterRepo: EntityMasterRepository) {
+    super();
+  }
+
+  async getEntityRelations(
+    entityType: string,
+    loggedInUser: any,
+    includeSelf = false,
+  ): Promise<any> {
+    const entityRelationRepo = this.reflectionHelper.getRepoService('EntityRelation');
+
+    const relations = await entityRelationRepo
+      .createQueryBuilder("er")
+      .select([
+        "er.name AS label",
+        "er.target_entity_type AS value",
+        "er.id AS id",
+      ])
+      .where("er.source_entity_type = :entityType", { entityType })
+      .andWhere("er.organization_id = :orgId", { orgId: loggedInUser.organization_id })
+      .getRawMany();
+  
+    if (includeSelf) {
+      const entity = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.organization_id);
+  
+      if (entity) {
+        relations.unshift({
+          label: entity.name,
+          value: entityType,
+          id: null, // or some special marker
+        });
+      }
+    }
+  
+    return relations;
+  }
+
+  async getRelatedEntityIds(
+    sourceEntity: string,
+    targetEntity: string,
+    targetIds: number[],
+    orgId: number,
+  ): Promise<number[]> {
+
+    if (!targetIds.length) return [];
+
+    const entityRelationRepo = this.reflectionHelper.getRepoService('EntityRelation');
+    const rows = await entityRelationRepo
+      .createQueryBuilder("erd")
+      .select("DISTINCT erd.source_entity_id", "source_entity_id")
+      .where("erd.source_entity_type = :sourceEntity", { sourceEntity })
+      .andWhere("erd.target_entity_type = :targetEntity", { targetEntity })
+      .andWhere("erd.target_entity_id IN (:...targetIds)", { targetIds })
+      .andWhere("erd.organization_id = :orgId", { orgId })
+      .getRawMany();
+
+    return rows.map((r) => Number(r.source_entity_id));
+  }
+  
+  
+  
+}