rez_core 3.1.150 → 3.1.152

package/package.json

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

package/src/module/ics/service/ics.service.ts

@@ -12,19 +12,16 @@ export class IcsMeetingService {
     const uid = `${uuidv4()}@etherapp.in`;
     const now = this.formatUtc(new Date());
 
-    const dtStart = this.formatUtc(dto.startsAt);
-    const dtEnd = this.formatUtc(
-      new Date(new Date(dto.startsAt).getTime() + dto.durationMinutes * 60000),
-    );
+    const dtStart = this.formatUtc(dto.startTime);
+    const dtEnd = this.formatUtc(new Date(dto.endTime));
 
-    const organizer = dto.organizerEmail
-      ? `ORGANIZER;CN=${dto.organizerName ?? 'Organizer'}:mailto:${dto.organizerEmail}`
-      : '';
+    const organizerEmail = dto.organizerEmail ?? 'yash.joshi@rezolut.in';
+    const organizerName = dto.organizerName ?? 'Organizer';
+    const organizer = `ORGANIZER;CN=${organizerName}:mailto:${organizerEmail}`;
 
     const attendees = dto.attendees
       ?.map(
-        (a) =>
-          `ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=${a.partStat ?? 'NEEDS-ACTION'};CN=${a.name};X-NUM-GUESTS=0:mailto:${a.email}`,
+        (a) => `ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;CN=${a.name ?? a.email};X-NUM-GUESTS=0:mailto:${a.email}`,
       )
       .join('\r\n');
 
@@ -33,7 +30,7 @@ export class IcsMeetingService {
       'PRODID:-//Google Inc//Google Calendar 70.9054//EN',
       'VERSION:2.0',
       'CALSCALE:GREGORIAN',
-      'METHOD:REPLY',
+      'METHOD:REQUEST',
       'BEGIN:VEVENT',
       `DTSTART:${dtStart}`,
       `DTEND:${dtEnd}`,

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

@@ -11,7 +11,7 @@ import { WrapperService } from '../service/wrapper.service';
 import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 
 @Controller('wrapper')
-@UseGuards(JwtAuthGuard)
+// @UseGuards(JwtAuthGuard)
 export class WrapperController {
   constructor(private readonly wrapperService: WrapperService) {}
 
@@ -32,8 +32,8 @@ export class WrapperController {
   @Post('schedule-meeting')
   @HttpCode(HttpStatus.OK)
   async scheduleMeeting(@Body() payload: any, @Req() req: any) {
-    const loggedInUser = req.user.userData;
+    // const loggedInUser = req.user.userData;
 
-    return this.wrapperService.scheduleMeetingWrapper(payload, loggedInUser);
+    return this.wrapperService.scheduleMeetingWrapper(payload, { });
   }
 }

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

@@ -374,6 +374,7 @@ export class WrapperService {
        WHERE level_id = 1
          AND level_type = 'ORG' 
          AND integration_type = 'EMAIL'
+         AND app_code ='DEFAULT'
          AND status = 1`,
         [],
       );
@@ -381,33 +382,33 @@ export class WrapperService {
       this.logger.debug(`ORG configs found: ${JSON.stringify(orgConfigs)}`);
 
       if (orgConfigs && orgConfigs.length > 0) {
-        const provider = orgConfigs[0]?.integration_provider;
-        const configId = orgConfigs[0]?.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
+      //   const provider = orgConfigs[0]?.integration_provider;
+      //   const configId = orgConfigs[0]?.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'),

package/src/module/integration/strategies/email/gmail-api.strategy.ts

@@ -29,14 +29,6 @@ export class GmailApiStrategy implements IntegrationStrategy {
 
       console.log('---- Using Google SDK Gmail API ----');
 
-      if (attachments && attachments.length > 0) {
-        EmailAttachmentValidator.validate(
-          attachments,
-          25 * 1024 * 1024,
-          'Gmail',
-        );
-      }
-
       const oauth2Client = await this.setupOAuth2Client(config);
 
       const gmail = google.gmail({ version: 'v1', auth: oauth2Client });

package/src/module/listmaster/listmaster.module.ts

@@ -10,6 +10,7 @@ import { ListMasterController } from './controller/list-master.controller';
 import { ThirdPartyModule } from '../third-party-module/third-party.module';
 import { HttpModule } from '@nestjs/axios';
 import { ListMasterItemService } from './service/list-master-item.service';
+import { ListMasterExtension } from './service/list-master-extension.interface';
 
 @Module({
   imports: [
@@ -23,8 +24,13 @@ import { ListMasterItemService } from './service/list-master-item.service';
     { provide: 'ListMasterItemService', useClass: ListMasterItemService },
     ListMasterRepository,
     ListMasterItemsRepository,
+    { provide: 'LIST_MASTER_EXTENSION', useValue: null },
   ],
   controllers: [ListMasterController],
-  exports: ['ListMasterService', 'ListMasterItemService'],
+  exports: [
+    'ListMasterService',
+    'ListMasterItemService',
+    'LIST_MASTER_EXTENSION',
+  ],
 })
 export class ListMasterModule {}

package/src/module/listmaster/service/list-master-extension.interface.ts

@@ -0,0 +1,14 @@
+// src/module/list/service/list-master-extension.interface.ts
+export abstract class ListMasterExtension {
+  /**
+   * Called when list master appcode doesn't match
+   * @param type - list type
+   * @param params - filter params
+   * @param loggedInUser - current user
+   */
+  abstract handleAppcodeMismatch(
+    type: string,
+    params: Record<string, any>,
+    loggedInUser: any,
+  ): Promise<any>;
+}

package/src/module/listmaster/service/list-master.service.ts

@@ -15,6 +15,7 @@ import { EntityMasterService } from 'src/module/meta/service/entity-master.servi
 import { UserData } from 'src/module/user/entity/user.entity';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { STATUS_ACTIVE, STATUS_INACTIVE } from 'src/constant/global.constant';
+import { ListMasterExtension } from './list-master-extension.interface';
 
 @Injectable()
 export class ListMasterService {
@@ -28,6 +29,8 @@ export class ListMasterService {
     private readonly listItemsRepo: ListMasterItemsRepository,
     private readonly apiRegistryService: ApiRegistryService,
     private readonly httpService: HttpService,
+    @Inject('LIST_MASTER_EXTENSION')
+    private readonly listMasterExtension?: ListMasterExtension,
   ) {}
 
   private readonly skipLevelFilterEntities = ['BRN'];
@@ -61,6 +64,29 @@ export class ListMasterService {
 
     if (!config) throw new NotFoundException(`Type ${type} not found`);
 
+    // check for appcode mismatch then call extension handler if exists
+    if (
+      loggedInUser?.appcode &&
+      config.appcode &&
+      loggedInUser.appcode !== config.appcode
+    ) {
+      if (
+        this.listMasterExtension &&
+        typeof this.listMasterExtension.handleAppcodeMismatch === 'function'
+      ) {
+        // Call the override function
+        return this.listMasterExtension.handleAppcodeMismatch(
+          type,
+          params,
+          loggedInUser,
+        );
+      } else {
+        throw new BadRequestException(
+          `Appcode mismatch and no handler provided`,
+        );
+      }
+    }
+
     switch (config.source) {
       case 'entity':
         return this.fetchFromEntity(

package/src/module/workflow/entity/workflow-data.entity.ts

@@ -2,7 +2,7 @@ import { WORKFLOW_DATA } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Entity } from 'typeorm';
 
-@Entity({ name: 'cr_wf_master_data' })
+@Entity({ name: 'cr_wf_data' })
 export class WorkFlowData extends BaseEntity {
   constructor() {
     super();

package/src/resources/local.properties.yaml

@@ -3,7 +3,7 @@ DB_HOST: 'localhost'
 DB_PORT: '3306'
 DB_USER: 'root'
 DB_PASS: 'root'
-DB_NAME: 'eth_core'
+DB_NAME: 'ether_uat_mapper'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'
@@ -21,3 +21,7 @@ AWS:
     AWS_SECRET_KEY: 'PPDMAeO2mVUY1w2f46n/dlt5l9+7NY7E9twJb9LU'
     AWS_REGION: 'ap-south-1'
     BUCKET_NAME: 'testether'
+
+FIREBASE_PROJECT_ID: 'sample-d7855'
+FIREBASE_CLIENT_EMAIL: 'firebase-adminsdk-fbsvc@sample-d7855.iam.gserviceaccount.com'
+FIREBASE_PRIVATE_KEY: '-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCwGkpDLqFYgDEW\nnrraMja7ICmd05rJlsTachdcbB25Jm2cWMv1ROfNqWEZE3b14pUJOQgCAPI79Lgj\n+nQ0ATsUWK8Th2esKT9kaHg54UZg/qKNcnM5njVn+xIXc+i/AP/eSGBLich+uljU\nRMFuKrpcN1yNa3t0ib+kZxLHE43aFM9aJYOhET6/37DUdFMZ7GyzSLH3tuy1gB2G\negFyC7ulLnyMBFtL37XOtnP3BPwbjVWdP0qv9I6c0aacS5dQ4PNjCBklnkr6tPsc\n0MYr3VUrqNd/xNNOgk26TwoOaePjjjeaSeOGO2FcBG6WsYSLoZ3zmrlCT4vBlXL7\nPaZGQGfjAgMBAAECggEAHtsMZgcWmCYl87uuK6sesdzpzdCUz3uOVGQnObdr4dQc\n4ocgfYIsR3nFHJqvflfMG0iV4Zv+1YiEdzFcCPyqOF9tlbNk8+JqTBKN9j5FkZss\nKjKCg/b3jpeMTPWvM0BelLkDvliO+7108QR3C/GKo7vDiLfrcrjsDkdNH/qKIUq3\nkHeQE0QDLaoe3sLL4mjPp5A4SnnNBInk1gQZS2iVhTgDAAlSOz7JocyVZr3QhxmF\nUlKYzzJVx8zxIJm3ymH6z6NQNbWnBGWF1eeSZgYRkJG1q+Aqm3kRU/uT3V0HPsvZ\nrg4JGkzM/qFA2mpKuj4ysWGfvERKaEe4Ua84SvbcYQKBgQDjjvgBpQL2V71Ssr2E\nWJO/8Bv3TutWODWEvTRv3woQmuZwT81yIR3R8Ir59xLK0oBQCAONvKnrB5RM5yXQ\nmR6hvyKHFUKWTRqwGCFiD4fh0joO4zQTaFDdbqMYyeTJ4r2W66wXbRXtUvuwhDlg\nmDKamZ1E+EAoYkog6/iNYIcwswKBgQDGHO0n2r8yXYm7dM+EYONGLh76IvxVXJDn\nN8igi1zI2fV3cfUuwXaVlMYUa//aRkNXrBvPdXZEvfRRRLkm6dYLbFZ4Sq6T+NUT\noYNan13R59E6UcA/Oi5jitq9l4Wwn8pDaCbmmR1xdj7+r+H9A5N3BXHeuPLy0f48\nyEY8GF8kEQKBgQDCzhmyDrlCekoxCaMEMXAK2FqYlI8S+HuYbwD85EuRe4nai/as\nxXzpxKq04rbLuvjtim7AX8p20b47N4Y/1VVL0nyUd7bRRKCcL4wkjncc8wOQyyBB\nnQPdDGHDTtL1oY38LTTduR0UVf3xVsBn2OM5RlhEOuFxsPMUy+2z2fbh0QKBgBz3\nMb14AChvAKpFw+mI+PHT4HeWEeqxJAaKY20Fs0UyiO8z3DM/2gS4wdVOjRPu3f29\njjtg4y/dzhDryV5lJgR5jJL96FR+NzktjjT7xA3ipPav6TnVWd73+E9sDgHq+vms\nCrQAgwuJzGAUeygxE6h9RU7ZH7xc850TcyFqNs7hAoGBAMviFpBfpZz/amStyan+\nIPBGpDNV8dUrRE1POIdi6M44mlrI5hkD1ldVl3wjDJtg4VGkMosltLtvC0dDcIou\nuWZT8ENKM2G400PvQ9JJYah9dTkYQL1qMxvpX+biMoRSiAswPwRQjmBQUaz1aN1g\nmXv1VJBLLZVg8x1ckLDjeD20\n-----END PRIVATE KEY-----\n'