rez_core 3.1.126 → 3.1.128

package/package.json

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

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

@@ -1,9 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import {
-  IntegrationService,
-  GenericMessageDto,
-} from './integration.service';
+import { IntegrationService, GenericMessageDto } from './integration.service';
 import { GoogleService } from './calendar-event.service';
 import { IcsMeetingService } from 'src/module/ics/service/ics.service';
 
@@ -144,6 +141,97 @@ export class WrapperService {
     }
   }
 
+  /**
+   * Wrapper for sending communication
+   */
+
+  async sendCommunicationWrapperService(entity: any, loggedInUser: any) {
+    try {
+      this.logger.log(
+        `sendMailWrapper called. User: ${JSON.stringify(loggedInUser)}, Payload: ${JSON.stringify(entity)}`,
+      );
+
+      const { level_id, level_type, appcode } = loggedInUser;
+
+      // Step 1: Check if active email configs exist for current user's level
+      this.logger.debug(
+        `Checking active EMAIL configs for level_id=${level_id}, level_type=${level_type}, app_code=${appcode}`,
+      );
+
+      let configs = await this.integrationService.getActiveConfigs(
+        level_id,
+        level_type,
+        appcode,
+        'EMAIL',
+      );
+
+      let effectiveLevelId = level_id;
+      let effectiveLevelType = level_type;
+
+      // Step 2: If no configs exist, fall back to ORG-level (1, 'ORG')
+      if (!configs || configs.length === 0) {
+        this.logger.warn(
+          `No EMAIL configs found for ${level_type}:${level_id}, falling back to ORG-level`,
+        );
+
+        configs = await this.integrationService.getActiveConfigs(
+          1,
+          'ORG',
+          appcode,
+          'EMAIL',
+        );
+        effectiveLevelId = 1;
+        effectiveLevelType = 'ORG';
+      }
+
+      if (!configs || configs.length === 0) {
+        this.logger.error('No active EMAIL configurations found at any level.');
+        throw new Error('No active EMAIL configurations found.');
+      }
+
+      // Step 3: Prepare payload for Integration Service
+      const mailPayload = {
+        to: entity.to,
+        subject: entity.subject,
+        html: entity.message,
+        cc: entity?.cc,
+        bcc: entity?.bcc,
+        templateId: entity.templateId,
+        message: entity.message,
+        type: entity.type || 'EMAIL',
+        levelId: effectiveLevelId,
+        levelType: effectiveLevelType,
+        app_code: appcode,
+        user_id: loggedInUser.id,
+        entity_type: 'LEAD',
+        entity_id: entity.mapped_entity_id,
+      } as any;
+
+      this.logger.debug(
+        `Final payload for sendGenericMessage: ${JSON.stringify(mailPayload)}`,
+      );
+
+      // Step 4: Send mail via integration service
+      const result =
+        await this.integrationService.sendGenericMessage(mailPayload);
+
+      this.logger.log(
+        `sendMailWrapper SUCCESS. Result: ${JSON.stringify(result)}`,
+      );
+
+      return {
+        success: true,
+        data: result,
+      };
+    } catch (error: any) {
+      this.logger.error(`sendMailWrapper ERROR: ${error.message}`, error.stack);
+      return {
+        success: false,
+        error: error.message,
+      };
+    }
+  }
+
   /**
    * Wrapper for scheduling meeting
    */

package/src/module/workflow/controller/stage.controller.ts

@@ -24,7 +24,7 @@ export class StageController {
   @Post('/getAllStage')
   async getAllStage(
     @Req() req: Request & { user: any },
-    @Body() body: { stage_group_id: number },
+    @Body() body: { stage_group_id: number; mapped_entity_id: number },
     @Query() query: { show_previous: boolean },
   ) {
     const { organization_id } = req.user.userData;

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

@@ -34,6 +34,7 @@ export class StageService extends EntityServiceImpl {
   async getAllStage(
     payload: {
       stage_group_id: number;
+      mapped_entity_id: number;
     },
     organization_id: number,
     show_previous: boolean,
@@ -63,15 +64,52 @@ export class StageService extends EntityServiceImpl {
       return allStages;
     }
 
+    // 1. Get all stages up to the current stage group
     const allStageWithStageGroup =
       await this.stageRepository.getAllStageGroupAndStageByStageMovement(
         payload.stage_group_id,
         organization_id,
       );
 
-    this.logger.debug('allStageWithStageGroup', allStageWithStageGroup);
+    // 2. Get stage movement history for this entity
+    const allStageMovementData = await this.dataSource.manager.find<{
+      id: number;
+      stage_group_id: number;
+      stage_id: number;
+      mapped_entity_id: number;
+      mapped_entity_type: string;
+      is_current: string;
+    }>('cr_wf_stage_movement_data', {
+      where: {
+        mapped_entity_id: payload.mapped_entity_id,
+        mapped_entity_type: 'LEAD',
+      },
+      order: { id: 'ASC' },
+    });
+
+    if (!allStageMovementData || allStageMovementData.length === 0) {
+      return allStageWithStageGroup;
+    }
+
+    // 3. Find the current stage movement (is_current === 'Y')
+    const currentMovement = allStageMovementData.find(
+      (m) => m.is_current === 'Y',
+    );
+
+    if (!currentMovement) {
+      return allStageWithStageGroup;
+    }
+
+    // 4. Filter stages up to and including the current stage_id
+    const filteredStages: any[] = [];
+    for (const stage of allStageWithStageGroup) {
+      filteredStages.push(stage);
+      if (stage.id === currentMovement.stage_id) {
+        break; // stop once we reach the current stage
+      }
+    }
 
-    return allStageWithStageGroup;
+    return filteredStages;
   }
 
   async updateEntity(