rez_core 2.1.128 → 2.1.129

package/package.json

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

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

@@ -4,6 +4,7 @@ import {
   HttpCode,
   HttpStatus,
   Post,
+  Req,
   UseGuards,
 } from '@nestjs/common';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
@@ -20,12 +21,14 @@ export class ActionTemplateMappingController {
   @HttpCode(HttpStatus.OK)
   async getTemplate(
     @Body() body: { stage_id: number; action_id: number; mode: number },
+    @Req() req: Request & { user: any },
   ) {
-    console.log('Incoming Body:', body);
+    const loggedInUser = req.user.userData;
     const result = this.actionTemplateMappingService.getTemplateByMode(
       body.stage_id,
       body.action_id,
       body.mode,
+      loggedInUser,
     );
     return result;
   }

package/src/module/workflow/entity/comm-template.entity.ts

@@ -9,6 +9,6 @@ export class CommTemplate extends BaseEntity {
     this.entity_type = COMM_TEMPLATE;
   }
 
-  @Column({ type: 'int', nullable: true })
-  mode: number;
+  @Column({ type: 'varchar', nullable: true })
+  mode: string;
 }

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

@@ -7,7 +7,12 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
   constructor(private readonly dataSource: DataSource) {
     super();
   }
-  async getTemplateByMode(stage_id: number, action_id: number, mode: number) {
+  async getTemplateByMode(
+    stage_id: number,
+    action_id: number,
+    mode: number,
+    loggedInUser,
+  ) {
     const stageAction = await this.dataSource.query(
       `
       SELECT id FROM cr_wf_stage_action_mapping
@@ -26,6 +31,11 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       `,
       [stgActMappingId],
     );
+    const listMasterItemData = await this.dataSource.query(
+      `SELECT code FROM cr_list_master_items WHERE id = ?`,
+      [mode],
+    );
+
     const templateCodes = templates.map((t) => t.template_code);
     if (!templateCodes.length) return [];
 
@@ -33,9 +43,9 @@ export class ActionTemplateMappingService extends EntityServiceImpl {
       `
       SELECT id, name
       FROM cr_wf_comm_template
-      WHERE code IN (?) AND mode = ?
+      WHERE code IN (?) AND mode = ? AND organization_id = ?
       `,
-      [templateCodes, mode],
+      [templateCodes, listMasterItemData[0].code, loggedInUser.organization_id],
     );
     return commTemplates.map((t) => ({ id: t.id, name: t.name }));
   }