rez_core 4.0.184 → 4.0.187

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

@@ -10,12 +10,14 @@ import {
 import { Request } from 'express';
 import { AttributeMasterService } from '../service/attribute-master.service';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
+import { EntityUpdateService } from '../service/entity-attribute-update.service';
 
 @Controller('attribute-master')
 @UseGuards(JwtAuthGuard)
 export class AttributeMasterController {
   constructor(
     private readonly attributeMasterService: AttributeMasterService,
+    private readonly entityUpdateService: EntityUpdateService,
   ) {}
 
   @Post('/create')
@@ -30,6 +32,12 @@ export class AttributeMasterController {
     );
   }
 
+@Post('/updateAttributeValue')
+ async entityAttributeUpdate (@Body() payload:{}){
+  return this.entityUpdateService.execute(payload);
+
+ }
+ 
   @Post('update/:id')
   async updateAttribute(
     @Body() attributeData: any,
@@ -52,6 +60,18 @@ export class AttributeMasterController {
     return await this.attributeMasterService.getAttributeById(id);
   }
 
+  @Get('getAttributeDropdownByEntity/:entity_type')
+  async getAttributeByEntity(
+    @Param('entity_type') entity_type:string,
+        @Req() req: Request & { user: any },
+  ){
+    
+        const loggedInUser = req.user.userData;
+
+    return await this.attributeMasterService.getAttributesByEntityType(entity_type,loggedInUser)
+  }
+
+
   @Get('getDropdownList/:entityType')
   async getAttributesDropdownList(
     @Param('entityType') entityType: string,

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

@@ -25,4 +25,17 @@ export class EntityMasterController {
   ) {
     return await this.entityMasterService.getEntityById(id);
   }
+
+  @Get('getAllEntityRealationDropdown/:entity_type')
+  @HttpCode(HttpStatus.OK)
+  async getAllEntity(
+    @Param('entity_type') entity_type: string,
+    @Req() req: Request & { user: any },
+  ) {
+
+    const loggedInUser = req.user.userData;
+
+    // console.log(loggedInUser);
+    return await this.entityMasterService.getAllEntityDropDown(entity_type,loggedInUser)
+  }
 }

package/src/module/meta/entity.module.ts

@@ -60,6 +60,8 @@ import { EntityMasterRepository } from './repository/entity-master.repository';
 import { EntityMasterController } from './controller/entity-master.controller';
 import { WorkflowAutomationModule } from '../workflow-automation/workflow-automation.module';
 import { EntityPublicController } from './controller/entity.public.controller';
+import { EntityUpdateService } from './service/entity-attribute-update.service';
+import { EntityUpdateRepository } from './repository/entity-attribute-update.repository';
 
 @Module({
   imports: [
@@ -75,11 +77,13 @@ import { EntityPublicController } from './controller/entity.public.controller';
       AppMaster,
       EntityRelation,
       EntityRelationData,
+      EntityUpdateService
     ]),
     forwardRef(() => ListMasterModule),
     forwardRef(() => FilterModule),
     UtilsModule,
     WorkflowAutomationModule,
+    
   ],
   providers: [
     EntityMasterService,
@@ -87,6 +91,7 @@ import { EntityPublicController } from './controller/entity.public.controller';
     EntityDynamicService,
     { provide: 'CommonService', useClass: CommonService },
     AttributeMasterRepository,
+    EntityUpdateRepository,
     PreferenceService,
     PreferenceRepository,
     MasterService,
@@ -99,6 +104,7 @@ import { EntityPublicController } from './controller/entity.public.controller';
     MediaDataRepository,
     MediaDataService,
     AttributeMasterService,
+    EntityUpdateService,
     // SectionMasterService,
     // FieldGroupService,
     ViewMaterRespository,
@@ -128,6 +134,8 @@ import { EntityPublicController } from './controller/entity.public.controller';
     PopulateMetaService,
     EntityTableColumnService,
     MediaDataService,
+    EntityUpdateService,
+    EntityUpdateRepository,
     // SectionMasterService,
     // FieldGroupService,
     'ViewMasterService',

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

@@ -59,6 +59,26 @@ export class AttributeMasterRepository {
     return await this.attributeMasterRepository.findOne({ where: { id } });
   }
 
+  async getAllAttributeByEntity(entity_type:string,loggedInUser):Promise<{ label: string; value: any }[]> {
+let data = await this.attributeMasterRepository.find({
+  where: {
+    organization_id: loggedInUser.organization_id,
+    mapped_entity_type: entity_type
+  }
+});
+ if(data) {
+const dropdownData = data.map((attribute) => {
+  return {"label": attribute.name,
+    "value":attribute.attribute_key,
+    "data_type":attribute.data_type,
+    "data_source_list":attribute.datasource_list
+  }
+})
+
+return dropdownData;
+ }
+ return [];  }
+
   async getAttributesDropdownList(
     entityType: string,
     loggedInUser: UserData,

package/src/module/meta/repository/entity-attribute-update.repository.ts

@@ -0,0 +1,44 @@
+import { Injectable } from '@nestjs/common';
+import { DataSource } from 'typeorm';
+
+@Injectable()
+export class EntityUpdateRepository {
+  constructor(private readonly dataSource: DataSource) {}
+
+
+ async updateEntityAttribute(entity, config ) {
+  const {entityType, organization_id} = entity;
+
+  // 1. Get the table name
+
+  const result = await this.dataSource.query(
+    `SELECT db_table_name 
+     FROM frm_entity_master 
+     WHERE mapped_entity_type = ?
+     and organization_id = ?`,
+    [config.entity_type, organization_id],
+  );
+
+  if (!result.length) {
+    throw new Error("Entity table not found");
+  }
+
+  const entityTableName = result[0].db_table_name;
+
+  // 2. Determine the ID condition
+
+const isLead = config.entity_type === "LEAD";
+const idColumn = isLead ? "id" : "parent_id";
+
+  // 3. Update using dynamic table name
+
+return await this.dataSource
+  .createQueryBuilder()
+  .update(entityTableName)
+  .set({ [config.attribute_key]: config.attribute_value })
+  .where(`${idColumn} = :id`, { id: entity.id })
+  .execute();
+
+}
+
+}

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

@@ -3,6 +3,8 @@ import { EntityMaster } from '../entity/entity-master.entity';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository, DataSource } from 'typeorm';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { EntityRelationService } from '../service/entity-relation.service';
+import { EntityRelation } from '../entity/entity-relation.entity';
 
 @Injectable()
 export class EntityMasterRepository {
@@ -12,6 +14,8 @@ export class EntityMasterRepository {
     private readonly dataSource: DataSource,
     @Inject('ListMasterService')
     private readonly listMasterService: ListMasterService,
+    @InjectRepository(EntityRelation)
+    private readonly entityRelationRepo: Repository<EntityRelation>
   ) {}
 
   async getEntityById(id: number): Promise<EntityMaster | null> {
@@ -26,6 +30,32 @@ export class EntityMasterRepository {
     return data;
   }
 
+  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();
+
+  // 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:[];
+}
+
+
   async getEntityByMappedEntityType(
     mappedEntityType: string,
     organizationId: number,

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

@@ -96,6 +96,10 @@ export class AttributeMasterService {
     return this.attributeMasterRepository.getAttributeById(id);
   }
 
+  async getAttributesByEntityType(entity_type,loggedInUser){
+    return this.attributeMasterRepository.getAllAttributeByEntity(entity_type,loggedInUser)
+  }
+
   async getAttributesByMappedEntityType(
     entityType: string,
     loggedInUser: UserData,

package/src/module/meta/service/entity-attribute-update.service.ts

@@ -0,0 +1,29 @@
+import { Injectable } from "@nestjs/common";
+import { EntityServiceImpl } from "./entity-service-impl.service";
+import { EntityUpdateRepository } from "../repository/entity-attribute-update.repository";
+
+@Injectable()
+export class EntityUpdateService extends EntityServiceImpl{
+
+constructor(
+    private readonly entityUpdateRepository:EntityUpdateRepository
+){
+    super();
+}
+
+  async execute(payload: any): Promise<any> {
+
+    let { entity, user, config } = payload;
+    console.log(entity)
+
+
+    if (entity.entity_type !== 'LEAD') {
+      entity = await this.getEntityData('LEAD', entity.parent_id,user );
+    }
+    // console.log(entity,"---------------------------------------");
+
+    return this.entityUpdateRepository.updateEntityAttribute(entity,config);
+
+
+  }
+}

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

@@ -23,6 +23,10 @@ export class EntityMasterService {
     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,
@@ -166,4 +170,6 @@ export class EntityMasterService {
       loggedInUser,
     );
   }
+
+
 }

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

@@ -95,8 +95,8 @@ export class ResolverService {
         if (dateValue.isValid()) {
           resolvedEntityData[field] =
             attr.element_type === 'date'
-              ? dateValue.format('DD-MM-YYYY')
-              : dateValue.format('DD-MM-YYYY HH:mm:ss');
+              ? dateValue.format('DD-MMM-YYYY')
+              : dateValue.format('DD-MMM-YYYY HH:mm:ss');
         }
       }
 

package/src/module/module/service/module-access.service.ts

@@ -149,15 +149,6 @@ export class ModuleAccessService {
     level_id: number;
     organization_id: number;
   }) {
-    console.log(
-      'step 1',
-      userId,
-      appcode,
-      level_type,
-      level_id,
-      organization_id,
-    );
-
     // Step 1: Resolve roles
     const roleCodes = await this.menuRepository.resolveUserRoles(
       userId,
@@ -166,21 +157,18 @@ export class ModuleAccessService {
       level_id,
     );
 
-    console.log(roleCodes, 'roleCodes');
-
     if (!roleCodes || roleCodes.length === 0) {
       return [];
     }
 
     const roleIds = roleCodes.map(Number);
-    console.log('step 2', roleIds);
+
     // Step 2: Get full permissions
     const allPermissions =
       await this.moduleAccessRepository.getModuleAccessByRoles(
         roleIds,
         appcode,
       );
-    console.log('step 2', allPermissions);
 
     // Step 3: If level_type is SCH, check school status using raw query
     if (level_type === 'SCH') {
@@ -188,19 +176,18 @@ export class ModuleAccessService {
         `SELECT * FROM sso_school WHERE id = ${level_id}`);
 
       const school = result?.[0];
-      console.log('step 3', school);
 
       const resolveStatus = await this.listMasterService.getResolvedListCode(
         STATUS_INACTIVE,
         organization_id || 0,
       );
 
-      if (!school || school.status == resolveStatus.id) {
+      if (!school || school.status === resolveStatus.id || 'INACTIVE') {
         // Return only VIEW permissions
         return allPermissions.filter((perm) => perm.action === 'VIEW');
       }
     }
-    console.log('step 4', allPermissions);
+
     // Step 4: Return all permissions normally
     return allPermissions;
   }

package/src/module/workflow/entity/action.entity.ts

@@ -47,4 +47,7 @@ export class ActionEntity extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   template: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  pdf_template: string;
 }

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

@@ -91,6 +91,7 @@ export class ActionDataRepository extends EntityServiceImpl {
             status: FORM_STATUS_TO_BE_SENT,
             action_id: act.id,
             created_date: istDate,
+            pdf_template: act.pdf_template
           };
 
           const createdEntity = await super.createEntity(

package/src/module/workflow/repository/task.repository.ts

@@ -2,12 +2,14 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { TaskDataEntity } from '../entity/task-data.entity';
 import { DataSource, Repository } from 'typeorm';
+import { EntityDynamicService } from 'src/module/meta/service/entity-dynamic.service';
 
 @Injectable()
 export class TaskRepository {
   constructor(
     @InjectRepository(TaskDataEntity)
     private readonly TaskRepository: Repository<TaskDataEntity>,
+    private readonly entityDynamicService: EntityDynamicService,
     private readonly dataSource: DataSource,
   ) {}
 
@@ -70,6 +72,11 @@ export class TaskRepository {
 
         console.log({ due_date, due_time });
 
+        const taskCode = await this.entityDynamicService.getCode(
+          'TASK',
+          loggedInUser,
+        );
+
         const taskData = this.TaskRepository.create({
           stage_id: act.stage_id,
           user_id: loggedInUser.id,
@@ -88,6 +95,7 @@ export class TaskRepository {
           status: todoListMasterItemId[0]?.id,
           category: act?.action_category_code,
           task_owner: leadData[0]?.lead_owner,
+          code: taskCode,
         });
         await this.TaskRepository.save(taskData);
       }

package/src/module/workflow/service/task.service.ts

@@ -11,6 +11,7 @@ import { ActionHandler } from 'src/module/workflow-automation/interface/action.d
 import * as moment from 'moment';
 import { ConfigService } from '@nestjs/config';
 import axios from 'axios';
+import { ChecksumAlgorithm } from '@aws-sdk/client-s3';
 
 @Injectable()
 @ActionHandler('add_task')
@@ -29,41 +30,27 @@ export class TaskService extends EntityServiceImpl {
   name: string = 'add_task';
 
   async execute(payload: any): Promise<any> {
-    const { entity, user, config } = payload;
-
-    let toValue: string | null = null;
-
-    // 2. Get current stage_id from frm_wf_stage_movement_data
-    const stageRow = await this.dataSource.query(
-      `SELECT stage_id
-       FROM frm_wf_stage_movement_data
-      WHERE mapped_entity_id = $1 
-        AND is_current = 'Y'
-      LIMIT 1`,
-      [entity.id],
-    );
+    let { entity, user, config } = payload;
 
-    const stageId = stageRow.length > 0 ? stageRow[0].stage_id : null;
+    const { organization_id, level_id, level_type } = entity;
 
-    if (!stageId) {
-      throw new Error(
-        `No current stage found in frm_wf_stage_movement_data for entity_id=${entity.id}`,
-      );
+    if (entity.entity_type !== 'LEAD') {
+      entity = await this.getEntityData('LEAD', entity.parent_id, user);
     }
 
     // 3. Build entityData
     const entityData = {
-      ...config,
       mapped_entity_id: entity.id,
       mapped_entity_type: entity.entity_type,
-      task_owner: config.task_owner,
-      stage_id: stageId,
+      task_owner: entity.lead_owner,
+      stage_id: entity.stageId,
       status: config.status,
-      due_date: config.due_date,
-      due_time: config.due_time,
-      reminder: config.reminder,
+      due_date: Date.now() + 2,
+      due_time: Date.now(),
       description: config.description,
       is_mandatory: config.is_mandatory,
+      name: config.name,
+      entity_type: 'TASK',
     };
 
     return await this.createEntity(entityData, user);
@@ -161,6 +148,29 @@ export class TaskService extends EntityServiceImpl {
       loggedInUser.organization_id,
     ]);
 
+    const oldStatusQuery = `
+    SELECT * 
+    FROM frm_wf_task_data
+    WHERE id = $1
+      AND organization_id = $2
+    LIMIT 1;
+  `;
+
+    const [oldRow] = await this.dataSource.query(oldStatusQuery, [
+      entityData.id,
+      loggedInUser.organization_id,
+    ]);
+
+    const oldStatusRows = await this.dataSource.query(taskStatusQuery, [
+      oldRow.status,
+      loggedInUser.organization_id,
+    ]);
+
+    const isStatusChanged =
+      statusRows.length > 0 &&
+      oldStatusRows.length > 0 &&
+      statusRows[0].name !== oldStatusRows[0].name;
+
     const isCompletedStatus =
       statusRows.length > 0 &&
       statusRows[0].name?.toLowerCase() === 'completed';
@@ -190,20 +200,7 @@ export class TaskService extends EntityServiceImpl {
     }
 
     try {
-      // Always log edit
-      const editLogData = {
-        mapped_entity_id: updatedEntity.mapped_entity_id,
-        mapped_entity_type: updatedEntity.mapped_entity_type,
-        title: `Task edited`,
-        description: `${updatedEntity.code} was edited`,
-        category: ACTIVITY_CATEGORIES.TASK,
-        action: 'edit',
-        appcode: loggedInUser.appcode,
-      };
-
-      await this.activityLogService.logActivity(editLogData, loggedInUser);
-
-      if (isCompletedStatus) {
+      if (isCompletedStatus && isStatusChanged) {
         const completedLogData = {
           mapped_entity_id: updatedEntity.mapped_entity_id,
           mapped_entity_type: updatedEntity.mapped_entity_type,
@@ -218,6 +215,18 @@ export class TaskService extends EntityServiceImpl {
           completedLogData,
           loggedInUser,
         );
+      } else {
+        const editLogData = {
+          mapped_entity_id: updatedEntity.mapped_entity_id,
+          mapped_entity_type: updatedEntity.mapped_entity_type,
+          title: `Task edited`,
+          description: `${updatedEntity.code} was edited`,
+          category: ACTIVITY_CATEGORIES.TASK,
+          action: 'edit',
+          appcode: loggedInUser.appcode,
+        };
+
+        await this.activityLogService.logActivity(editLogData, loggedInUser);
       }
     } catch (error) {
       console.error(

package/src/module/workflow/service/workflow-meta.service.ts

@@ -273,7 +273,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
         is_current: 'Y',
       });
 
-      this.populateActionService(
+      await this.populateActionService(
         stageData.nextStage.id,
         loggedInUser,
         mapped_entity_id,
@@ -475,10 +475,24 @@ export class WorkflowMetaService extends EntityServiceImpl {
       }
     }
 
-    const leadOwnerName = await this.dataSource.query(
-      `SELECT name FROM sso_user WHERE id = $1`,
-      [entityData?.lead_owner],
-    );
+    let leadOwnerName;
+
+    try {
+      const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
+
+      // Prepare query params
+      const queryParams = new URLSearchParams({
+        loggedInUser: JSON.stringify(loggedInUser),
+      }).toString();
+
+      const url = `${baseUrl}/entity/public/getById/${entityData?.lead_owner}?entity_type=USR&${queryParams}`;
+
+      const response = await axios.get(url);
+
+      leadOwnerName = response.data;
+    } catch (error) {
+      console.error('Internal Entity API call failed:', error.message);
+    }
 
     try {
       const logData = {
@@ -486,8 +500,8 @@ export class WorkflowMetaService extends EntityServiceImpl {
         mapped_entity_type: 'LEAD',
         title: 'Owner Assigned',
         description: leadData?.lead_owner
-          ? `${leadOwnerName[0]?.name} reassigned as Lead owner.`
-          : `${leadOwnerName[0]?.name} assigned as Lead owner.`,
+          ? `${leadOwnerName?.name} reassigned as Lead owner.`
+          : `${leadOwnerName?.name} assigned as Lead owner.`,
         action: 'assign',
         category: ACTIVITY_CATEGORIES.ASSIGN,
         appcode: loggedInUser.appcode,
@@ -584,25 +598,37 @@ export class WorkflowMetaService extends EntityServiceImpl {
     const nextIdx = (lastIdx + 1) % userIds.length;
     const nextUser = userIds[nextIdx];
 
-    //4) Update lead owner in the lead table
-    await this.dataSource.query(
-      `
-    UPDATE crm_lead
-    SET lead_owner = $1
-    WHERE organization_id = $2
-      AND level_id = $3
-      AND level_type = $4
-      AND lead_owner IS NULL
-    ORDER BY created_date ASC
-    LIMIT 1
-    `,
-      [nextUser, organization_id, Number(level_id), level_type],
-    );
+    //4) Update lead owner in the lead table no need because we are updating lead owner in updateLeadOwner method
+    // await this.dataSource.query(
+    //   `
+    // UPDATE crm_lead
+    // SET lead_owner = ?
+    // WHERE organization_id = ?
+    //   AND level_id = ?
+    //   AND level_type = ?
+    //   AND lead_owner IS NULL
+    // ORDER BY created_date ASC
+    // LIMIT 1
+    // `,
+    //   [nextUser, organization_id, Number(level_id), level_type],
+    // );
 
     console.log(`Assigning lead to user ID: ${nextUser}`);
 
     const firstAction = actions[0];
 
+    // update lead owner status
+    await this.updateLeadOwner(
+      {
+        lead_id: mapped_entity_id,
+        lead_owner: nextUser,
+        stage_id: stage_id,
+        entity_type: mapped_entity_type,
+        action_id: firstAction.id,
+      },
+      loggedInUser,
+    );
+
     // move task
     await this.taskService.moveTask(loggedInUser, {
       mapped_entity_type,
@@ -623,18 +649,6 @@ export class WorkflowMetaService extends EntityServiceImpl {
       );
     }
 
-    // update lead owner status
-    await this.updateLeadOwner(
-      {
-        lead_id: mapped_entity_id,
-        lead_owner: nextUser,
-        stage_id: stage_id,
-        entity_type: mapped_entity_type,
-        action_id: firstAction.id,
-      },
-      loggedInUser,
-    );
-
     return nextUser;
   }
 }