rez_core 2.2.119 → 2.2.121

package/package.json

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

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

@@ -61,13 +61,27 @@ export class OtpController {
       payload: any;
     },
   ) {
-    // return await this.emailService.sendEmail(email, 'Harry', '123456');
+    // console.log('result', result);
     return await this.emailService.sendEmailWithDynamicTemplate(
       body.to,
       body.subject,
       body.message,
       body.templateCode,
       body.payload,
+      {
+        title: 'Project Kickoff Meeting',
+        description: 'Discuss goals and deliverables',
+        startsAt: '2025-08-30T10:00:00+05:30',
+        durationMinutes: 60,
+        meetingUrl: 'https://meet.google.com/xyz-1234-abc',
+        location: 'Google Meet',
+        organizerName: 'Darshil',
+        organizerEmail: 'sample@sample',
+        attendees: [
+          { name: 'John Doe', email: 'john@example.com' },
+          { name: 'Jane Smith', email: 'jane@example.com' },
+        ],
+      },
     );
   }
 }

package/src/module/notification/notification.module.ts

@@ -11,6 +11,7 @@ import { join } from 'path';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { AuthModule } from '../auth/auth.module';
 import { UserModule } from '../user/user.module';
+import { IcsMeetingModule } from '../ics/ics.module';
 
 @Module({
   imports: [
@@ -42,6 +43,7 @@ import { UserModule } from '../user/user.module';
     }),
     AuthModule,
     UserModule,
+    IcsMeetingModule,
   ],
   providers: [OtpService, OtpRepository, EmailService],
   exports: [OtpService, EmailService],

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

@@ -2,34 +2,63 @@ import { Injectable } from '@nestjs/common';
 import { MailerService } from '@nestjs-modules/mailer';
 import * as Handlebars from 'handlebars';
 import { DataSource } from 'typeorm';
+import { IcsMeetingService } from 'src/module/ics/service/ics.service';
 
 @Injectable()
 export class EmailService {
   constructor(
     private readonly mailerService: MailerService,
     private readonly datasource: DataSource,
+    private readonly icsService: IcsMeetingService,
   ) {}
 
-  async sendEmail(email: string, subject: string, context?: any) {
+  async sendEmail(
+    email: string,
+    subject: string,
+    context?: any,
+    icsPayload?: any,
+  ) {
     const template = await this.datasource
       .getRepository('cr_wf_comm_template')
       .findOne({ where: { code: 'OTP_TEMPLATE' } });
 
-    if (!template) {
-      return;
-    }
+    if (!template) return;
 
     const compiled = Handlebars.compile(template.rich_text || '');
     const htmlContent = compiled(context);
 
-    this.mailerService
+    let attachments: any[] = [];
+
+    if (icsPayload) {
+      const icsBase64 = await this.icsService.generateIcs(icsPayload);
+      if (icsBase64) {
+        attachments.push({
+          filename: 'invite.ics',
+          content: icsBase64,
+          encoding: 'base64',
+          contentType: 'text/calendar; charset="utf-8"; method=REQUEST',
+        });
+      }
+    }
+
+    // fire-and-forget
+    const result = await this.mailerService
       .sendMail({
         to: email,
-        subject: subject,
+        subject,
         html: htmlContent,
+        attachments,
+      })
+      .then(() => {
+        console.log(`Email sent to ${email}`);
       })
-      .then(() => {})
-      .catch(() => {});
+      .catch((err) => {
+        console.error(`Failed to send email to ${email}`, err);
+        // Optionally: push to a retry queue, Sentry, DB log, etc.
+      });
+
+    console.log(result); // Return immediately (parent doesn’t block)
+    return;
   }
 
   async sendEmailWithDynamicTemplate(
@@ -38,6 +67,7 @@ export class EmailService {
     templateCode: string,
     message?: string,
     context?: any,
+    icsPayload?: any,
   ) {
     // retrieve the rich_text from the database table cr_wf_comm_template for the given templateCode
 
@@ -46,14 +76,16 @@ export class EmailService {
       .findOne({ where: { code: templateCode } });
 
     if (!template) {
-      return {
-        success: false,
-        message: `Template with code ${templateCode} not found`,
-      };
+      console.log(`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 || '';
+    const templateString = template?.rich_text || '';
 
     let compiled;
     if (message) {
@@ -63,10 +95,25 @@ export class EmailService {
     }
     const htmlContent = compiled(context);
 
+    let attachments: any[] = [];
+
+    if (icsPayload) {
+      const icsBase64 = await this.icsService.generateIcs(icsPayload);
+      if (icsBase64) {
+        attachments.push({
+          filename: 'invite.ics',
+          content: icsBase64,
+          encoding: 'base64',
+          contentType: 'text/calendar; charset="utf-8"; method=REQUEST',
+        });
+      }
+    }
+
     await this.mailerService.sendMail({
       to: email,
       subject: subject,
       html: htmlContent,
+      attachments,
     });
   }
 }

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

@@ -149,10 +149,19 @@ export class PopulateWorkflowService extends EntityServiceImpl {
     );
     const [workflows, stageGroups, stages] = factoryData;
 
-    const status_name = await this.dataSource.query(
-      `SELECT * FROM cr_list_master_items WHERE code='STATUS_ACTIVE' AND organization_id = 1`,
+    let statusRow = await this.dataSource.query(
+      `SELECT * FROM cr_list_master_items WHERE code='STATUS_ACTIVE' AND organization_id = ?`,
+      [organization_id],
     );
 
+    if (statusRow.length === 0) {
+      statusRow = await this.dataSource.query(
+        `SELECT * FROM cr_list_master_items WHERE code='STATUS_ACTIVE' AND organization_id = -1`,
+      );
+    }
+
+    const statusValue = statusRow[0]?.name ?? 'Active';
+
     // === 1. Workflow mapping
     const workflowIdMap: Record<number, number> = {};
     for (const row of workflows) {
@@ -163,7 +172,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
           organization_id,
           level_id: organization_id,
           entity_type: 'WRFW',
-          status: status_name[0].name,
+          status: statusValue,
         },
         loggedInUser,
       );
@@ -190,7 +199,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
           organization_id,
           level_id: organization_id,
           entity_type: 'STGP',
-          status: status_name[0].name,
+          status: statusValue,
         },
         loggedInUser,
       );
@@ -213,7 +222,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
           organization_id,
           level_id: organization_id,
           entity_type: 'STG',
-          status: status_name[0].name,
+          status: statusValue,
         },
         loggedInUser,
       );
@@ -301,7 +310,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
             level_id: organization_id,
             entity_type: 'ACTN',
             form: formActionCategory.length > 0 ? formViewMaster[0]?.id : null,
-            status: status_name[0].name,
+            status: statusValue,
           },
           loggedInUser,
         );

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}