rez_core 4.0.138 → 4.0.140

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

@@ -1,172 +1,172 @@
-import {
-  BadRequestException,
-  Inject,
-  Injectable,
-  NotFoundException,
-} from '@nestjs/common';
-import { StageGroup } from '../entity/stage-group.entity';
-import { InjectRepository } from '@nestjs/typeorm';
-import { DataSource, Repository } from 'typeorm';
-import { Stage } from '../entity/stage.entity';
-
-@Injectable()
-export class StageRepository {
-  constructor(
-    @InjectRepository(Stage)
-    private readonly stageRepository: Repository<Stage>,
-    private readonly dataSource: DataSource,
-  ) {}
-
-  async getAllStage(stage_group_id: number, organization_id: number) {
-    if (!stage_group_id) {
-      throw new BadRequestException('stage_group_id is required');
-    }
-
-    // 1. Get stage group name
-    const stageGroup = (await this.dataSource.manager.findOne(
-      'frm_wf_stage_group',
-      {
-        where: { id: stage_group_id },
-      },
-    )) as StageGroup;
-
-    if (!stageGroup) {
-      throw new NotFoundException('Stage group not found');
-    }
-
-    const stageGroupName = stageGroup.name;
-
-    // 2. Get all stages under that group
-    const result = await this.stageRepository.find({
-      where: {
-        stage_group_id,
-        organization_id,
-      },
-      order: {
-        sequence: 'ASC',
-      },
-    });
-
-    if (!result || result.length === 0) {
-      return [];
-    }
-
-    // 3. Modify stage names
-    const updatedStages = result.map((stage) => ({
-      ...stage,
-      name: stage.name,
-      full_name: `${stageGroupName} - ${stage.name}`,
-    }));
-
-    return updatedStages;
-  }
-
-  async getStageGroupsWithStagesByWorkflowId(
-    stage_group_id: number,
-    organization_id: number,
-  ): Promise<any[]> {
-    if (!stage_group_id) {
-      throw new BadRequestException('stage_group_id is required');
-    }
-
-    // 1. Find the stage group to get workflow_id
-    const stageGroup = (await this.dataSource.manager.findOne(
-      'frm_wf_stage_group',
-      {
-        where: { id: stage_group_id, organization_id },
-      },
-    )) as StageGroup;
-
-    if (!stageGroup) {
-      return [];
-    }
-
-    // 2. Fetch all groups + stages in one query
-    const rows = await this.dataSource.query(
-      `
-    SELECT 
-      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
-      s.*
-    FROM frm_wf_stage_group g
-    INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
-    WHERE g.workflow_id = ? AND g.organization_id = ? AND g.id = ?
-    ORDER BY g.id, s.id
-    `,
-      [stageGroup.workflow_id, organization_id, stage_group_id],
-    );
-    // const rows2 = await this.dataSource.query(
-    //   `
-    // SELECT
-    //   g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
-    //   s.*
-    // FROM frm_wf_stage_group g
-    // INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
-    // WHERE g.workflow_id = ? AND g.organization_id = ?
-    // ORDER BY g.id, s.id
-    // `,
-    //   [stageGroup.workflow_id, organization_id],
-    // );
-
-    // console.log(rows2, '-----------INNER JOIN----------');
-
-    if (!rows || rows.length === 0) {
-      return [];
-    }
-
-    return rows;
-  }
-
-  async getAllStageGroupAndStageByStageMovement(
-    stage_group_id: number,
-    organization_id: number,
-  ) {
-    // 1. Find the current stage group
-    const currentStageGroup = await this.dataSource.manager.findOne<any>(
-      'frm_wf_stage_group',
-      { where: { id: stage_group_id, organization_id } },
-    );
-
-    if (!currentStageGroup) {
-      return [];
-    }
-
-    // 2. Get all stage groups in the same workflow with sequence <= current
-    const stageGroups = await this.dataSource.manager.find<any>(
-      'frm_wf_stage_group',
-      {
-        where: {
-          workflow_id: currentStageGroup.workflow_id,
-          organization_id,
-        },
-        order: { sequence: 'ASC' },
-      },
-    );
-
-    // Filter only groups with sequence <= current
-    const eligibleGroups = stageGroups.filter(
-      (g) => g.sequence <= currentStageGroup.sequence,
-    );
-
-    const flatResults: any[] = [];
-
-    // 3. For each eligible group, fetch its stages
-    for (const group of eligibleGroups) {
-      const stages = await this.stageRepository.find({
-        where: { stage_group_id: group.id, organization_id },
-        order: { sequence: 'ASC' },
-      });
-
-      if (!stages || stages.length === 0) continue;
-
-      // 4. Flatten into result with full_name
-      for (const stage of stages) {
-        flatResults.push({
-          ...stage,
-          full_name: `${group.name} - ${stage.name}`,
-        });
-      }
-    }
-
-    return flatResults;
-  }
-}
+import {
+  BadRequestException,
+  Inject,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { StageGroup } from '../entity/stage-group.entity';
+import { InjectRepository } from '@nestjs/typeorm';
+import { DataSource, Repository } from 'typeorm';
+import { Stage } from '../entity/stage.entity';
+
+@Injectable()
+export class StageRepository {
+  constructor(
+    @InjectRepository(Stage)
+    private readonly stageRepository: Repository<Stage>,
+    private readonly dataSource: DataSource,
+  ) {}
+
+  async getAllStage(stage_group_id: number, organization_id: number) {
+    if (!stage_group_id) {
+      throw new BadRequestException('stage_group_id is required');
+    }
+
+    // 1. Get stage group name
+    const stageGroup = (await this.dataSource.manager.findOne(
+      'frm_wf_stage_group',
+      {
+        where: { id: stage_group_id },
+      },
+    )) as StageGroup;
+
+    if (!stageGroup) {
+      throw new NotFoundException('Stage group not found');
+    }
+
+    const stageGroupName = stageGroup.name;
+
+    // 2. Get all stages under that group
+    const result = await this.stageRepository.find({
+      where: {
+        stage_group_id,
+        organization_id,
+      },
+      order: {
+        sequence: 'ASC',
+      },
+    });
+
+    if (!result || result.length === 0) {
+      return [];
+    }
+
+    // 3. Modify stage names
+    const updatedStages = result.map((stage) => ({
+      ...stage,
+      name: stage.name,
+      full_name: `${stageGroupName} - ${stage.name}`,
+    }));
+
+    return updatedStages;
+  }
+
+  async getStageGroupsWithStagesByWorkflowId(
+    stage_group_id: number,
+    organization_id: number,
+  ): Promise<any[]> {
+    if (!stage_group_id) {
+      throw new BadRequestException('stage_group_id is required');
+    }
+
+    // 1. Find the stage group to get workflow_id
+    const stageGroup = (await this.dataSource.manager.findOne(
+      'frm_wf_stage_group',
+      {
+        where: { id: stage_group_id, organization_id },
+      },
+    )) as StageGroup;
+
+    if (!stageGroup) {
+      return [];
+    }
+
+    // 2. Fetch all groups + stages in one query
+    const rows = await this.dataSource.query(
+      `
+    SELECT 
+      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
+      s.*
+    FROM frm_wf_stage_group g
+    INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
+    WHERE g.workflow_id = ? AND g.organization_id = ? AND g.id = ?
+    ORDER BY g.id, s.id
+    `,
+      [stageGroup.workflow_id, organization_id, stage_group_id],
+    );
+    // const rows2 = await this.dataSource.query(
+    //   `
+    // SELECT
+    //   g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
+    //   s.*
+    // FROM frm_wf_stage_group g
+    // INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
+    // WHERE g.workflow_id = ? AND g.organization_id = ?
+    // ORDER BY g.id, s.id
+    // `,
+    //   [stageGroup.workflow_id, organization_id],
+    // );
+
+    // console.log(rows2, '-----------INNER JOIN----------');
+
+    if (!rows || rows.length === 0) {
+      return [];
+    }
+
+    return rows;
+  }
+
+  async getAllStageGroupAndStageByStageMovement(
+    stage_group_id: number,
+    organization_id: number,
+  ) {
+    // 1. Find the current stage group
+    const currentStageGroup = await this.dataSource.manager.findOne<any>(
+      'frm_wf_stage_group',
+      { where: { id: stage_group_id, organization_id } },
+    );
+
+    if (!currentStageGroup) {
+      return [];
+    }
+
+    // 2. Get all stage groups in the same workflow with sequence <= current
+    const stageGroups = await this.dataSource.manager.find<any>(
+      'frm_wf_stage_group',
+      {
+        where: {
+          workflow_id: currentStageGroup.workflow_id,
+          organization_id,
+        },
+        order: { sequence: 'ASC' },
+      },
+    );
+
+    // Filter only groups with sequence <= current
+    const eligibleGroups = stageGroups.filter(
+      (g) => g.sequence <= currentStageGroup.sequence,
+    );
+
+    const flatResults: any[] = [];
+
+    // 3. For each eligible group, fetch its stages
+    for (const group of eligibleGroups) {
+      const stages = await this.stageRepository.find({
+        where: { stage_group_id: group.id, organization_id },
+        order: { sequence: 'ASC' },
+      });
+
+      if (!stages || stages.length === 0) continue;
+
+      // 4. Flatten into result with full_name
+      for (const stage of stages) {
+        flatResults.push({
+          ...stage,
+          full_name: `${group.name} - ${stage.name}`,
+        });
+      }
+    }
+
+    return flatResults;
+  }
+}

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

@@ -1,134 +1,127 @@
-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,
-  ) {}
-
-  async getAllTaskByUserIdAndStageId(condition) {
-    const result = await this.TaskRepository.find({
-      where: {
-        ...condition,
-      },
-    });
-
-    return result;
-  }
-
-  async saveActionDataInTask(
-    action: any,
-    loggedInUser,
-    mapped_entity_id: number,
-    mapped_entity_type: string,
-  ): Promise<any> {
-    if (!action?.length) return;
-
-    const todoListMasterItemId = await this.dataSource.query(
-      `SELECT id FROM frm_list_master_items WHERE code = 'in_progress' and organization_id = ? and listtype = 'TKST' LIMIT 1;`,
-      [loggedInUser.organization_id],
-    );
-
-    const leadData = await this.dataSource.query(
-      `SELECT * FROM crm_lead WHERE id = ?`,
-      [mapped_entity_id],
-    );
-
-    // Find the action with the lowest sequence
-
-    if (action.length > 0) {
-      for (const act of action) {
-        // search that is_mandatory is true or not in list_master_items for the given organization
-
-        const is_mandatory = await this.dataSource.query(
-          `SELECT code FROM frm_list_master_items WHERE id = ? and organization_id = ? LIMIT 1;`,
-          [act.action_requirement, loggedInUser.organization_id],
-        );
-
-        const now = new Date();
-        const dueDateTime = new Date(now);
-        dueDateTime.setDate(dueDateTime.getDate() + 2);
-
-        // Force conversion to IST
-        const istFormatterDate = new Intl.DateTimeFormat('en-CA', {
-          timeZone: 'Asia/Kolkata',
-        });
-        const istFormatterTime = new Intl.DateTimeFormat('en-US', {
-          timeZone: 'Asia/Kolkata',
-          hour: '2-digit',
-          minute: '2-digit',
-          hour12: true,
-        });
-
-        const due_date = istFormatterDate.format(dueDateTime); // YYYY-MM-DD in IST
-        const due_time = istFormatterTime.format(dueDateTime); // e.g. "03:14 AM"
-
-        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,
-          action_id: act.id,
-          organization_id: loggedInUser.organization_id,
-          level_type: loggedInUser.level_type,
-          level_id: loggedInUser.level_id,
-          name: act.name,
-          sequence: act.sequence,
-          is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
-          mapped_entity_id,
-          mapped_entity_type,
-          due_date,
-          due_time,
-          is_system: true,
-          status: todoListMasterItemId[0]?.id,
-          category: act?.action_category_code,
-          task_owner: leadData[0]?.lead_owner,
-          code: taskCode,
-        });
-        await this.TaskRepository.save(taskData);
-      }
-    }
-  }
-
-  // update task status
-  async updateTaskStatus(
-    loggedInUser,
-    mapped_entity_type,
-    mapped_entity_id,
-    stage_id,
-    action_id,
-  ): Promise<any> {
-    const task = await this.TaskRepository.findOneBy({
-      action_id,
-      mapped_entity_type,
-      mapped_entity_id,
-      stage_id,
-    });
-
-    if (!task) return;
-
-    const completedListMasterItemId = await this.dataSource.query(
-      `SELECT id FROM frm_list_master_items WHERE code = 'completed' and organization_id = ? and listtype = 'TKST' LIMIT 1;`,
-      [loggedInUser.organization_id],
-    );
-
-    task.modified_by = loggedInUser.id;
-    task.modified_date = new Date();
-    task.is_done = true;
-    task.status = completedListMasterItemId[0]?.id;
-
-    await this.TaskRepository.update(task.id, task);
-  }
-}
+import { BadRequestException, Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { TaskDataEntity } from '../entity/task-data.entity';
+import { DataSource, Repository } from 'typeorm';
+
+@Injectable()
+export class TaskRepository {
+  constructor(
+    @InjectRepository(TaskDataEntity)
+    private readonly TaskRepository: Repository<TaskDataEntity>,
+    private readonly dataSource: DataSource,
+  ) {}
+
+  async getAllTaskByUserIdAndStageId(condition) {
+    const result = await this.TaskRepository.find({
+      where: {
+        ...condition,
+      },
+    });
+
+    return result;
+  }
+
+  async saveActionDataInTask(
+    action: any,
+    loggedInUser,
+    mapped_entity_id: number,
+    mapped_entity_type: string,
+  ): Promise<any> {
+    if (!action?.length) return;
+
+    const todoListMasterItemId = await this.dataSource.query(
+      `SELECT id FROM frm_list_master_items WHERE code = 'in_progress' and organization_id = ? and listtype = 'TKST' LIMIT 1;`,
+      [loggedInUser.organization_id],
+    );
+
+    const leadData = await this.dataSource.query(
+      `SELECT * FROM crm_lead WHERE id = ?`,
+      [mapped_entity_id],
+    );
+
+    // Find the action with the lowest sequence
+
+    if (action.length > 0) {
+      for (const act of action) {
+        // search that is_mandatory is true or not in list_master_items for the given organization
+
+        const is_mandatory = await this.dataSource.query(
+          `SELECT code FROM frm_list_master_items WHERE id = ? and organization_id = ? LIMIT 1;`,
+          [act.action_requirement, loggedInUser.organization_id],
+        );
+
+        const now = new Date();
+        const dueDateTime = new Date(now);
+        dueDateTime.setDate(dueDateTime.getDate() + 2);
+        
+        // Force conversion to IST
+        const istFormatterDate = new Intl.DateTimeFormat('en-CA', { 
+          timeZone: 'Asia/Kolkata' 
+        });
+        const istFormatterTime = new Intl.DateTimeFormat('en-US', { 
+          timeZone: 'Asia/Kolkata', 
+          hour: '2-digit', 
+          minute: '2-digit', 
+          hour12: true 
+        });
+        
+        const due_date = istFormatterDate.format(dueDateTime); // YYYY-MM-DD in IST
+        const due_time = istFormatterTime.format(dueDateTime); // e.g. "03:14 AM"
+        
+        console.log({ due_date, due_time });
+        
+
+        const taskData = this.TaskRepository.create({
+          stage_id: act.stage_id,
+          user_id: loggedInUser.id,
+          action_id: act.id,
+          organization_id: loggedInUser.organization_id,
+          level_type: loggedInUser.level_type,
+          level_id: loggedInUser.level_id,
+          name: act.name,
+          sequence: act.sequence,
+          is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
+          mapped_entity_id,
+          mapped_entity_type,
+          due_date,
+          due_time,
+          is_system: true,
+          status: todoListMasterItemId[0]?.id,
+          category: act?.action_category_code,
+          task_owner: leadData[0]?.lead_owner,
+        });
+        await this.TaskRepository.save(taskData);
+      }
+    }
+  }
+
+  // update task status
+  async updateTaskStatus(
+    loggedInUser,
+    mapped_entity_type,
+    mapped_entity_id,
+    stage_id,
+    action_id,
+  ): Promise<any> {
+    const task = await this.TaskRepository.findOneBy({
+      action_id,
+      mapped_entity_type,
+      mapped_entity_id,
+      stage_id,
+    });
+
+    if (!task) return;
+
+    const completedListMasterItemId = await this.dataSource.query(
+      `SELECT id FROM frm_list_master_items WHERE code = 'completed' and organization_id = ? and listtype = 'TKST' LIMIT 1;`,
+      [loggedInUser.organization_id],
+    );
+
+    task.modified_by = loggedInUser.id;
+    task.modified_date = new Date();
+    task.is_done = true;
+    task.status = completedListMasterItemId[0]?.id;
+
+    await this.TaskRepository.update(task.id, task);
+  }
+}