rez_core 5.0.31 → 5.0.33

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

@@ -1,42 +1,42 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Workflow } from '../entity/workflow.entity';
-import { Repository } from 'typeorm';
-
-@Injectable()
-export class WorkflowRepository {
-  constructor(
-    @InjectRepository(Workflow)
-    private readonly workflowRepository: Repository<Workflow>,
-  ) {}
-
-  // async getWorkflowById(id: number) {
-  //     return this.workflowRepository.findOne(id);
-  // }
-
-  async getAllWorkflowsByFilters(
-    entity_type: string,
-    level_id: string,
-    level_type: string,
-  ): Promise<Workflow[]> {
-    return this.workflowRepository.find({
-      where: {
-        mapped_entity_type: entity_type,
-        level_id,
-        level_type,
-      },
-    });
-  }
-
-  async deleteWorkflowById(id: number) {
-    const result = await this.workflowRepository.delete(id);
-
-    if (result.affected === 0) {
-      throw new NotFoundException(`Workflow with ID ${id} not found`);
-    }
-
-    return {
-      message: `Workflow has been successfully deleted.`,
-    };
-  }
-}
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Workflow } from '../entity/workflow.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class WorkflowRepository {
+  constructor(
+    @InjectRepository(Workflow)
+    private readonly workflowRepository: Repository<Workflow>,
+  ) {}
+
+  // async getWorkflowById(id: number) {
+  //     return this.workflowRepository.findOne(id);
+  // }
+
+  async getAllWorkflowsByFilters(
+    entity_type: string,
+    level_id: string,
+    level_type: string,
+  ): Promise<Workflow[]> {
+    return this.workflowRepository.find({
+      where: {
+        mapped_entity_type: entity_type,
+        level_id,
+        level_type,
+      },
+    });
+  }
+
+  async deleteWorkflowById(id: number) {
+    const result = await this.workflowRepository.delete(id);
+
+    if (result.affected === 0) {
+      throw new NotFoundException(`Workflow with ID ${id} not found`);
+    }
+
+    return {
+      message: `Workflow has been successfully deleted.`,
+    };
+  }
+}

package/src/module/workflow/service/action-category.service.ts

@@ -1,33 +1,33 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { UserData } from 'src/module/user/entity/user.entity';
-import { DataSource } from 'typeorm';
-import { ActionCategoryRepository } from '../repository/action-category.repository';
-
-@Injectable()
-export class ActionCategoryService extends EntityServiceImpl {
-  constructor(
-    private readonly dataSource: DataSource,
-    private readonly actionCategoryRepository: ActionCategoryRepository,
-  ) {
-    super();
-  }
-
-  async getActionsCat(entity_type: string) {
-    return this.actionCategoryRepository.getActionsCat(entity_type);
-  }
-
-  async getReasonCodeByActionCategoryId(action_cat_code: string) {
-    return this.actionCategoryRepository.getReasonCodeByActionCategoryId(
-      action_cat_code,
-    );
-  }
-
-  async getActionCategory(action_cat_id: number) {
-    return this.actionCategoryRepository.getActionCategory(action_cat_id);
-  }
-
-  async actionscategoryinfo(entity_type: string) {
-    return this.actionCategoryRepository.actionscategoryinfo(entity_type);
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { UserData } from 'src/module/user/entity/user.entity';
+import { DataSource } from 'typeorm';
+import { ActionCategoryRepository } from '../repository/action-category.repository';
+
+@Injectable()
+export class ActionCategoryService extends EntityServiceImpl {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly actionCategoryRepository: ActionCategoryRepository,
+  ) {
+    super();
+  }
+
+  async getActionsCat(entity_type: string) {
+    return this.actionCategoryRepository.getActionsCat(entity_type);
+  }
+
+  async getReasonCodeByActionCategoryId(action_cat_code: string) {
+    return this.actionCategoryRepository.getReasonCodeByActionCategoryId(
+      action_cat_code,
+    );
+  }
+
+  async getActionCategory(action_cat_id: number) {
+    return this.actionCategoryRepository.getActionCategory(action_cat_id);
+  }
+
+  async actionscategoryinfo(entity_type: string) {
+    return this.actionCategoryRepository.actionscategoryinfo(entity_type);
+  }
+}

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

@@ -1,62 +1,62 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { UserData } from 'src/module/user/entity/user.entity';
-import { DataSource } from 'typeorm';
-import { ActionDataRepository } from '../repository/action-data.repository';
-
-@Injectable()
-export class ActionDataService extends EntityServiceImpl {
-  constructor(
-    private readonly dataSource: DataSource,
-    private readonly actionDataRepo: ActionDataRepository,
-  ) {
-    super();
-  }
-
-  async saveActionData(
-    action: any,
-    loggedInUser: UserData,
-    mapped_entity_id,
-    mapped_entity_type,
-  ): Promise<any> {
-    return this.actionDataRepo.saveActionData(
-      action,
-      loggedInUser,
-      mapped_entity_id,
-      mapped_entity_type,
-    );
-  }
-
-  async updateActionStatus(
-    loggedInUser: UserData,
-    mapped_entity_type: string,
-    mapped_entity_id: number,
-    stage_id: number,
-    action_id: number,
-  ): Promise<any> {
-    return this.actionDataRepo.updateActionStatus(
-      loggedInUser,
-      mapped_entity_type,
-      mapped_entity_id,
-      stage_id,
-      action_id,
-    );
-  }
-
-  async resubmitAction(
-    loggedInUser: UserData,
-    mapped_entity_type: string,
-    mapped_entity_id: number,
-    stage_id: number,
-    action_id: number,
-  ) {
-    const { organization_id } = loggedInUser;
-    return this.actionDataRepo.resubmitAction(
-      organization_id,
-      mapped_entity_type,
-      mapped_entity_id,
-      stage_id,
-      action_id,
-    );
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { UserData } from 'src/module/user/entity/user.entity';
+import { DataSource } from 'typeorm';
+import { ActionDataRepository } from '../repository/action-data.repository';
+
+@Injectable()
+export class ActionDataService extends EntityServiceImpl {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly actionDataRepo: ActionDataRepository,
+  ) {
+    super();
+  }
+
+  async saveActionData(
+    action: any,
+    loggedInUser: UserData,
+    mapped_entity_id,
+    mapped_entity_type,
+  ): Promise<any> {
+    return this.actionDataRepo.saveActionData(
+      action,
+      loggedInUser,
+      mapped_entity_id,
+      mapped_entity_type,
+    );
+  }
+
+  async updateActionStatus(
+    loggedInUser: UserData,
+    mapped_entity_type: string,
+    mapped_entity_id: number,
+    stage_id: number,
+    action_id: number,
+  ): Promise<any> {
+    return this.actionDataRepo.updateActionStatus(
+      loggedInUser,
+      mapped_entity_type,
+      mapped_entity_id,
+      stage_id,
+      action_id,
+    );
+  }
+
+  async resubmitAction(
+    loggedInUser: UserData,
+    mapped_entity_type: string,
+    mapped_entity_id: number,
+    stage_id: number,
+    action_id: number,
+  ) {
+    const { organization_id } = loggedInUser;
+    return this.actionDataRepo.resubmitAction(
+      organization_id,
+      mapped_entity_type,
+      mapped_entity_id,
+      stage_id,
+      action_id,
+    );
+  }
+}

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

@@ -1,10 +1,10 @@
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { DataSource } from 'typeorm';
-
-@Injectable()
-export class ActionResourcesMappingService extends EntityServiceImpl {
-  constructor(private readonly dataSource: DataSource) {
-    super();
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { DataSource } from 'typeorm';
+
+@Injectable()
+export class ActionResourcesMappingService extends EntityServiceImpl {
+  constructor(private readonly dataSource: DataSource) {
+    super();
+  }
+}

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

@@ -1,115 +1,131 @@
-import { level } from 'winston';
-import { Injectable } from '@nestjs/common';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { DataSource } from 'typeorm';
-
-@Injectable()
-export class ActionTemplateMappingService extends EntityServiceImpl {
-  constructor(private readonly dataSource: DataSource) {
-    super();
-  }
-  async getTemplateByMode(
-    stage_id: number,
-    action_id: number,
-    loggedInUser,
-    mode?: number,
-  ) {
-    let stageAction = [] as any;
-
-    if (action_id != 0) {
-      stageAction = await this.dataSource.query(
-        `
-      SELECT id FROM frm_wf_stage_action_mapping
-      WHERE action_id = $1
-      `,
-        [action_id],
-      );
-    } else {
-      // generic action
-      // get template by mode
-
-      let modeId = mode;
-      if (!modeId) {
-        const rows = await this.dataSource.query(
-          `
-      SELECT id
-      FROM frm_list_master_items 
-      WHERE organization_id = $1 
-        AND listtype = 'MOD' AND code = $2
-    `,
-          [loggedInUser.organization_id, 'email'],
-        );
-        modeId = rows?.[0]?.id ?? 0;
-      }
-
-      const commTemplates = await this.dataSource.query(
-        `
-            SELECT code as value, name as label , id
-            FROM frm_wf_comm_template
-            WHERE mode = $1
-              AND organization_id = $2
-              AND level_type = $3
-              AND level_id::int = $4
-              AND status::int IN (
-                SELECT id
-                FROM frm_list_master_items
-                WHERE code = 'STATUS_ACTIVE'
-              AND organization_id = $5
-                )
-        `,
-        [
-          String(modeId),
-          String(loggedInUser.organization_id),
-          String(loggedInUser.level_type),
-          Number(loggedInUser.level_id),    // keep number
-          String(loggedInUser.organization_id),
-        ],
-      );
-
-      return commTemplates;
-    }
-    if (!stageAction?.length) return [];
-
-    const stgActMappingId = stageAction[0].id;
-
-    if (!mode) {
-      const getModeFromAction = await this.dataSource.query(
-        `
-        SELECT mode FROM frm_wf_action
-        WHERE id = $1
-        `,
-        [action_id],
-      );
-      mode = getModeFromAction[0]?.mode;
-    }
-
-    const templates = await this.dataSource.query(
-      `
-      SELECT template_code FROM frm_wf_action_resources_mapping
-      WHERE stg_act_mapping_id = $1 
-      `,
-      [stgActMappingId],
-    );
-
-    const templateCodes = templates.map((t) => t.template_code);
-    if (!templateCodes.length) return [];
-
-    const commTemplates = await this.dataSource.query(
-      `
-  SELECT code as value, name as label , id
-  FROM frm_wf_comm_template
-  WHERE code IN ($1) AND mode = $2 AND organization_id = $3 AND level_type = $4 AND level_id = $5 AND status IN (SELECT id FROM frm_list_master_items WHERE code = 'STATUS_ACTIVE' AND organization_id = $6)
-  `,
-      [
-        templateCodes,
-        mode,
-        loggedInUser.organization_id,
-        loggedInUser.level_type,
-        Number(loggedInUser.level_id),
-        Number(loggedInUser.organization_id),
-      ],
-    );
-
-    return commTemplates;
-  }
-}
+import { level } from 'winston';
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { DataSource, Repository } from 'typeorm';
+import { InjectRepository } from '@nestjs/typeorm';
+import { ListMasterItems } from '../../listmaster/entity/list-master-items.entity';
+import { CommTemplate } from '../entity/comm-template.entity';
+
+@Injectable()
+export class ActionTemplateMappingService extends EntityServiceImpl {
+  constructor(private readonly dataSource: DataSource,
+              @InjectRepository(ListMasterItems)
+              private listMasterItemsRepo: Repository<ListMasterItems>,
+              @InjectRepository(CommTemplate)
+              private commTemplateRepository: Repository<CommTemplate>,
+              ) {
+    super();
+  }
+  async getTemplateByMode(
+    stage_id: number,
+    action_id: number,
+    loggedInUser,
+    mode?: number,
+  ) {
+    let stageAction = [] as any;
+
+    if (action_id != 0) {
+      stageAction = await this.dataSource.query(
+        `
+      SELECT id FROM frm_wf_stage_action_mapping
+      WHERE action_id = $1
+      `,
+        [action_id],
+      );
+    } else {
+      // generic action
+      // get template by mode
+
+      let modeId = mode;
+      if (!modeId) {
+        const rows =  await this.listMasterItemsRepo.find({
+          where: {
+            listtype: 'MOD',
+            code: 'email',
+            organization_id: loggedInUser.organization_id,
+          }
+        })
+
+        modeId = rows?.[0]?.id ?? 0;
+      }
+
+      const commTemplates = await this.commTemplateRepository
+        .createQueryBuilder('ct')
+        .select([
+          'ct.code AS value',
+          'ct.name AS label',
+          'ct.id AS id',
+        ])
+        .where('ct.mode = :mode', { mode: String(modeId) })
+        .andWhere('ct.organization_id = :orgId', {
+          orgId: Number(loggedInUser.organization_id),
+        })
+        .andWhere('ct.level_type = :levelType', {
+          levelType: loggedInUser.level_type,
+        })
+        .andWhere('ct.level_id = :levelId', {
+          levelId: String(loggedInUser.level_id),
+        })
+        .andWhere((qb) => {
+          const subQuery = qb
+            .subQuery()
+            .select('lmi.id')
+            .from('frm_list_master_items', 'lmi')
+            .where('lmi.code = :active', { active: 'STATUS_ACTIVE' })
+            .andWhere('lmi.organization_id = :orgId', {
+              orgId: Number(loggedInUser.organization_id),
+            })
+            .getQuery();
+
+          // ⭐ FIX: CAST ct.status TO INT
+          return `(ct.status)::int IN ${subQuery}`;
+        })
+        .getRawMany();
+
+      return commTemplates;
+    }
+    if (!stageAction?.length) return [];
+
+    const stgActMappingId = stageAction[0].id;
+
+    if (!mode) {
+      const getModeFromAction = await this.dataSource.query(
+        `
+        SELECT mode FROM frm_wf_action
+        WHERE id = $1
+        `,
+        [action_id],
+      );
+      mode = getModeFromAction[0]?.mode;
+    }
+
+    const templates = await this.dataSource.query(
+      `
+      SELECT template_code FROM frm_wf_action_resources_mapping
+      WHERE stg_act_mapping_id = $1 
+      `,
+      [stgActMappingId],
+    );
+
+    const templateCodes = templates.map((t) => t.template_code);
+    if (!templateCodes.length) return [];
+
+    const commTemplates = await this.dataSource.query(
+      `
+  SELECT code as value, name as label , id
+  FROM frm_wf_comm_template
+  WHERE code IN ($1) AND mode = $2 AND organization_id = $3 AND level_type = $4 AND level_id = $5 AND status IN (SELECT id FROM frm_list_master_items WHERE code = 'STATUS_ACTIVE' AND organization_id = $6)
+  `,
+      [
+        templateCodes,
+        mode,
+        loggedInUser.organization_id,
+        loggedInUser.level_type,
+        Number(loggedInUser.level_id),
+        Number(loggedInUser.organization_id),
+      ],
+    );
+
+    return commTemplates;
+  }
+}