rez_core 2.2.195 → 2.2.196

package/package.json

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

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

@@ -31,9 +31,7 @@ export class ScheduledMessageDto extends GenericSendMessageDto {
 
 @Controller('communication')
 export class CommunicationController {
-  constructor(
-    private readonly communicationService: CommunicationService,
-  ) {}
+  constructor(private readonly communicationService: CommunicationService) {}
 
   @Post('send')
   @HttpCode(HttpStatus.OK)
@@ -183,26 +181,29 @@ export class CommunicationController {
     }
   }
 
-  @Put('config/:id/status')
-  async updateConfigStatus(
-    @Param('id', ParseIntPipe) hubId: number,
-    @Body() updateStatusDto: UpdateConfigStatusDto,
-  ) {
-    await this.communicationService.updateConfigStatus(
-      hubId,
-      updateStatusDto.status,
-    );
-    return { message: 'Status updated successfully' };
-  }
-
   @Post('config/:id/update')
   @HttpCode(HttpStatus.OK)
   async activateConfig(
     @Param('id', ParseIntPipe) hubId: number,
-    @Query('status') status: number,
+    @Query('status') status: string,
   ) {
-    await this.communicationService.updateConfigStatus(hubId, status);
-    return { message: 'Configuration updated' };
+    try {
+      const statusNumber = parseInt(status, 10);
+      if (isNaN(statusNumber) || (statusNumber !== 0 && statusNumber !== 1)) {
+        throw new BadRequestException('Status must be 0 or 1');
+      }
+
+      await this.communicationService.updateConfigStatus(hubId, statusNumber);
+      return {
+        success: true,
+        message: 'Configuration updated successfully',
+      };
+    } catch (error) {
+      throw new BadRequestException({
+        success: false,
+        error: 'UPDATE_STATUS_ERROR',
+      });
+    }
   }
 
   @Post('gmail/oauth/init')

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

@@ -269,7 +269,7 @@ export class CommunicationService {
   ): Promise<
     CommunicationHub | { authUrl: string; state: string; message: string }
   > {
-    // Validate that no active configuration of the same type exists (first check)
+    // Deactivate any existing active configurations of the same type to ensure only one is active
     await this.validateUniqueActiveConfig(levelId, levelType, configType);
 
     // Validate service/provider combination using supported combinations
@@ -649,35 +649,30 @@ export class CommunicationService {
   }
 
   async updateConfigStatus(hubId: number, status: number): Promise<void> {
-    // Validate active status change to prevent multiple active configurations
-    if (status === 1) {
-      // Find the hub to get level and type information
-      const hub = await this.hubRepository.findOne({
-        where: { id: hubId },
-      });
+    // Find the hub to get level and type information
+    const hub = await this.hubRepository.findOne({
+      where: { id: hubId },
+    });
 
-      if (!hub) {
-        throw new Error('Communication configuration not found');
-      }
+    if (!hub) {
+      throw new Error('Communication configuration not found');
+    }
 
-      // Check for existing active configuration of same type
-      const existingActiveConfig = await this.hubRepository.findOne({
-        where: {
+    // If activating, deactivate other configs with same level_id + level_type + communication_config_type
+    if (status === 1) {
+      await this.hubRepository.update(
+        {
           level_id: hub.level_id,
           level_type: hub.level_type,
           communication_config_type: hub.communication_config_type,
-          status: 1, // Active status
-          id: Not(hubId), // Exclude current hub
+          status: 1,
+          id: Not(hubId),
         },
-      });
-
-      if (existingActiveConfig) {
-        throw new Error(
-          `An active ${hub.communication_config_type} configuration already exists for ${hub.level_type} ${hub.level_id}. Please deactivate the existing configuration first.`,
-        );
-      }
+        { status: 0 },
+      );
     }
 
+    // Update the requested config
     await this.hubRepository.update(hubId, { status });
   }
 
@@ -739,23 +734,14 @@ export class CommunicationService {
       });
     }
 
-    // Validate active status change to prevent multiple active configurations
+    // Deactivate other configurations if this one is being activated
     if (updateData.status === 1) {
-      const existingActiveConfig = await this.hubRepository.findOne({
-        where: {
-          level_id: hub.level_id,
-          level_type: hub.level_type,
-          communication_config_type: hub.communication_config_type,
-          status: 1, // Active status
-          id: Not(hubId), // Exclude current hub
-        },
-      });
-
-      if (existingActiveConfig) {
-        throw new Error(
-          `An active ${hub.communication_config_type} configuration already exists for ${hub.level_type} ${hub.level_id}. Please deactivate the existing configuration first.`,
-        );
-      }
+      await this.validateUniqueActiveConfig(
+        hub.level_id,
+        hub.level_type,
+        hub.communication_config_type,
+        hubId, // Exclude current hub
+      );
     }
 
     // Handle default configuration logic
@@ -1478,19 +1464,37 @@ export class CommunicationService {
     levelId: number,
     levelType: string,
     configType: CommunicationConfigType,
+    excludeHubId?: number,
   ): Promise<void> {
-    const existingActiveConfig = await this.hubRepository.findOne({
-      where: {
-        level_id: levelId,
-        level_type: levelType,
-        communication_config_type: configType,
-        status: 1, // Active status
-      },
-    });
+    // Find all active configurations of the same type for this level
+    const query = this.hubRepository.createQueryBuilder('hub')
+      .where('hub.level_id = :levelId', { levelId })
+      .andWhere('hub.level_type = :levelType', { levelType })
+      .andWhere('hub.communication_config_type = :configType', { configType })
+      .andWhere('hub.status = :status', { status: 1 });
 
-    if (existingActiveConfig) {
-      throw new Error(
-        `An active ${configType} configuration already exists for ${levelType} ${levelId}. Please deactivate the existing configuration first.`,
+    // Exclude current hub if updating
+    if (excludeHubId) {
+      query.andWhere('hub.id != :excludeHubId', { excludeHubId });
+    }
+
+    const existingActiveConfigs = await query.getMany();
+
+    // If there are existing active configurations, deactivate them
+    if (existingActiveConfigs.length > 0) {
+      await this.hubRepository.update(
+        {
+          level_id: levelId,
+          level_type: levelType,
+          communication_config_type: configType,
+          status: 1,
+          ...(excludeHubId && { id: Not(excludeHubId) }),
+        },
+        { status: 0 } // Deactivate
+      );
+
+      this.logger.log(
+        `Deactivated ${existingActiveConfigs.length} existing ${configType} configuration(s) for ${levelType} ${levelId} to maintain single active provider rule.`,
       );
     }
   }
@@ -1575,7 +1579,7 @@ export class CommunicationService {
     priority?: number,
     is_default?: boolean,
   ): Promise<CommunicationHub> {
-    // Validate that no active configuration of the same type exists
+    // Deactivate any existing active configurations of the same type to ensure only one is active
     await this.validateUniqueActiveConfig(levelId, levelType, configType);
 
     // If setting as default, remove default from other configurations of same type
@@ -1864,9 +1868,8 @@ export class CommunicationService {
   ): Promise<{
     success: boolean;
     data?: Array<{
-      id: string;
-      name: string;
-      generation: string;
+      label: string;
+      value: string;
     }>;
     error?: string;
   }> {

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

@@ -141,21 +141,6 @@ export class WrapperService {
           payload,
         );
       } else {
-        // 2. Fallback → ORG-level config
-        const fallbackConfigs = await this.datasource.query(
-          `SELECT * 
-           FROM cr_communication_hub 
-           WHERE level_type = 'ORG' 
-             AND communication_config_type = 'CALENDAR'`,
-        );
-
-        configCred = await this.datasource.query(
-          `SELECT config_json
-            FROM cr_communication_config
-            WHERE id = ?`,
-          [fallbackConfigs[0]?.config_id],
-        );
-
         const base64String = await this.icsService.generateIcs(payload);
 
         const result = await this.communicationService.sendGenericMessage({

package/src/module/communication/strategies/email/sendgrid-api.strategy.ts

@@ -188,9 +188,8 @@ export class SendGridApiStrategy implements CommunicationStrategy {
   async getTemplates(apiKey: string): Promise<{
     success: boolean;
     data?: Array<{
-      id: string;
-      name: string;
-      generation: string;
+      label: string;
+      value: string;
     }>;
     error?: string;
   }> {
@@ -211,13 +210,12 @@ export class SendGridApiStrategy implements CommunicationStrategy {
 
       const templates = response.data.result || response.data.templates || [];
 
-      // Format the response for dropdown usage
+      // Format the response for dropdown usage with template ID in both label and value
       const formattedTemplates = templates
         .filter((template: any) => template.generation === 'dynamic')
         .map((template: any) => ({
-          id: template.id,
-          name: template.name || `Template ${template.id}`,
-          generation: template.generation,
+          label: template.name,
+          value: template.id,
         }));
 
       return {

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

@@ -30,6 +30,8 @@ export class FilterController {
     @Query('size', ParseIntPipe) size = 10,
     @Req() req: Request & { user: any },
     @Query() queryParams: Record<string, string>,
+    @Query('level_type') levelType?: string,
+    @Query('level_id') levelId?: number,
   ) {
     const loggedInUser = req.user.userData;
 
@@ -56,6 +58,8 @@ export class FilterController {
       size,
       loggedInUser,
       queryParams: otherQueryParams, // only remaining query params
+      customLevelType: levelType,
+      customLevelId: levelId,
     });
   }
 

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

@@ -27,4 +27,6 @@ export interface FilterRequestDto {
   size?: number;
   loggedInUser: UserData;
   queryParams?: Record<string, string>;
+  customLevelType?: string;
+  customLevelId?: number;
 }

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

@@ -79,6 +79,8 @@ export class FilterService {
       sortby,
       loggedInUser,
       queryParams,
+      customLevelType,
+      customLevelId,
     } = dto;
 
     // abstract user details
@@ -147,7 +149,14 @@ export class FilterService {
     const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
 
     // check level_id and level_type
-    if (entity_type != 'ORGP' && level_type && level_id && organization_id) {
+    if (
+      entity_type != 'ORGP' &&
+      level_type &&
+      level_id &&
+      organization_id &&
+      !customLevelType &&
+      !customLevelId
+    ) {
       baseWhere.push({
         query:
           'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
@@ -159,6 +168,18 @@ export class FilterService {
       });
     }
 
+    if (customLevelType && customLevelId) {
+      baseWhere.push({
+        query:
+          'e.organization_id = :organization_id AND e.level_type = :customLevelType AND e.level_id = :customLevelId',
+        params: {
+          organization_id,
+          customLevelType,
+          customLevelId,
+        },
+      });
+    }
+
     // andWhere search with attributeName && attributeValue
     if (queryParams) {
       Object.entries(queryParams).forEach(([key, value]) => {

package/src/module/workflow/entity/comm-template.entity.ts

@@ -31,4 +31,7 @@ export class CommTemplate extends BaseEntity {
 
   @Column({ nullable: true })
   is_template: boolean;
+
+  @Column({ type: 'varchar', nullable: true })
+  flag: string;
 }

package/src/module/workflow/service/comm-template.service.ts

@@ -13,7 +13,10 @@ export class CommTemplateService extends EntityServiceImpl {
   async createEntity(entityData: any, loggedInUser: any): Promise<any> {
     const { attachments, ...templateData } = entityData;
 
-    const tempData = await super.createEntity(templateData, loggedInUser);
+    const tempData = await super.createEntity(
+      { ...templateData, flag: templateData.flag || 'default' },
+      loggedInUser,
+    );
 
     // attachment mapper create and update
     if (attachments && attachments.length > 0) {
@@ -37,6 +40,23 @@ export class CommTemplateService extends EntityServiceImpl {
   async updateEntity(entityData: any, loggedInUser: UserData): Promise<any> {
     const { attachments, ...templateData } = entityData;
 
+    if (
+      loggedInUser.level_type === 'SCH' &&
+      templateData.level_type === 'ORG'
+    ) {
+      const { id, level_type, level_id, ...newTemplateData } = entityData;
+      const create = await this.createEntity(
+        {
+          ...newTemplateData,
+          level_type: loggedInUser.level_type,
+          level_id: loggedInUser.level_id,
+          flag: 'edited',
+        },
+        loggedInUser,
+      );
+      return create;
+    }
+
     const tempData = await super.updateEntity(templateData, loggedInUser);
 
     // delete existing mapper

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

@@ -441,59 +441,4 @@ export class TaskService extends EntityServiceImpl {
     console.log(notePayload);
     return await super.createEntity(notePayload, loggedInUser);
   }
-
-  @Cron(CronExpression.EVERY_10_SECONDS)
-  async fetchTasksDueIn30Mins() {
-    const now = new Date();
-    const in30Min = new Date(now.getTime() + 30 * 60 * 1000);
-
-    const completedStatus = await this.dataSource.query(
-      `SELECT id FROM cr_list_master_items WHERE name = 'completed' AND listtype = 'TKST' LIMIT 1;`,
-    );
-    const completedId = completedStatus[0]?.id;
-
-    const tasks = await this.dataSource.query(
-      `
-    SELECT * 
-    FROM cr_wf_task_data
-    WHERE status != ?
-      AND TIMESTAMP(due_date, due_time) BETWEEN ? AND ?
-    `,
-      [completedId, now, in30Min],
-    );
-
-    if (tasks.length > 0) console.log('Tasks due in 30 mins', tasks);
-
-    if (!tasks.length) {
-      console.log('No tasks due in 30 mins');
-      return;
-    }
-
-    for (const task of tasks) {
-      const message = `Reminder: Task ${task.name} is due at ${task.due_time}`;
-
-      await this.dataSource.query(
-        `
-      INSERT INTO cr_notification (user_id, event_type, message, entity_type, organization_id, created_date, mapped_entity_id, mapped_entity_type, level_id, level_type)
-      VALUES (?, ?, ?, ?, ?, NOW(), ?, ?, ?, ?)
-      `,
-        [
-          task.task_owner,
-          'Task Remainder',
-          message,
-          'NOTF',
-          task.organization_id,
-          task.mapped_entity_id,
-          task.mapped_entity_type,
-          task.level_id,
-          task.level_type,
-        ],
-      );
-      await this.notificationsService.sendToUser(
-        String(task.task_owner), // userId as string
-        'Task Reminder',
-        message,
-      );
-    }
-  }
 }