rez_core 2.2.215 → 2.2.216

package/package.json

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

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

@@ -38,6 +38,7 @@ export class WrapperService {
          FROM cr_communication_hub 
          WHERE level_id = ? 
            AND level_type = ? 
+           AND status = 1
            AND communication_config_type = 'EMAIL'`,
         [level_id, level_type],
       );
@@ -80,7 +81,7 @@ export class WrapperService {
           cc: payload.cc,
           bcc: payload.bcc,
           html: payload.html,
-          attachments: payload.attachments,
+          // attachments: payload.attachments,
           // templateId: templateCode,
           variables: payload.variables,
         };
@@ -112,7 +113,7 @@ export class WrapperService {
           cc: payload.cc,
           bcc: payload.bcc,
           html: payload.html,
-          attachments: payload.attachments,
+          // attachments: payload.attachments,
           // templateId: payload.templateId,
           variables: payload.variables,
         };
@@ -152,7 +153,7 @@ export class WrapperService {
         `scheduleMeetingWrapper called by user=${loggedInUser?.id || 'unknown'} Payload=${JSON.stringify(payload)}`,
       );
 
-      const { level_id, level_type } = loggedInUser;
+      const { level_id, level_type, organization_id } = loggedInUser;
 
       // Normalize emails (to, cc, bcc → attendees)
       const cleanEmails = (arr: string[] = []) =>
@@ -179,12 +180,13 @@ export class WrapperService {
         ),
       ];
 
-      // Continue with your config fetch logic
+      // ---- Step 1: Check user-level configs ----
       const userConfigs = await this.datasource.query(
         `SELECT * 
        FROM cr_communication_hub 
        WHERE level_id = ? 
          AND level_type = ? 
+         AND status = 1
          AND communication_config_type = 'EMAIL' 
          AND service = 'API'`,
         [level_id, level_type],
@@ -197,7 +199,7 @@ export class WrapperService {
         const configId = userConfigs[0]?.config_id;
 
         if (provider === 'gmail') {
-          this.logger.log(`Using Google Calendar for scheduling`);
+          this.logger.log(`Using Google Calendar (user-level)`);
           const creds = await this.getConfigCred(configId);
 
           if (creds) {
@@ -211,26 +213,79 @@ export class WrapperService {
             }
 
             const result = await this.googleService.createEvent(creds, payload);
-
             this.logger.log(
-              `scheduleMeetingWrapper SUCCESS. Result: ${JSON.stringify(
-                result,
-              )}`,
+              `scheduleMeetingWrapper SUCCESS (user-level). Result: ${JSON.stringify(result)}`,
             );
 
             return { success: true, data: result };
           }
         }
 
-        // Non-Gmail fallback
+        // Non-Gmail user-level fallback
         return {
           success: true,
           data: await this.sendIcsFallback(payload, level_id, level_type),
         };
       }
 
-      // ORG-level configs...
-      // (rest of your logic stays same)
+      // ---- Step 2: Check ORG-level configs ----
+      this.logger.log(`No user-level config found, checking ORG-level...`);
+
+      const orgConfigs = await this.datasource.query(
+        `SELECT * 
+       FROM cr_communication_hub 
+       WHERE level_id = 1
+         AND level_type = 'ORG' 
+         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;
+
+        if (provider === 'gmail') {
+          this.logger.log(`Using Google Calendar (ORG-level)`);
+          const creds = await this.getConfigCred(configId);
+
+          if (creds) {
+            if (payload.eventId) {
+              const result = await this.googleService.updateEvent(
+                creds,
+                payload.eventId,
+                payload,
+              );
+              return { success: true, data: result };
+            }
+
+            const result = await this.googleService.createEvent(creds, payload);
+            this.logger.log(
+              `scheduleMeetingWrapper SUCCESS (ORG-level). Result: ${JSON.stringify(result)}`,
+            );
+
+            return { success: true, data: result };
+          }
+        }
+
+        // Non-Gmail ORG-level fallback
+        return {
+          success: true,
+          data: await this.sendIcsFallback(payload, 1, 'ORG'),
+        };
+      }
+
+      // ---- Step 3: Absolute fallback (no configs at all) ----
+      this.logger.warn(
+        `No user-level or ORG-level configs found, sending fallback ICS email.`,
+      );
+
+      return {
+        success: true,
+        data: await this.sendIcsFallback(payload, level_id, level_type),
+      };
     } catch (error: any) {
       this.logger.error(
         `scheduleMeetingWrapper ERROR: ${error.message}`,