rez_core 2.2.203 → 2.2.204

package/package.json

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

package/src/module/communication/service/wrapper.service.ts

@@ -23,9 +23,16 @@ export class WrapperService {
    */
   async sendMailWrapper(payload: any, loggedInUser: any) {
     try {
+      this.logger.log(
+        `sendMailWrapper called. User: ${JSON.stringify(loggedInUser)}, Payload: ${JSON.stringify(payload)}`,
+      );
+
       const { level_id, level_type, organization_id } = loggedInUser;
 
       // 1. Check for config at user’s level
+      this.logger.debug(
+        `Fetching configs for level_id=${level_id}, level_type=${level_type}`,
+      );
       const configs = await this.datasource.query(
         `SELECT * 
          FROM cr_communication_hub 
@@ -34,24 +41,35 @@ export class WrapperService {
            AND communication_config_type = 'EMAIL'`,
         [level_id, level_type],
       );
+      this.logger.debug(`Configs found: ${JSON.stringify(configs)}`);
 
       let templateCode: string | undefined;
 
       if (payload.templateCode) {
-        // Try current level first
+        this.logger.debug(
+          `Looking up templateCode=${payload.templateCode} for current level`,
+        );
         const template = await this.datasource.query(
           `SELECT rich_text FROM cr_wf_comm_template WHERE code = ? AND level_id = ? AND level_type = ? LIMIT 1`,
           [payload.templateCode, level_id, level_type],
         );
+        this.logger.debug(
+          `Template lookup result: ${JSON.stringify(template)}`,
+        );
 
         if (template && template.length > 0) {
-          templateCode = template[0].rich_text;
+          templateCode = template[0]?.rich_text;
         } else {
-          // Fallback → ORG level
+          this.logger.warn(
+            `Template not found at user level. Falling back to ORG-level template`,
+          );
           const fallbackTemplate = await this.datasource.query(
             `SELECT code FROM cr_wf_comm_template WHERE code = ? AND level_id = ? AND level_type = 'ORG' LIMIT 1`,
             [payload.templateCode, organization_id],
           );
+          this.logger.debug(
+            `Fallback template lookup: ${JSON.stringify(fallbackTemplate)}`,
+          );
 
           if (!fallbackTemplate || fallbackTemplate.length === 0) {
             throw new Error(
@@ -66,6 +84,7 @@ export class WrapperService {
       let payloadSendMail: GenericMessageDto;
 
       if (configs && configs.length > 0) {
+        this.logger.debug(`Using user-level configs`);
         payloadSendMail = {
           levelId: level_id,
           levelType: level_type,
@@ -81,13 +100,18 @@ export class WrapperService {
           variables: payload.variables,
         };
       } else {
-        // 2. Fallback → ORG-level config
+        this.logger.warn(
+          `No user-level configs found. Falling back to ORG-level`,
+        );
         const fallbackConfigs = await this.datasource.query(
           `SELECT * 
            FROM cr_communication_hub 
            WHERE level_type = 'ORG' 
              AND communication_config_type = 'EMAIL'`,
         );
+        this.logger.debug(
+          `ORG-level configs: ${JSON.stringify(fallbackConfigs)}`,
+        );
 
         if (!fallbackConfigs || fallbackConfigs.length === 0) {
           throw new Error('No active email communication config found');
@@ -102,23 +126,30 @@ export class WrapperService {
           type: 'EMAIL',
           cc: payload.cc,
           bcc: payload.bcc,
-          html: payload.html,
+          html: payload.message,
           attachments: payload.attachments,
           templateId: payload.templateId,
           variables: payload.variables,
         };
       }
 
-      // 3. Call communication service
+      this.logger.debug(
+        `Final payload for CommunicationService: ${JSON.stringify(payloadSendMail)}`,
+      );
+
       const result =
         await this.communicationService.sendGenericMessage(payloadSendMail);
 
+      this.logger.log(
+        `sendMailWrapper SUCCESS. Result: ${JSON.stringify(result)}`,
+      );
+
       return {
         success: true,
         data: result,
       };
     } catch (error: any) {
-      this.logger.error('sendMailWrapper error', error.message);
+      this.logger.error(`sendMailWrapper ERROR: ${error.message}`, error.stack);
       return {
         success: false,
         error: error.message,
@@ -127,42 +158,52 @@ export class WrapperService {
   }
 
   /**
-   * Wrapper for scheduling meeting in Google Calendar
-   * or fallback to sending ICS as email attachment
+   * Wrapper for scheduling meeting
    */
   async scheduleMeetingWrapper(payload: any, loggedInUser: any) {
     try {
       this.logger.log(
-        `scheduleMeetingWrapper called by user: ${loggedInUser?.id || 'unknown'}`,
+        `scheduleMeetingWrapper called by user=${loggedInUser?.id || 'unknown'} Payload=${JSON.stringify(payload)}`,
       );
 
       const { level_id, level_type } = loggedInUser;
 
       // 1. Try user-level config
+      this.logger.debug(
+        `Fetching user-level config for scheduling. level_id=${level_id}, level_type=${level_type}`,
+      );
       const userConfigs = await this.datasource.query(
         `SELECT * 
-       FROM cr_communication_hub 
-       WHERE level_id = ? 
-         AND level_type = ? 
-         AND communication_config_type = 'EMAIL' 
-         AND service = 'API'`,
+         FROM cr_communication_hub 
+         WHERE level_id = ? 
+           AND level_type = ? 
+           AND communication_config_type = 'EMAIL' 
+           AND service = 'API'`,
         [level_id, level_type],
       );
+      this.logger.debug(`User configs found: ${JSON.stringify(userConfigs)}`);
 
       if (userConfigs && userConfigs.length > 0) {
         const provider = userConfigs[0]?.provider;
         const configId = userConfigs[0]?.config_id;
+        this.logger.debug(
+          `User config provider=${provider}, configId=${configId}`,
+        );
 
         if (provider === 'gmail') {
-          // Gmail → Use Google Calendar
+          this.logger.log(`Using Google Calendar for scheduling`);
           const creds = await this.getConfigCred(configId);
+          this.logger.debug(`Google creds: ${JSON.stringify(creds)}`);
           if (creds) {
             const result = await this.googleService.createEvent(creds, payload);
+            this.logger.log(
+              `Google Calendar createEvent SUCCESS: ${JSON.stringify(result)}`,
+            );
             return { success: true, data: result };
           }
         }
 
-        // Non-Gmail provider → Use ICS over email
+        this.logger.log(`Non-Gmail provider detected. Falling back to ICS`);
         const result = await this.sendIcsFallback(
           payload,
           level_id,
@@ -172,38 +213,55 @@ export class WrapperService {
       }
 
       // 2. Fallback to ORG-level config
+      this.logger.warn(
+        `No user-level config found. Checking ORG-level configs...`,
+      );
       const orgConfigs = await this.datasource.query(
         `SELECT * 
-       FROM cr_communication_hub 
-       WHERE level_type = 'ORG' 
-         AND level_id = 1
-         AND communication_config_type = 'EMAIL' 
-         AND service = 'API'`,
+         FROM cr_communication_hub 
+         WHERE level_type = 'ORG' 
+           AND level_id = 1
+           AND communication_config_type = 'EMAIL' 
+           AND service = 'API'`,
       );
+      this.logger.debug(`ORG configs found: ${JSON.stringify(orgConfigs)}`);
 
       if (orgConfigs && orgConfigs.length > 0) {
         const provider = orgConfigs[0].provider;
         const configId = orgConfigs[0].config_id;
+        this.logger.debug(
+          `ORG config provider=${provider}, configId=${configId}`,
+        );
 
         if (provider === 'gmail') {
-          // ORG Gmail → Google Calendar
+          this.logger.log(`Using ORG Google Calendar for scheduling`);
           const creds = await this.getConfigCred(configId);
+          this.logger.debug(`ORG Google creds: ${JSON.stringify(creds)}`);
           if (creds) {
             const result = await this.googleService.createEvent(creds, payload);
+            this.logger.log(
+              `ORG Google Calendar createEvent SUCCESS: ${JSON.stringify(result)}`,
+            );
             return { success: true, data: result };
           }
         }
 
-        // ORG Non-Gmail → ICS via email
+        this.logger.log(`ORG Non-Gmail provider. Falling back to ICS`);
         const result = await this.sendIcsFallback(payload, 1, 'ORG');
         return { success: true, data: result };
       }
 
-      // 3. Absolute fallback → Default ORG with ICS
+      // 3. Absolute fallback
+      this.logger.error(
+        `No configs found anywhere. Defaulting to ORG ICS fallback`,
+      );
       const result = await this.sendIcsFallback(payload, 1, 'ORG');
       return { success: true, data: result };
     } catch (error: any) {
-      this.logger.error('scheduleMeetingWrapper error', error.message);
+      this.logger.error(
+        `scheduleMeetingWrapper ERROR: ${error.message}`,
+        error.stack,
+      );
       return { success: false, error: error.message };
     }
   }
@@ -212,12 +270,14 @@ export class WrapperService {
    * Fetch credentials JSON by config ID
    */
   private async getConfigCred(configId: number) {
+    this.logger.debug(`Fetching config JSON for configId=${configId}`);
     const configRes = await this.datasource.query(
       `SELECT config_json 
        FROM cr_communication_config 
        WHERE id = ?`,
       [configId],
     );
+    this.logger.debug(`Config fetch result: ${JSON.stringify(configRes)}`);
     return configRes?.[0]?.config_json || null;
   }
 
@@ -229,7 +289,11 @@ export class WrapperService {
     levelId: number,
     levelType: string,
   ) {
+    this.logger.log(
+      `Generating ICS file for fallback. Payload: ${JSON.stringify(payload)}`,
+    );
     const base64String = await this.icsService.generateIcs(payload);
+    this.logger.debug(`ICS generated (base64 length: ${base64String?.length})`);
 
     const payloadSendMail: GenericMessageDto = {
       levelId,
@@ -253,6 +317,12 @@ export class WrapperService {
       variables: payload.variables,
     };
 
-    return this.communicationService.sendGenericMessage(payloadSendMail);
+    this.logger.debug(
+      `Final payload for ICS send: ${JSON.stringify(payloadSendMail)}`,
+    );
+    const result =
+      await this.communicationService.sendGenericMessage(payloadSendMail);
+    this.logger.log(`ICS fallback mail send result: ${JSON.stringify(result)}`);
+    return result;
   }
 }