rez_core 2.2.182 → 2.2.184

package/package.json

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

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

@@ -62,6 +62,8 @@ export class OtpController {
     @Body()
     body: {
       to: string;
+      cc: string;
+      bcc: string;
       subject: string;
       message: string;
       templateCode: string;
@@ -72,8 +74,10 @@ export class OtpController {
     return await this.emailService.sendEmailWithDynamicTemplate(
       body.to,
       body.subject,
-      body.message,
       body.templateCode,
+      body.cc ? body.cc.split(',') : [],
+      body.bcc ? body.bcc.split(',') : [],
+      body.message,
       body.payload,
       {
         title: 'Project Kickoff Meeting',

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

@@ -66,38 +66,32 @@ export class EmailService {
     email: string,
     subject: string,
     templateCode: string,
+    cc: string[] = [],
+    bcc: string[] = [],
     message?: string,
     context?: any,
     icsPayload?: 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) {
       console.log(`Template with code ${templateCode} not found`);
-
-      // return {
-      //   success: false,
-      //   message: `Template with code ${templateCode} not found`,
-      // };
+      return {
+        success: false,
+        message: `Template with code ${templateCode} not found`,
+      };
     }
 
     // Compile the template string with Handlebars
-    const templateString = template?.rich_text || '';
-
-    let compiled;
-    if (message) {
-      compiled = Handlebars.compile(message);
-    } else {
-      compiled = Handlebars.compile(templateString);
-    }
+    const templateString = template.rich_text || '';
+    const compiled = Handlebars.compile(message || templateString);
     const htmlContent = compiled(context);
 
+    // Attachments (ICS optional)
     const attachments: any[] = [];
-
     if (icsPayload) {
       const icsBase64 = await this.icsService.generateIcs(icsPayload);
       if (icsBase64) {
@@ -110,11 +104,16 @@ export class EmailService {
       }
     }
 
+    // Send the email
     await this.mailerService.sendMail({
       to: email,
-      subject: subject,
+      cc: cc.length > 0 ? cc : undefined,
+      bcc: bcc.length > 0 ? bcc : undefined,
+      subject,
       html: htmlContent,
       attachments,
     });
+
+    return { success: true, message: 'Email sent successfully' };
   }
 }

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

@@ -21,10 +21,12 @@ export class CommTemplateController {
   async getTemplate(
     @Req() req: Request & { user: any },
     @Body('entity_type') entity_type: string,
+    @Body('action_id') action_id: number,
   ) {
     const loggedInUser = req.user.userData;
     const result = this.commTemplateService.getAllCommTemplate(
       entity_type || '',
+      action_id,
       loggedInUser,
     );
     return result;

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

@@ -28,4 +28,7 @@ export class CommTemplate extends BaseEntity {
   // if format_type is 'markup', this field will be used
   @Column({ nullable: true })
   markup_id: number;
+
+  @Column({ nullable: true })
+  is_template: boolean;
 }

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

@@ -1,7 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Workflow } from '../entity/workflow.entity';
-import { Repository } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
 import { CommTemplate } from '../entity/comm-template.entity';
 import { TemplateAttach } from '../entity/template-attach-mapper.entity';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
@@ -14,15 +14,44 @@ export class CommTemplateRepository {
     @InjectRepository(TemplateAttach)
     private readonly templateAttachEntity: Repository<TemplateAttach>,
     private readonly mediaDataService: MediaDataService,
+    private readonly dataSource: DataSource,
   ) {}
 
-  async getAllCommTemplate(entity_type: string, loggedInUser) {
+  async getAllCommTemplate(
+    entity_type: string,
+    action_id: number,
+    loggedInUser,
+  ) {
     const { organization_id } = loggedInUser;
+
+    const [actionResult] = await this.dataSource.query(
+      `SELECT is_template 
+       FROM cr_wf_action 
+       WHERE id = ? AND organization_id = ? 
+       LIMIT 1`,
+      [action_id, organization_id],
+    );
+
+    if (!actionResult) {
+      throw new Error('Invalid action_id');
+    }
+
+    const { is_template } = actionResult;
+
+    await this.dataSource.query(
+      `UPDATE cr_wf_comm_template
+     SET is_template = ?
+     WHERE mapped_entity_type = ?
+       AND organization_id = ?`,
+      [is_template, entity_type, organization_id],
+    );
+
     return this.commTemplateRepository.find({
-      select: ['name', 'code', 'mode'],
+      select: ['name', 'code', 'mode', 'is_template'],
       where: {
         mapped_entity_type: entity_type,
-        organization_id: organization_id,
+        organization_id,
+        is_template,
       },
     });
   }

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

@@ -78,10 +78,15 @@ export class CommTemplateService extends EntityServiceImpl {
     return getTemplate;
   }
 
-  async getAllCommTemplate(entity_type: string, loggedInUser) {
+  async getAllCommTemplate(
+    entity_type: string,
+    action_id: number,
+    loggedInUser,
+  ) {
     const commTemplateData =
       await this.commTemplateRepository.getAllCommTemplate(
         entity_type,
+        action_id,
         loggedInUser,
       );
 
@@ -89,6 +94,7 @@ export class CommTemplateService extends EntityServiceImpl {
       value: item.code,
       label: item.name,
       mode: item.mode,
+      template: item.is_template,
     }));
 
     return response;