rez_core 3.1.22 → 3.1.24

package/src/module/meta/service/resolver.service.ts

@@ -195,4 +195,62 @@ export class ResolverService {
     return rawValue;
   }
   
+  async getResolvedId(
+    loggedInUser: UserData,
+    attrKey: string,
+    displayValue: any,
+    entityType: string,
+  ): Promise<any> {
+    if (displayValue === null || displayValue === undefined || displayValue === '') {
+      return displayValue;
+    }
+  
+    // fetch attribute meta
+    const [attr] = await this.dataSource.query(
+      `SELECT * FROM cr_attribute_master 
+       WHERE mapped_entity_type = ? AND organization_id = ? AND attribute_key = ?`,
+      [entityType, loggedInUser.organization_id, attrKey],
+    );
+  
+    if (!attr) return displayValue;
+  
+    // -------- ENTITY data_source_type --------
+    if (attr.data_source_type === 'entity') {
+      const [entityDef] = await this.dataSource.query(
+        `SELECT * FROM cr_entity_master 
+         WHERE mapped_entity_type = ? AND organization_id = ?`,
+        [attr.datasource_list, loggedInUser.organization_id],
+      );
+  
+      if (!entityDef) return displayValue;
+  
+      const tableName = entityDef.db_table_name;
+  
+      const query =
+        tableName === 'cr_organization'
+          ? `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = ?`
+          : `SELECT id FROM ${tableName} WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`;
+  
+      const params =
+        tableName === 'cr_organization'
+          ? [displayValue]
+          : [displayValue, loggedInUser.organization_id];
+  
+      const [item] = await this.dataSource.query(query, params);
+      return item?.id ?? displayValue;
+    }
+  
+    // -------- MASTER data_source_type --------
+    else if (attr.data_source_type === 'master') {
+      const [item] = await this.dataSource.query(
+        `SELECT id FROM cr_list_master_items 
+         WHERE ${attr.data_source_attribute} = ? AND organization_id = ?`,
+        [displayValue, loggedInUser.organization_id],
+      );
+      return item?.id ?? displayValue;
+    }
+  
+    return displayValue;
+  }
+  
 }

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

@@ -23,12 +23,19 @@ export class NotificationsController {
 
   @Post('send')
   async sendNotification(
-    @Body() body: { token: string; title: string; message: string },
+    @Body()
+    body: {
+      token: string;
+      title: string;
+      message: string;
+      data?: Record<string, any>;
+    },
   ) {
     return this.notificationsService.sendToDevice(
       body.token,
       body.title,
       body.message,
+      body.data,
     );
   }
 

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/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'