rez_core 2.2.263 → 2.3.1

package/package.json

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

package/src/module/integration/controller/integration.controller.ts

@@ -456,4 +456,41 @@ export class IntegrationController {
       }
     }
   }
+
+  @Get('active-config')
+  async getActiveConfig(
+    @Query('level_id', ParseIntPipe) levelId: number,
+    @Query('level_type') levelType: string,
+    @Query('app_code') appCode: string,
+    @Query('integration_type') integrationType: 'EMAIL' | 'SMS' | 'WA' | 'TELEPHONE',
+  ) {
+    try {
+      const config = await this.integrationService.getSingleActiveConfig(
+        levelId,
+        levelType,
+        appCode,
+        integrationType,
+      );
+
+      if (!config) {
+        return {
+          success: false,
+          message: 'No active configuration found',
+          data: null,
+        };
+      }
+
+      return {
+        success: true,
+        data: config,
+      };
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'GET_ACTIVE_CONFIG_ERROR',
+        message: error.message || 'Failed to fetch active configuration',
+        code: 'FETCH_ERROR',
+      });
+    }
+  }
 }

package/src/module/integration/service/integration.service.ts

@@ -170,6 +170,27 @@ export class IntegrationService {
     return await queryBuilder.getMany();
   }
 
+  async getSingleActiveConfig(
+    levelId: number,
+    levelType: string,
+    app_code: string,
+    integration_type: 'EMAIL' | 'SMS' | 'WA' | 'TELEPHONE',
+  ): Promise<IntegrationConfig | null> {
+    const configs = await this.configRepository
+      .createQueryBuilder('config')
+      .where('config.level_id = :levelId', { levelId })
+      .andWhere('config.level_type = :levelType', { levelType })
+      .andWhere('config.app_code = :app_code', { app_code })
+      .andWhere('config.integration_type = :integration_type', { integration_type })
+      .andWhere('config.status = 1')
+      .orderBy('config.is_default', 'DESC')
+      .addOrderBy('config.priority', 'ASC')
+      .addOrderBy('config.created_at', 'DESC')
+      .getMany();
+
+    return configs.length > 0 ? configs[0] : null;
+  }
+
   async getAllIntegrationData(
     loggedInUser,
     integration_type?: string,

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