rez_core 5.0.15 → 5.0.17

package/package.json

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

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

@@ -597,10 +597,10 @@ export class EntityDynamicService {
     );
 
     const columns = validAttributes
-      .map((attr) => `${attr.attribute_key}`)
+      .map((attr) => `t.${attr.attribute_key}`)
       .join(', ');
     const selectQuery = `SELECT ${columns}
-                         FROM ${tableName}
+                         FROM ${tableName} t
                          WHERE id = $1`;
 
     const result = await this.dataSource.query(selectQuery, [id]);

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

@@ -1,10 +1,12 @@
 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) {
+  constructor(private readonly dataSource: DataSource,
+              private entityMasterRepo: EntityMasterRepository) {
     super();
   }
 
@@ -21,16 +23,11 @@ export class EntityRelationService extends EntityServiceImpl {
     );
   
     if (includeSelf) {
-      const [entity] = await this.dataSource.query(
-        `SELECT name as label 
-         FROM frm_entity_master 
-         WHERE mapped_entity_type = $1 AND organization_id = $2`,
-        [entityType, loggedInUser.organization_id],
-      );
+      const entity = await this.entityMasterRepo.getEntityByMappedEntityType(entityType, loggedInUser.organization_id);
   
       if (entity) {
         relations.unshift({
-          label: entity.label,
+          label: entity.name,
           value: entityType,
           id: null, // or some special marker
         });

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

@@ -4,6 +4,7 @@ import { UserData } from '../../user/entity/user.entity';
 import * as moment from 'moment';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { ModuleRef } from '@nestjs/core';
+import { AttributeMasterRepository } from '../repository/attribute-master.repository';
 
 @Injectable()
 export class ResolverService {
@@ -14,6 +15,7 @@ export class ResolverService {
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
     private readonly moduleRef: ModuleRef,
+    private readonly attributeMasterRepo: AttributeMasterRepository
   ) {}
 
   private async getMediaDataService() {
@@ -31,10 +33,7 @@ export class ResolverService {
     entityData: any,
     entityType: string,
   ): Promise<any> {
-    const attributeItems = await this.dataSource.query(
-      `SELECT * FROM frm_entity_attribute WHERE mapped_entity_type = $1 AND organization_id = $2`,
-      [entityType, loggedInUser.organization_id],
-    );
+    const attributeItems = await this.attributeMasterRepo.findAttributesByMappedEntityType(entityType, loggedInUser.organization_id);
 
     const resolvedEntityData = { ...entityData };
 

package/src/module/workflow/service/stage-group.service.ts

@@ -13,6 +13,8 @@ import * as moment from 'moment';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
 import axios from 'axios';
 import { ConfigService } from '@nestjs/config';
+import { ListMasterData } from 'src/module/listmaster/entity/list-master.entity';
+import { StageGroup } from '../entity/stage-group.entity';
 
 @Injectable()
 export class StageGroupService extends EntityServiceImpl {
@@ -27,6 +29,10 @@ export class StageGroupService extends EntityServiceImpl {
     private readonly stageMovementRepo: Repository<StageMovementData>,
     private readonly mediaDataService: MediaDataService,
     private readonly configService: ConfigService,
+    @InjectRepository(ListMasterData)
+    private readonly listMasterRepo: Repository<ListMasterData>,
+    @InjectRepository(StageGroup)
+    private readonly stageGroupRepo: Repository<StageGroup>,
   ) {
     super();
   }
@@ -78,38 +84,53 @@ export class StageGroupService extends EntityServiceImpl {
 
     // if (!workflowLevelMapping) return null;
 
-    let stage_movement_data: StageMovementData[] = [];
-    stage_movement_data = await this.stageMovementRepo.find({
+    let stageMovement = await this.stageMovementRepo.find({
       where: {
         mapped_entity_type: 'LEAD',
         mapped_entity_id: lead_id,
       },
     });
 
-    let stage_group_data = await this.stageMovementRepo.query(
-      `SELECT * FROM frm_wf_stage_group WHERE id = $1`,
-      [stage_movement_data[0].stage_group_id],
-    );
+    if (!stageMovement || stageMovement.length === 0) {
+      return [];
+    }
+
+    console.log('stageMovementttegst', stageMovement);
+
+    const stageGroupData = await this.stageGroupRepo.findOne({
+      where: {
+        id: stageMovement[0].stage_group_id,
+      },
+    });
+
+    if (!stageGroupData) {
+      return [];
+    }
 
     // 3) Lead status (parameterized)
     let leadStatus: string | null = null;
-    const leadData = await this.dataSource.query(
-      `SELECT lead_status FROM crm_lead WHERE id = $1`,
-      [lead_id],
-    );
-    if (leadData.length > 0 && leadData[0].lead_status != null) {
-      const leadStatusResolved = await this.dataSource.query(
-        `SELECT name FROM frm_list_master_items WHERE id = $1 AND organization_id = $2`,
-        [leadData[0].lead_status, loggedInUser.organization_id],
-      );
-      if (leadStatusResolved.length > 0) {
-        leadStatus = leadStatusResolved[0].name;
+
+    const leadData = await this.getEntityData('LEAD', lead_id, loggedInUser);
+    console.log('leadData', leadData);
+    const leadRecord = Array.isArray(leadData) ? leadData[0] : null;
+
+    if (leadRecord && leadRecord.lead_status != null) {
+      const leadStatusItem = await this.listMasterRepo.findOne({
+        where: {
+          id: leadRecord.lead_status,
+          organization_id: loggedInUser.organization_id,
+        },
+        select: ['name'],
+      });
+      if (leadStatusItem) {
+        leadStatus = leadStatusItem.name;
       }
     }
+
     // 4. Fetch stage groups & hierarchy
     const stageGroupAndStageHierarchy =
       (await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
-        stage_group_data[0].workflow_id,
+        stageGroupData[0].workflow_id,
         loggedInUser,
         lead_id,
       )) as Array<{

package/src/module/workflow/workflow.module.ts

@@ -63,6 +63,7 @@ import { ActivityLogController } from './controller/activity-log.controller';
 import { NotificationModule } from '../notification/notification.module';
 import { MapperModule } from '../mapper/mapper.module';
 import { WorkflowAutomationModule } from '../workflow-automation/workflow-automation.module';
+import { ListMasterData } from '../listmaster/entity/list-master.entity';
 
 @Module({
   imports: [
@@ -83,9 +84,10 @@ import { WorkflowAutomationModule } from '../workflow-automation/workflow-automa
       ActionDataEntity,
       ActionResourcesMapping,
       ActivityLog,
+      ListMasterData,
     ]),
-    EntityModule,
     ListMasterModule,
+    EntityModule,
     NotificationModule,
     MapperModule,
     WorkflowAutomationModule,