rez_core 2.2.196 → 2.2.197

package/package.json

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

package/src/module/communication/communication.module.ts

@@ -40,10 +40,16 @@ import { TelephoneFactory } from './factories/telephone.factory';
 import { CommunicationFactory } from './factories/communication.factory';
 import { GoogleController } from './controller/calender-event.controller';
 import { GoogleService } from './service/calendar-event.service';
+import { WrapperService } from './service/wrapper.service';
+import { WrapperController } from './controller/wrapper.controller';
+import { IcsMeetingModule } from '../ics/ics.module';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([CommunicationConfig, CommunicationHub])],
-  controllers: [CommunicationController, GoogleController],
+  imports: [
+    TypeOrmModule.forFeature([CommunicationConfig, CommunicationHub]),
+    IcsMeetingModule,
+  ],
+  controllers: [CommunicationController, GoogleController, WrapperController],
   providers: [
     // Main Services
     CommunicationService,
@@ -79,11 +85,13 @@ import { GoogleService } from './service/calendar-event.service';
     CommunicationFactory,
 
     GoogleService,
+    WrapperService,
   ],
   exports: [
     CommunicationService,
     CommunicationFactory,
     CommunicationQueueService,
+    WrapperService,
   ],
 })
 export class CommunicationModule {}

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

@@ -0,0 +1,39 @@
+import {
+  Body,
+  Controller,
+  HttpCode,
+  HttpStatus,
+  Post,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { WrapperService } from '../service/wrapper.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller('wrapper')
+@UseGuards(JwtAuthGuard)
+export class WrapperController {
+  constructor(private readonly wrapperService: WrapperService) {}
+
+  /**
+   * API for sending mail (uses WrapperService.sendMailWrapper)
+   */
+  @Post('send-mail')
+  @HttpCode(HttpStatus.OK)
+  async sendMail(@Body() payload: any, @Req() req: any) {
+    const loggedInUser = req.user.userData;
+
+    return this.wrapperService.sendMailWrapper(payload, loggedInUser);
+  }
+
+  /**
+   * API for scheduling meeting (uses WrapperService.scheduleMeetingWrapper)
+   */
+  @Post('schedule-meeting')
+  @HttpCode(HttpStatus.OK)
+  async scheduleMeeting(@Body() payload: any, @Req() req: any) {
+    const loggedInUser = req.user.userData;
+
+    return this.wrapperService.scheduleMeetingWrapper(payload, loggedInUser);
+  }
+}

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

@@ -23,7 +23,7 @@ export class WrapperService {
    */
   async sendMailWrapper(payload: any, loggedInUser: any) {
     try {
-      const { level_id, level_type } = loggedInUser;
+      const { level_id, level_type, organization_id } = loggedInUser;
 
       // 1. Check for config at user’s level
       const configs = await this.datasource.query(
@@ -35,6 +35,34 @@ export class WrapperService {
         [level_id, level_type],
       );
 
+      let templateCode: string | undefined;
+
+      if (payload.templateCode) {
+        // Try current level first
+        const template = await this.datasource.query(
+          `SELECT code FROM cr_wf_comm_template WHERE code = ? AND level_id = ? AND level_type = ? LIMIT 1`,
+          [payload.templateCode, level_id, level_type],
+        );
+
+        if (template && template.length > 0) {
+          templateCode = template[0].code;
+        } else {
+          // Fallback → ORG level
+          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],
+          );
+
+          if (!fallbackTemplate || fallbackTemplate.length === 0) {
+            throw new Error(
+              `Template with code ${payload.templateCode} not found at user or org level`,
+            );
+          }
+
+          templateCode = fallbackTemplate[0].code;
+        }
+      }
+
       let payloadSendMail: GenericMessageDto;
 
       if (configs && configs.length > 0) {
@@ -49,7 +77,7 @@ export class WrapperService {
           bcc: payload.bcc,
           html: payload.html,
           attachments: payload.attachments,
-          templateId: payload.templateId,
+          templateId: templateCode,
           variables: payload.variables,
         };
       } else {
@@ -120,6 +148,7 @@ export class WrapperService {
       );
 
       let configCred;
+      let result;
 
       if (configs && configs.length > 0) {
         // only if type is gmail
@@ -136,14 +165,11 @@ export class WrapperService {
 
         configCred = configCred[0].config_json;
         // 3. Call google service
-        const result = await this.googleService.createEvent(
-          configCred,
-          payload,
-        );
+        result = await this.googleService.createEvent(configCred, payload);
       } else {
         const base64String = await this.icsService.generateIcs(payload);
 
-        const result = await this.communicationService.sendGenericMessage({
+        result = await this.communicationService.sendGenericMessage({
           ...payload,
           attachments: [
             {
@@ -158,6 +184,7 @@ export class WrapperService {
 
       return {
         success: true,
+        data: result,
       };
     } catch (error: any) {
       this.logger.error('scheduleMeetingWrapper error', error.message);

package/src/module/filter/controller/filter.controller.ts

@@ -32,6 +32,7 @@ export class FilterController {
     @Query() queryParams: Record<string, string>,
     @Query('level_type') levelType?: string,
     @Query('level_id') levelId?: number,
+    @Query('appcode') appCode?: string,
   ) {
     const loggedInUser = req.user.userData;
 
@@ -60,6 +61,7 @@ export class FilterController {
       queryParams: otherQueryParams, // only remaining query params
       customLevelType: levelType,
       customLevelId: levelId,
+      customAppCode: appCode,
     });
   }
 

package/src/module/filter/dto/filter-request.dto.ts

@@ -29,4 +29,5 @@ export interface FilterRequestDto {
   queryParams?: Record<string, string>;
   customLevelType?: string;
   customLevelId?: number;
+  customAppCode?: string;
 }

package/src/module/filter/service/filter.service.ts

@@ -81,6 +81,7 @@ export class FilterService {
       queryParams,
       customLevelType,
       customLevelId,
+      customAppCode,
     } = dto;
 
     // abstract user details
@@ -168,14 +169,15 @@ export class FilterService {
       });
     }
 
-    if (customLevelType && customLevelId) {
+    if (customLevelType && customLevelId && customAppCode) {
       baseWhere.push({
         query:
-          'e.organization_id = :organization_id AND e.level_type = :customLevelType AND e.level_id = :customLevelId',
+          'e.organization_id = :organization_id AND e.level_type = :customLevelType AND e.level_id = :customLevelId AND e.appcode = :customAppCode',
         params: {
           organization_id,
           customLevelType,
           customLevelId,
+          customAppCode,
         },
       });
     }

package/src/module/workflow/service/task.service.ts

@@ -8,7 +8,7 @@ import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { ActivityLogService } from './activity-log.service';
 import { ACTIVITY_CATEGORIES } from '../repository/activity-log.repository';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
-import { Cron, CronExpression } from '@nestjs/schedule';
+// import { Cron, CronExpression } from '@nestjs/schedule';
 import { NotificationsService } from 'src/module/notification/service/notification.service';
 
 @Injectable()