rez_core 2.2.99 → 2.2.101

package/package.json

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

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

@@ -56,7 +56,8 @@ export class OtpController {
     body: {
       to: string;
       subject: string;
-      templateCode: number;
+      message: string;
+      templateCode: string;
       payload: any;
     },
   ) {
@@ -64,6 +65,7 @@ export class OtpController {
     return await this.emailService.sendEmailWithDynamicTemplate(
       body.to,
       body.subject,
+      body.message,
       body.templateCode,
       body.payload,
     );

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

@@ -35,7 +35,8 @@ export class EmailService {
   async sendEmailWithDynamicTemplate(
     email: string,
     subject: string,
-    templateCode: number,
+    templateCode: string,
+    message?: string,
     context?: any,
   ) {
     // retrieve the rich_text from the database table cr_wf_comm_template for the given templateCode
@@ -45,13 +46,21 @@ export class EmailService {
       .findOne({ where: { code: templateCode } });
 
     if (!template) {
-      throw new Error(`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 compiled = Handlebars.compile(templateString);
+    let compiled;
+    if (message) {
+      compiled = Handlebars.compile(message);
+    } else {
+      compiled = Handlebars.compile(templateString);
+    }
     const htmlContent = compiled(context);
 
     await this.mailerService.sendMail({

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

@@ -7,6 +7,7 @@ import { DataSource, EntityManager } from 'typeorm';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { ActivityLogService } from './activity-log.service';
 import { ACTIVITY_CATEGORIES } from '../repository/activity-log.repository';
+import { MediaDataService } from 'src/module/meta/service/media-data.service';
 
 @Injectable()
 export class TaskService extends EntityServiceImpl {
@@ -16,6 +17,7 @@ export class TaskService extends EntityServiceImpl {
     private readonly dataSource: DataSource,
     @Inject('ActivityLogService')
     private readonly activityLogService: ActivityLogService,
+    private readonly mediaDataService: MediaDataService,
   ) {
     super();
   }
@@ -214,13 +216,14 @@ export class TaskService extends EntityServiceImpl {
       s.name AS stage_name,
       a.name AS action_name,
       u.name AS created_by_name,
-      u2.name AS task_owner_name
+      u2.name AS task_owner_name,
+      u2.profile_image AS task_owner_profile 
     FROM cr_wf_task_data t
     LEFT JOIN cr_wf_stage s ON t.stage_id = s.id
     LEFT JOIN cr_wf_stage_group sg ON s.stage_group_id = sg.id
     LEFT JOIN cr_wf_action a ON t.action_id = a.id
     LEFT JOIN cr_user u ON t.created_by = u.id
-    LEFT JOIN cr_user u2 ON t.task_owner = u2.id
+    LEFT JOIN eth_user_profile u2 ON t.task_owner = u2.parent_id
     WHERE ${whereClauses.join(' AND ')}
     ORDER BY t.created_date DESC
   `;
@@ -248,15 +251,34 @@ export class TaskService extends EntityServiceImpl {
     );
 
     //  Assign task_status using the map
+
+    const mediaCache = new Map<number, any>();
+
     for (const task of taskData) {
+      // Map status name
       task.task_status = task.status
         ? statusMap.get(String(task.status)) || null
         : null;
 
+      // Fix action_name for generic tasks
       task.action_name =
         task.action_id === '0' || task.action_id === 0
           ? 'Generic'
           : task.action_name;
+
+      // Profile media (with caching like notes)
+      if (task.task_owner_profile) {
+        if (!mediaCache.has(task.task_owner_profile)) {
+          const url = await this.mediaDataService.getMediaDownloadUrl(
+            task.task_owner_profile,
+            loggedInUser,
+          );
+          mediaCache.set(task.task_owner_profile, url);
+        }
+        task.task_owner_profile = mediaCache.get(task.task_owner_profile);
+      } else {
+        task.task_owner_profile = null;
+      }
     }
 
     // Normalize is_mandatory to '0'/'1' as string