rez_core 3.1.23 → 3.1.25

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

@@ -20,13 +20,28 @@ export class NotificationsService {
     return { success: true, token };
   }
 
-  async sendToDevice(token: string, title: string, body: string) {
-    const message = {
+  async sendToDevice(
+    token: string,
+    title: string,
+    body: string,
+    data?: Record<string, any>,
+  ) {
+    const message: admin.messaging.Message = {
       token,
-      notification: { title, body },
+      notification: { title, body }, // system notification
+      data: data
+        ? Object.fromEntries(
+            Object.entries(data).map(([k, v]) => [k, v.toString()]),
+          )
+        : undefined, // FCM requires all values to be strings
     };
 
-    return this.firebaseAdmin.messaging().send(message);
+    try {
+      return await this.firebaseAdmin.messaging().send(message);
+    } catch (error) {
+      console.error(error);
+      throw error;
+    }
   }
 
   // Helper: send to a registered user by userId

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

@@ -41,4 +41,10 @@ export class ActionEntity extends BaseEntity {
 
   @Column({ type: 'int', nullable: true })
   dependent_action_id: number;
+
+  @Column({ type: 'varchar', nullable: true })
+  mode: string;
+
+  @Column({ type: 'varchar', nullable: true })
+  template: string;
 }

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

@@ -1,16 +1,15 @@
-import { log } from 'console';
 import { Inject, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, DataSource } from 'typeorm';
-import { StageMovementData } from '../entity/stage-movement-data.entity';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { UserData } from 'src/module/user/entity/user.entity';
+import { DataSource, Repository } from 'typeorm';
+import { StageMovementData } from '../entity/stage-movement-data.entity';
+import { ACTIVITY_CATEGORIES } from '../repository/activity-log.repository';
 import { StageMovementRepository } from '../repository/stage-movement.repository';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { ActionDataService } from './action-data.service';
-import { TaskService } from './task.service';
-import { ACTIVITY_CATEGORIES } from '../repository/activity-log.repository';
 import { ActivityLogService } from './activity-log.service';
 import { EntityModificationService } from './entity-modification.service';
+import { TaskService } from './task.service';
 
 @Injectable()
 export class WorkflowMetaService extends EntityServiceImpl {
@@ -390,7 +389,8 @@ export class WorkflowMetaService extends EntityServiceImpl {
     await this.dataSource.query(
       `UPDATE crm_lead_meeting SET user_id=?
       WHERE stage_id = ? 
-      AND lead_id = ? 
+      AND mapped_entity_id = ?
+      AND mapped_entity_type = "LEAD" 
       AND (status='scheduled' OR status='rescheduled')
       `,
       [lead_owner, stage_id, lead_id],

package/src/resources/dev.properties.yaml

@@ -1,6 +1,6 @@
 DB_HOST: '13.234.25.234'
 # PROFILE: 'dev'
-DB_HOST: 'localhost'
+#DB_HOST: 'localhost'
 DB_PORT: '3306'
 DB_USER: 'root'
 DB_PASS: 'Rezolut@123'