rez_core 2.2.188 → 2.2.190

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

@@ -37,11 +37,24 @@ export class NotificationsService {
     return this.sendToDevice(token, title, body);
   }
 
-  async getAllNotifications(loggedInUser: any) {
+  async getAllNotifications(
+    loggedInUser: any,
+    filterQuery?: {
+      is_read?: string;
+    },
+  ) {
+    // if no filterQuery provided, return all notifications
     const { id, level_id, level_type } = loggedInUser;
 
-    const notifications = await this.dataSource.query(
-      `
+    // Convert query param ("true"/"false") → SQL-friendly value (1/0)
+    let isReadFilter: number | undefined = undefined;
+    if (filterQuery && filterQuery.is_read !== undefined) {
+      const isReadBool = String(filterQuery.is_read).toLowerCase() === 'true';
+      isReadFilter = isReadBool ? 1 : 0;
+    }
+
+    // Build query dynamically
+    let query = `
     SELECT
       n.*,
       u.name AS user_name,
@@ -49,15 +62,24 @@ export class NotificationsService {
     FROM cr_notification n
     LEFT JOIN eth_user_profile u ON n.user_id = u.parent_id
     WHERE n.user_id = ? AND n.level_id = ? AND n.level_type = ?
-    ORDER BY n.created_date DESC
-    `,
-      [id, level_id, 'SCH'],
-    );
+  `;
+
+    const params: any[] = [id, level_id, level_type];
+
+    if (isReadFilter !== undefined) {
+      query += ` AND n.is_read = ?`;
+      params.push(isReadFilter);
+    }
+
+    query += ` ORDER BY n.created_date DESC`;
+
+    const notifications = await this.dataSource.query(query, params);
 
     // Profile media enrichment
     const mediaCache = new Map();
     for (const notification of notifications) {
-      notification.is_read = true;
+      // Ensure is_read is returned as boolean
+      notification.is_read = !!notification.is_read;
 
       if (notification.user_profile) {
         if (!mediaCache.has(notification.user_profile)) {
@@ -73,18 +95,21 @@ export class NotificationsService {
       }
     }
 
-    // Batch update all fetched notifications
-    if (notifications.length > 0) {
-      await this.dataSource.query(
-        `
-      UPDATE cr_notification
-      SET is_read = 1
-      WHERE user_id = ? AND level_id = ? AND level_type = ?
-      `,
-        [id, level_id, level_type],
-      );
-    }
-
     return notifications;
   }
+
+  async markAllAsRead(loggedInUser: any) {
+    const { id, level_id, level_type } = loggedInUser;
+
+    const query = `
+    UPDATE cr_notification
+    SET is_read = 1
+    WHERE user_id = ? AND level_id = ? AND level_type = ? AND is_read = 0
+  `;
+
+    const params = [id, level_id, level_type];
+
+    const result = await this.dataSource.query(query, params);
+    return { success: true, affectedRows: result.affectedRows || 0 };
+  }
 }

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

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

package/src/module/workflow/entity/task-data.entity.ts

@@ -56,7 +56,7 @@ export class TaskDataEntity extends BaseEntity {
   @Column({ nullable: true })
   due_date: Date;
 
-  @Column({ nullable: true, type: 'time' })
+  @Column({ nullable: true, type: 'varchar' })
   due_time: string;
 
   @Column({ nullable: true, type: 'varchar' })
@@ -69,8 +69,8 @@ export class TaskDataEntity extends BaseEntity {
   category: string;
 
   @Column({ nullable: true })
-  remainder_date: Date;
+  reminder_date: Date;
 
   @Column({ nullable: true, type: 'varchar' })
-  remainder_time: string;
+  reminder_time: string;
 }

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

@@ -5,6 +5,7 @@ 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';
+import { ComplianceRegistrationInquiriesInstance } from 'twilio/lib/rest/trusthub/v1/complianceRegistrationInquiries';
 
 @Injectable()
 export class CommTemplateRepository {
@@ -19,40 +20,50 @@ export class CommTemplateRepository {
 
   async getAllCommTemplate(
     entity_type: string,
-    action_id: number,
-    loggedInUser,
+    action_id?: number,
+    loggedInUser?,
   ) {
     const { organization_id } = loggedInUser;
 
-    const [actionResult] = await this.dataSource.query(
-      `SELECT is_template 
+    let is_template: number | undefined;
+
+    // 1️⃣ Only check action_id if provided
+    if (action_id) {
+      const [actionResult] = await this.dataSource.query(
+        `SELECT is_template 
        FROM cr_wf_action 
        WHERE id = ? AND organization_id = ? 
        LIMIT 1`,
-      [action_id, organization_id],
-    );
+        [action_id, organization_id],
+      );
 
-    if (!actionResult) {
-      throw new Error('Invalid action_id');
-    }
+      if (!actionResult) {
+        throw new Error('Invalid action_id');
+      }
 
-    const { is_template } = actionResult;
+      is_template = actionResult.is_template;
 
-    await this.dataSource.query(
-      `UPDATE cr_wf_comm_template
+      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],
-    );
+        [is_template, entity_type, organization_id],
+      );
+    }
+
+    const whereCondition: any = {
+      mapped_entity_type: entity_type,
+      organization_id,
+    };
+
+    if (typeof is_template !== 'undefined') {
+      whereCondition.is_template = is_template;
+    }
 
     return this.commTemplateRepository.find({
       select: ['name', 'code', 'mode', 'is_template'],
-      where: {
-        mapped_entity_type: entity_type,
-        organization_id,
-        is_template,
-      },
+      where: whereCondition,
     });
   }
 

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

@@ -80,8 +80,8 @@ export class CommTemplateService extends EntityServiceImpl {
 
   async getAllCommTemplate(
     entity_type: string,
-    action_id: number,
-    loggedInUser,
+    action_id?: number,
+    loggedInUser?,
   ) {
     const commTemplateData =
       await this.commTemplateRepository.getAllCommTemplate(

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

@@ -442,7 +442,7 @@ export class TaskService extends EntityServiceImpl {
     return await super.createEntity(notePayload, loggedInUser);
   }
 
-  @Cron(CronExpression.EVERY_30_SECONDS)
+  @Cron(CronExpression.EVERY_10_SECONDS)
   async fetchTasksDueIn30Mins() {
     const now = new Date();
     const in30Min = new Date(now.getTime() + 30 * 60 * 1000);