rez_core 2.2.18 → 2.2.21

package/package.json

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

package/src/module/notification/controller/otp.controller.ts

@@ -54,15 +54,23 @@ export class OtpController {
     return { message: 'OTP verified successfully!', success: true };
   }
 
-  @Get('send-mail')
+  @Post('send-mail')
   @HttpCode(HttpStatus.OK)
-  async sendMail(@Query('email') email: string) {
+  async sendMail(
+    @Body()
+    body: {
+      to: string;
+      subject: string;
+      templateCode: number;
+      payload: any;
+    },
+  ) {
     // return await this.emailService.sendEmail(email, 'Harry', '123456');
     return await this.emailService.sendEmailWithDynamicTemplate(
-      email,
-      'Sample OTP',
-      '<div style="font-family: Arial, sans-serif; padding: 20px; background-color: #f7f9fc; color: #333;"> <div style="max-width: 600px; margin: auto; background-color: #ffffff; padding: 30px; border-radius: 8px; box-shadow: 0 0 10px rgba(0, 0, 0, 0.05);"> <h2 style="color: #2c3e50;">Hello {{name}},</h2> <p style="font-size: 16px; line-height: 1.6;"> We received a request to verify your email address using a one-time password (OTP). </p> <p style="font-size: 16px; line-height: 1.6;"> Please use the following OTP to complete your action: </p> <div style="text-align: center; margin: 20px 0;"> <span style="font-size: 24px; font-weight: bold; color: #2e86de;">{{otp}}</span> </div> <p style="font-size: 16px; line-height: 1.6;"> This OTP is valid for the next 10 minutes. If you did not request this, please ignore this email. </p> <p style="font-size: 16px; line-height: 1.6;"> Regards,<br/> <strong>Your Company Team</strong> </p> <hr style="margin-top: 30px;"/> <p style="font-size: 12px; color: #999;"> This is an automated message, please do not reply to this email. </p> </div> </div>',
-      { name: 'Harsh', otp: '123456' },
+      body.to,
+      body.subject,
+      body.templateCode,
+      body.payload,
     );
   }
 }

package/src/module/notification/service/email.service.ts

@@ -1,10 +1,14 @@
 import { Injectable } from '@nestjs/common';
 import { MailerService } from '@nestjs-modules/mailer';
 import * as Handlebars from 'handlebars';
+import { DataSource } from 'typeorm';
 
 @Injectable()
 export class EmailService {
-  constructor(private readonly mailerService: MailerService) {}
+  constructor(
+    private readonly mailerService: MailerService,
+    private readonly datasource: DataSource,
+  ) {}
 
   async sendEmail(email, name: string, otp: string) {
     this.mailerService
@@ -24,9 +28,22 @@ export class EmailService {
   async sendEmailWithDynamicTemplate(
     email: string,
     subject: string,
-    templateString: string,
+    templateCode: number,
     context?: any,
   ) {
+    // retrieve the rich_text from the database table cr_wf_comm_template for the given templateCode
+
+    const template = await this.datasource
+      .getRepository('cr_wf_comm_template')
+      .findOne({ where: { code: templateCode } });
+
+    if (!template) {
+      throw new Error(`Template with code ${templateCode} not found`);
+    }
+
+    // Compile the template string with Handlebars
+    const templateString = template.rich_text || '';
+
     const compiled = Handlebars.compile(templateString);
     const htmlContent = compiled(context);
 

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

@@ -20,4 +20,7 @@ export class ActionResourcesMapping extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   form_id: string;
+
+  @Column({ type: 'int', nullable: true })
+  stg_act_mapping_id: number;
 }

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

@@ -26,13 +26,23 @@ export class ActionService extends EntityServiceImpl {
       return null;
     }
 
-    const template = await this.dataSource.query(
-      `SELECT template_code FROM cr_wf_action_template_mapping WHERE stg_act_mapping_id =
+    const result = await this.dataSource.query(
+      `SELECT template_code, form_id FROM cr_wf_action_resources_mapping WHERE stg_act_mapping_id =
         (SELECT id FROM cr_wf_stage_action_mapping WHERE action_id = ? AND entity_type = 'STGM')`,
       [actionData.id],
     );
 
-    return { ...actionData, template: template.map((t) => t.template_code) };
+    const templates = result
+      .filter((t) => t.template_code !== null)
+      .map((t) => t.template_code);
+
+    const form = result.find((f) => f.form_id !== null);
+
+    return {
+      ...actionData,
+      template: templates,
+      form: form?.form_id ?? null,
+    };
   }
 
   async createEntity(
@@ -61,21 +71,9 @@ export class ActionService extends EntityServiceImpl {
     // Step 3: Template mapping (existing)
     if (Array.isArray(actionData.template) && actionData.template.length > 0) {
       for (const templateCode of actionData.template) {
-        const actionTemplateMapping = {
-          stg_act_mapping_id: stageActionMappingData.id,
-          template_code: templateCode,
-          entity_type: 'ATMP',
-        } as any;
-
-        await super.createEntity(
-          actionTemplateMapping,
-          loggedInUser,
-          manager,
-          appcode,
-        );
-
         // ➕ Step 4: Resource mapping for template
         const resourceMapping = {
+          stg_act_mapping_id: stageActionMappingData.id,
           template_code: templateCode,
           type: 'template',
           entity_type: 'ARMS',
@@ -89,6 +87,7 @@ export class ActionService extends EntityServiceImpl {
     if (actionData.form && actionData.form.length > 0) {
       for (const formId of actionData.form) {
         const resourceMapping = {
+          stg_act_mapping_id: stageActionMappingData.id,
           form_id: formId,
           type: 'form',
           entity_type: 'ARMS',
@@ -108,10 +107,12 @@ export class ActionService extends EntityServiceImpl {
     console.log('entityData', entityData);
 
     // Extract template from entityData, keep the rest for ActionEntity
-    const { template, stage_id, ...actionData } = entityData as ActionEntity & {
-      template?: number[];
-      stage_id?: string;
-    };
+    const { template, stage_id, form, ...actionData } =
+      entityData as ActionEntity & {
+        template?: number[];
+        stage_id?: string;
+        form?: number;
+      };
 
     // Pass only actionData (without template) to super.updateEntity
     let action = await super.updateEntity({ ...actionData }, loggedInUser);
@@ -140,7 +141,7 @@ export class ActionService extends EntityServiceImpl {
 
     // delete existing template mappings for this action
     await this.dataSource.query(
-      `DELETE FROM cr_wf_action_template_mapping WHERE stg_act_mapping_id = ?`,
+      `DELETE FROM cr_wf_action_resources_mapping WHERE stg_act_mapping_id = ? AND type = 'template'`,
       [stageActionMappingData.id],
     );
 
@@ -150,16 +151,32 @@ export class ActionService extends EntityServiceImpl {
         const templateCode = template[i];
 
         // Create Action-Template Mapping
-        const actionTemplateMapping = {
+        const resourceMapping = {
           stg_act_mapping_id: stageActionMappingData.id,
           template_code: templateCode,
-          entity_type: 'ATMP',
+          type: 'template',
+          entity_type: 'ARMS',
         } as any;
 
-        await super.createEntity(actionTemplateMapping, loggedInUser);
+        await super.createEntity(resourceMapping, loggedInUser);
       }
     }
 
+    await this.dataSource.query(
+      `DELETE FROM cr_wf_action_resources_mapping WHERE stg_act_mapping_id = ? AND type = 'form'`,
+      [stageActionMappingData.id],
+    );
+
+    if (form) {
+      const resourceMapping = {
+        stg_act_mapping_id: stageActionMappingData.id,
+        form_id: form,
+        type: 'form',
+        entity_type: 'ARMS',
+      } as any;
+
+      await super.createEntity(resourceMapping, loggedInUser);
+    }
     return action; // Return the action entity instead of actionData
   }
 

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

@@ -138,6 +138,13 @@ export class PopulateWorkflowService extends EntityServiceImpl {
         },
         loggedInUser,
       );
+
+      // adding new entry for workflow level mapping
+      await this.dataSource.query(
+        `INSERT INTO cr_workflow_level_mapping (workflow_id, mapped_level_id, mapped_level_type) VALUES (?, ?, ?)`,
+        [newWf.id, organization_id, 'ORG'],
+      );
+
       workflowIdMap[id] = newWf.id;
     }
 
@@ -205,18 +212,50 @@ export class PopulateWorkflowService extends EntityServiceImpl {
         actions = [];
       }
 
+      console.log(
+        `Found ${actions.length} actions for stage ${id} in workflow ${originalWorkflowId}`,
+      );
+
       // === 4. Action mapping — point to stage, stageGroup, workflow correctly
       for (const row of actions as any[]) {
         const { id, created_date, modified_date, workflow_id, ...rest } = row;
 
         const newWorkflowId = workflowIdMap[workflow_id];
 
+        // Step 1: Get the code of the old is_mandatory field
+        const [oldIsMandatory] = await this.dataSource.query(
+          `SELECT code FROM cr_list_master_items WHERE id = ?`,
+          [rest.action_requirement],
+        );
+
+        // Step 2: Get all new 'ACRQ' list master items for the organization
+        const newIsMandatoryList = await this.dataSource.query(
+          `SELECT id, code FROM cr_list_master_items WHERE organization_id = ? AND listtype = 'ACRQ'`,
+          [organization_id],
+        );
+
+        console.log(
+          `Populating action for stage ${newStage.id} in workflow ${newWorkflowId}`,
+        );
+
+        console.log(`Old is_mandatory code: ${oldIsMandatory?.code}`);
+        console.log(`New is_mandatory list:`, newIsMandatoryList);
+
+        // Step 3: Find the matching new item with the same code
+        const matchedNewMandatory = newIsMandatoryList.find(
+          (item) => item.code === oldIsMandatory?.code,
+        );
+
+        console.log(`Matched new mandatory item:`, matchedNewMandatory);
+
+        // Step 4: Use the matched new item's id (if found)
         await this.actionService.createEntity(
           {
             ...rest,
             stage_id: newStage.id,
             workflow_id: newWorkflowId,
             organization_id,
+            action_requirement: matchedNewMandatory?.id ?? null,
             level_id: organization_id,
             entity_type: 'ACTN',
           },