rez_core 2.1.131 → 2.1.133

package/package.json

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

package/src/module/layout_preference/controller/layout_preference.controller.ts

@@ -31,13 +31,13 @@ export class LayoutPreferenceController {
     @Query('sort_by') sort_by: string,
     @Req() req: Request & { user: any },
   ) {
-    const userData = req.user.userData;
+    const loggedInUser = req.user.userData;
 
     return this.layoutPreferenceService.getColumnValue(
       entity_type,
       column,
       sort_by,
-      userData,
+      loggedInUser,
     );
   }
 }

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -77,6 +77,13 @@ export class LayoutPreferenceService extends EntityServiceImpl {
         .addSelect(`COUNT(*) AS count`)
         .from(tableName, tableName)
         .where(`${column} IS NOT NULL`)
+        .andWhere(`organization_id = :organizationId`, {
+          organizationId: loggedInUser?.organization_id,
+        })
+        .andWhere(`level_id = :levelId`, { levelId: loggedInUser?.level_id })
+        .andWhere(`level_type = :levelType`, {
+          levelType: loggedInUser?.level_type,
+        })
         .groupBy(column)
         .getRawMany();
 

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

@@ -135,7 +135,7 @@ export class EntityValidationService {
     const attributes =
       await this.attributeMasterService.findAttributesByMappedEntityType(
         entityData.entity_type,
-        loggedInUser.organization_id,
+        loggedInUser,
       );
 
     const requiredErrors = this.validateRequiredFields(entityData, attributes);

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

@@ -0,0 +1,47 @@
+import {
+  Controller,
+  Post,
+  Body,
+  HttpCode,
+  HttpStatus,
+  Req,
+  UseGuards,
+  Get,
+  Param,
+  Put,
+} from '@nestjs/common';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+import { WorkflowService } from '../service/workflow.service';
+import { Request } from 'express';
+
+@Controller('/workflow')
+@UseGuards(JwtAuthGuard)
+export class WorkflowController {
+  constructor(private readonly workflowService: WorkflowService) {}
+
+  @Post('/getWorkflow')
+  @HttpCode(HttpStatus.OK)
+  async getWorkflow(
+    @Body() body: { entity_type: string },
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user.userData;
+    const result = await this.workflowService.getAllWorkflow(
+      body.entity_type,
+      loggedInUser,
+    );
+    return result;
+  }
+
+  @Get('/getWorkflowById/:id')
+  @HttpCode(HttpStatus.OK)
+  async getWorkflowById(@Param('id') id: number) {
+    return this.workflowService.getWorkflowById(id);
+  }
+
+  @Post('/getContactDropdown')
+  @HttpCode(HttpStatus.OK)
+  async getLeadContactDropdown(@Body() body: { leadId: number; mode: string }) {
+    return this.workflowService.getLeadContactDropdown(body.leadId, body.mode);
+  }
+}

package/src/module/workflow/service/action-template-mapping.service.ts

@@ -36,17 +36,20 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       [mode],
     );
 
+    if (!listMasterItemData?.length) return []; // 🛑 No mode found
+
     const templateCodes = templates.map((t) => t.template_code);
     if (!templateCodes.length) return [];
 
     const commTemplates = await this.dataSource.query(
       `
-      SELECT id, name
-      FROM cr_wf_comm_template
-      WHERE code IN (?) AND mode = ? AND organization_id = ?
-      `,
+  SELECT id, name
+  FROM cr_wf_comm_template
+  WHERE code IN (?) AND mode = ? AND organization_id = ?
+  `,
       [templateCodes, listMasterItemData[0].code, loggedInUser.organization_id],
     );
-    return commTemplates.map((t) => ({ id: t.id, name: t.name }));
+
+    return commTemplates;
   }
 }

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

@@ -1,9 +1,80 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { BadRequestException, Injectable } from '@nestjs/common';
+import { UserData } from 'src/module/user/entity/user.entity';
+import { BaseEntity, DataSource } from 'typeorm';
 
 @Injectable()
-export class WorkflowService extends EntityServiceImpl {
-  constructor() {
-    super();
+export class WorkflowService {
+  constructor(private readonly dataSource: DataSource) {}
+
+  async getAllWorkflow(entity_type: string, loggedInUser: any) {
+    const { level_id, level_type } = loggedInUser;
+
+    const workflows = await this.dataSource.query(
+      `
+      SELECT *
+      FROM cr_workflow
+      WHERE mapped_entity_type = ?
+        AND level_id = ?
+        AND level_type = ?
+      `,
+      [entity_type, level_id, level_type],
+    );
+
+    return workflows; // array of rows (each row is already in JSON format)
+  }
+
+  async getWorkflowById(id: number) {
+    const result = await this.dataSource.query(
+      `SELECT * FROM cr_workflow WHERE id = ?`,
+      [id],
+    );
+    return result[0] || null;
+  }
+
+  async updateEntity(
+    entityData: BaseEntity,
+    loggedInUser: UserData,
+  ): Promise<any> {}
+
+  async getLeadContactDropdown(leadId: number, mode: string): Promise<any[]> {
+    const lead = await this.dataSource.query(
+      `SELECT phone_number, father_mobile, mother_mobile, email, father_email, mother_email
+     FROM crm_lead
+     WHERE id = ?`,
+      [leadId],
+    );
+
+    if (!lead?.length) {
+      throw new BadRequestException('Lead not found');
+    }
+
+    const data = lead[0];
+    const response: { label: string; value: any }[] = [];
+
+    if (mode === 'sms' || mode === 'whatsapp') {
+      if (data.phone_number) {
+        response.push({ label: 'Primary', value: data.phone_number });
+      }
+      if (data.father_mobile) {
+        response.push({ label: 'Father', value: data.father_mobile });
+      }
+      if (data.mother_mobile) {
+        response.push({ label: 'Mother', value: data.mother_mobile });
+      }
+    } else if (mode === 'email') {
+      if (data.email) {
+        response.push({ label: 'Primary', value: data.email });
+      }
+      if (data.father_email) {
+        response.push({ label: 'Father', value: data.father_email });
+      }
+      if (data.mother_email) {
+        response.push({ label: 'Mother', value: data.mother_email });
+      }
+    } else {
+      throw new BadRequestException('Invalid mode');
+    }
+
+    return response;
   }
 }

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

@@ -20,6 +20,7 @@ import { Action } from './entity/action.entity';
 import { WorkflowListMasterService } from './service/workflow-list-master.service';
 import { WorkflowListMasterController } from './controller/workflow-list-master.controller';
 import { ActionTemplateMappingController } from './controller/action-template-mapping.controller';
+import { WorkflowController } from './controller/workflow.controller';
 
 @Module({
   imports: [
@@ -36,7 +37,6 @@ import { ActionTemplateMappingController } from './controller/action-template-ma
     EntityModule,
   ],
   providers: [
-    { provide: 'WorkflowService', useClass: WorkflowService },
     { provide: 'ActionCategoryService', useClass: ActionCategoryService },
     { provide: 'CommTemplateService', useClass: CommTemplateService },
     {
@@ -48,9 +48,9 @@ import { ActionTemplateMappingController } from './controller/action-template-ma
     { provide: 'StageGroupService', useClass: StageGroupService },
     WorkflowListMasterService,
     ActionTemplateMappingService,
+    WorkflowService,
   ],
   exports: [
-    'WorkflowService',
     'ActionCategoryService',
     'CommTemplateService',
     'StageActionMappingService',
@@ -58,6 +58,10 @@ import { ActionTemplateMappingController } from './controller/action-template-ma
     'StageService',
     'StageGroupService',
   ],
-  controllers: [WorkflowListMasterController, ActionTemplateMappingController],
+  controllers: [
+    WorkflowListMasterController,
+    ActionTemplateMappingController,
+    WorkflowController,
+  ],
 })
 export class WorkflowModule {}