rez_core 2.2.20 → 2.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.20",
+  "version": "2.2.22",
   "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/repository/action-data.repository.ts

@@ -25,6 +25,10 @@ export class ActionDataRepository {
 
     if (action.length > 0) {
       for (const act of action) {
+        const is_mandatory = await this.dataSource.query(
+          `SELECT code FROM cr_list_master_items WHERE id = ? and organization_id = ? LIMIT 1;`,
+          [act.action_requirement, loggedInUser.organization_id],
+        );
         const isFirst = act.sequence == minSequence;
         const actionData = this.actionDataRepo.create({
           stage_id: act.stage_id,
@@ -35,6 +39,7 @@ export class ActionDataRepository {
           mapped_entity_type,
           is_current: isFirst ? 'Y' : null,
           start_time: isFirst ? new Date() : null,
+          is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
         } as ActionDataEntity);
         await this.actionDataRepo.save(actionData);
       }

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

@@ -29,7 +29,14 @@ export class ActionRepository {
       [stage_id],
     );
 
-    if (!stageActions?.length) return [];
+    if (!stageActions?.length) {
+      return [
+        {
+          value: 0,
+          label: 'Generic',
+        },
+      ];
+    }
 
     const actionIds = stageActions.map((sa) => sa.action_id);
 

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

@@ -38,14 +38,23 @@ export class TaskRepository {
 
     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 cr_list_master_items WHERE id = ? and organization_id = ? LIMIT 1;`,
+          [act.action_requirement, loggedInUser.organization_id],
+        );
+
         const taskData = this.TaskRepository.create({
           stage_id: act.stage_id,
           user_id: loggedInUser.id,
           action_id: act.id,
           name: act.name,
           sequence: act.sequence,
+          is_mandatory: is_mandatory[0]?.code === 'mandatory' ? true : false,
           mapped_entity_id,
           mapped_entity_type,
+
           is_system: true,
           status: todoListMasterItemId[0]?.id,
         } as TaskDataEntity);

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

@@ -141,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],
     );
 
@@ -162,6 +162,11 @@ export class ActionService extends EntityServiceImpl {
       }
     }
 
+    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,

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

@@ -151,13 +151,11 @@ export class WorkflowMetaService extends EntityServiceImpl {
       return `Initialized workflow with first stage (Stage ID: ${firstStage.id}).`;
     }
 
-    //idhr
-
     // Case 2: Has next stage – move forward
-    const stageDate = await this.getNextStage(currentStage);
+    const stageData = await this.getNextStage(currentStage);
 
-    if (stageDate.hasNextStage) {
-      const { nextStage } = stageDate;
+    if (stageData.hasNextStage) {
+      const { nextStage } = stageData;
       // Close current stage
       currentStage.end_date = now;
       currentStage.is_current = 'N';
@@ -179,7 +177,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
       });
 
       this.populateActionService(
-        currentStage.stage_id,
+        stageData.nextStage.id,
         loggedInUser,
         mapped_entity_id,
         mapped_entity_type,