rez_core 2.2.201 → 2.2.203

package/package.json

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

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

@@ -128,6 +128,7 @@ export class WrapperService {
 
   /**
    * Wrapper for scheduling meeting in Google Calendar
+   * or fallback to sending ICS as email attachment
    */
   async scheduleMeetingWrapper(payload: any, loggedInUser: any) {
     try {
@@ -137,61 +138,121 @@ export class WrapperService {
 
       const { level_id, level_type } = loggedInUser;
 
-      // 1. Check for config at user’s level
-      const configs = await this.datasource.query(
+      // 1. Try user-level config
+      const userConfigs = await this.datasource.query(
         `SELECT * 
-         FROM cr_communication_hub 
-         WHERE level_id = ? 
-           AND level_type = ? 
-           AND communication_config_type = 'EMAIL' AND provider = 'gmail' 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],
       );
 
-      let configCred;
-      let result;
+      if (userConfigs && userConfigs.length > 0) {
+        const provider = userConfigs[0]?.provider;
+        const configId = userConfigs[0]?.config_id;
 
-      if (configs && configs.length > 0) {
-        // only if type is gmail
-        configCred = await this.datasource.query(
-          `SELECT config_json
-            FROM cr_communication_config
-            WHERE id = ?`,
-          [configs[0].config_id],
+        if (provider === 'gmail') {
+          // Gmail → Use Google Calendar
+          const creds = await this.getConfigCred(configId);
+          if (creds) {
+            const result = await this.googleService.createEvent(creds, payload);
+            return { success: true, data: result };
+          }
+        }
+
+        // Non-Gmail provider → Use ICS over email
+        const result = await this.sendIcsFallback(
+          payload,
+          level_id,
+          level_type,
         );
+        return { success: true, data: result };
+      }
+
+      // 2. Fallback to ORG-level config
+      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'`,
+      );
 
-        if (!configCred || configCred.length === 0) {
-          throw new Error('No Google credentials found for user-level config');
+      if (orgConfigs && orgConfigs.length > 0) {
+        const provider = orgConfigs[0].provider;
+        const configId = orgConfigs[0].config_id;
+
+        if (provider === 'gmail') {
+          // ORG Gmail → Google Calendar
+          const creds = await this.getConfigCred(configId);
+          if (creds) {
+            const result = await this.googleService.createEvent(creds, payload);
+            return { success: true, data: result };
+          }
         }
 
-        configCred = configCred[0].config_json;
-        // 3. Call google service
-        result = await this.googleService.createEvent(configCred, payload);
-      } else {
-        const base64String = await this.icsService.generateIcs(payload);
-
-        result = await this.communicationService.sendGenericMessage({
-          ...payload,
-          attachments: [
-            {
-              content: base64String,
-              type: 'text/calendar',
-              filename: 'invite.ics',
-              disposition: 'attachment',
-            },
-          ],
-        });
+        // ORG Non-Gmail → ICS via email
+        const result = await this.sendIcsFallback(payload, 1, 'ORG');
+        return { success: true, data: result };
       }
 
-      return {
-        success: true,
-        data: result,
-      };
+      // 3. Absolute fallback → Default ORG with ICS
+      const result = await this.sendIcsFallback(payload, 1, 'ORG');
+      return { success: true, data: result };
     } catch (error: any) {
       this.logger.error('scheduleMeetingWrapper error', error.message);
-      return {
-        success: false,
-        error: error.message,
-      };
+      return { success: false, error: error.message };
     }
   }
+
+  /**
+   * Fetch credentials JSON by config ID
+   */
+  private async getConfigCred(configId: number) {
+    const configRes = await this.datasource.query(
+      `SELECT config_json 
+       FROM cr_communication_config 
+       WHERE id = ?`,
+      [configId],
+    );
+    return configRes?.[0]?.config_json || null;
+  }
+
+  /**
+   * Send ICS fallback via email
+   */
+  private async sendIcsFallback(
+    payload: any,
+    levelId: number,
+    levelType: string,
+  ) {
+    const base64String = await this.icsService.generateIcs(payload);
+
+    const payloadSendMail: GenericMessageDto = {
+      levelId,
+      levelType,
+      to: payload.to,
+      message: payload.message,
+      subject: payload.subject,
+      type: 'EMAIL',
+      cc: payload.cc,
+      bcc: payload.bcc,
+      html: payload.html,
+      attachments: [
+        {
+          content: base64String,
+          type: 'text/calendar',
+          filename: 'invite.ics',
+          disposition: 'attachment',
+        },
+      ],
+      templateId: payload.templateId,
+      variables: payload.variables,
+    };
+
+    return this.communicationService.sendGenericMessage(payloadSendMail);
+  }
 }

package/src/module/communication/strategies/gmail.strategy.ts

@@ -66,7 +66,7 @@ export class GmailStrategy implements CommunicationStrategy {
         `Subject: ${subject}`,
         'Content-Type: text/html; charset=utf-8',
         '',
-        config.html || message,
+        message || config.html,
       ].join('\n');
 
       const encodedMessage = Buffer.from(emailContent)

package/src/module/master/service/master.service.ts

@@ -240,91 +240,7 @@ export class MasterService {
       throw new Error(`No unique fields found for entityType: ${entityType}`);
     }
 
-    // for (const row of sheetData) {
-
-    //   if (row.parent_type && row.parent_id) {
-    //     await this.resolveParent(row);
-    //   }
-
-    //   for (const attr of attributes) {
-    //     console.log('inside for loop attr');
-    //     if (attr.data_source_type === 'entity' && row[attr.attribute_key]) {
-    //       console.log('inside if condition');
-
-    //       const refEntity = await this.entityMasterService.getEntityData(
-    //         attr.datasource_list,
-    //         loggedInUser,
-    //       );
-    //       const refData = await this.entityManager.query(
-    //         `SELECT * FROM ${refEntity.db_table_name} WHERE code = ? LIMIT 1`,
-    //         [row[attr.attribute_key]],
-    //       );
-
-    //       //you will check the org id of refData and loggedInUser.organization_id
-
-    //       if (!refData.length) {
-    //         throw new Error(
-    //           `Reference entity not found for code: ${row[attr.attribute_key]}`,
-    //         );
-    //       }
-
-    //       row[attr.attribute_key] = refData[0].id;
-    //     }
-    //   }
-    // }
-
-    // const errors: any[] = [];
-
-    // for (let i = 0; i < sheetData.length; i++) {
-    //   const row = sheetData[i];
-
-    //   if (row.parent_type && row.parent_id) {
-    //     await this.resolveParent(row);
-    //   }
-
-    //   for (const attr of attributes) {
-    //     if (attr.data_source_type === 'entity' && row[attr.attribute_key]) {
-    //       const refEntity = await this.entityMasterService.getEntityData(
-    //         attr.datasource_list,
-    //         loggedInUser,
-    //       );
-    //       const refData = await this.entityManager.query(
-    //         `SELECT * FROM ${refEntity.db_table_name} WHERE code = ? LIMIT 1`,
-    //         [row[attr.attribute_key]],
-    //       );
-    //       if (!refData.length) {
-    //         throw new Error(
-    //           `Reference entity not found for code: ${row[attr.attribute_key]}`,
-    //         );
-    //       }
-    //       row[attr.attribute_key] = refData[0].id;
-    //     }
-    //   }
-
-    //   const rowErrors = await this.entityValidationService.validateEntityData(
-    //     row,
-    //     entityMaster,
-    //     loggedInUser,
-    //   );
-
-    //   if (rowErrors && rowErrors.length > 0) {
-    //     errors.push({
-    //       row: i + 1,
-    //       errors: rowErrors,
-    //     });
-    //   }
-    // }
-
-    // await this.upsertViaService(
-    //   entityType,
-    //   sheetData,
-    //   attributes,
-    //   uniqueFields,
-    //   loggedInUser,
-    //   duplicateHandling,
-    // );
-
-    // return { message: 'Entity data uploaded successfully' };
+    
     const errors: any[] = [];
 
     // ✅ Iterate row by row
@@ -362,6 +278,29 @@ export class MasterService {
         }
       }
 
+
+      for (const attr of attributes) {
+        if (attr.data_source_type === 'master' && row[attr.attribute_key]) {
+          const refData = await this.entityManager.query(
+            `SELECT * FROM cr_list_master_items WHERE name = ? and organization_id = ? LIMIT 1`,
+            [row[attr.attribute_key], loggedInUser.organization_id],
+          );
+
+          if (!refData.length) {
+            errors.push({
+              row: i + 1,
+              errors: [
+                `Reference master data not found for name: ${row[attr.attribute_key]}`,
+              ],
+            });
+            continue; // skip further processing for this row
+          }
+
+          // replace with reference id
+          row[attr.attribute_key] = refData[0].id;
+        }
+      }
+
       // ✅ validate single row
       const rowErrors = await this.entityValidationService.validateImportData(
         row,

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

@@ -68,7 +68,6 @@ export class OtpController {
     const browser = parser.getBrowser().name || 'Unknown';
     const os = parser.getOS().name || 'Unknown';
 
-    console.log('data', userAgent, parser, browser, os);
     return await this.otpService.verifyOtp({
       ...data,
       ip,

package/src/module/user/controller/login.controller.ts

@@ -16,6 +16,7 @@ import { Request, Response } from 'express';
 import { UserSessionService } from '../service/user-session.service';
 import { ConfigService } from '@nestjs/config';
 import { CommunicationService } from '../../communication/service/communication.service';
+import { UAParser } from 'ua-parser-js';
 
 @Controller('auth')
 export class LoginController {
@@ -77,7 +78,6 @@ export class LoginController {
   async googleAuthRedirect(@Req() req: any, @Res() res: Response) {
     const {
       email,
-      password,
       name,
       accessToken: googleAccessToken,
       refreshToken: googleRefreshToken,
@@ -86,6 +86,15 @@ export class LoginController {
     } = req.user;
     const { state } = req.query;
 
+    const ip =
+      (req.headers['x-forwarded-for'] as string)?.split(',')[0].trim() ||
+      req.socket.remoteAddress;
+
+    const userAgent = req.headers['user-agent'] || '';
+    const parser = new UAParser(userAgent);
+    const browser = parser.getBrowser().name || 'Unknown';
+    const os = parser.getOS().name || 'Unknown';
+
     // Check if this is a Gmail configuration request
     if (
       state &&
@@ -114,10 +123,11 @@ export class LoginController {
     // Original login flow
     const data = await this.loginService.loginWithGoogle({
       email,
-      password,
-      name,
       subdomain,
       fcm_token,
+      ip,
+      browser,
+      os,
     });
 
     if (!('accessToken' in data) || !data.accessToken)

package/src/module/user/service/login.service.ts

@@ -41,8 +41,8 @@ export class LoginService {
   async login(data: {
     email: string;
     password?: string;
-    subdomain: string;
-    fcm_token: string;
+    subdomain?: string;
+    fcm_token?: string;
     is_otp?: boolean;
     browser?: string;
     ip?: string;
@@ -282,12 +282,13 @@ export class LoginService {
 
   async loginWithGoogle(data: {
     email: string;
-    password: string;
-    name;
-    subdomain: string;
-    fcm_token: string;
+    subdomain?: string;
+    fcm_token?: string;
+    ip?: string;
+    browser?: string;
+    os?: string;
   }) {
-    const { email, password, name, subdomain, fcm_token } = data;
+    const { email, subdomain, fcm_token, ip, browser, os } = data;
     const user = await this.userService.findByEmailId(email);
 
     if (!user) {
@@ -311,7 +312,14 @@ export class LoginService {
     }
 
     // Create session (Same as JWT login flow)
-    return await this.login(data);
+    return await this.login({
+      email,
+      subdomain,
+      fcm_token,
+      ip,
+      browser,
+      os,
+    });
   }
 
   async logout(sessionKey: string) {