rez_core 3.1.58 → 3.1.61

package/package.json

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

package/src/module/enterprise/repository/school.repository.ts

@@ -37,7 +37,6 @@ export class SchoolRepository {
       .andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
       .getRawMany();
 
-    console.log('hasOrgAccess', hasOrgAccess);
 
     let currentORGLevel_id = hasOrgAccess[0]?.urm_level_id;
     if (hasOrgAccess[0]?.urm_level_id == 1) {

package/src/module/filter/repository/saved-filter.repository.ts

@@ -39,7 +39,6 @@ export class SavedFilterRepositoryService {
   }
 
   async getDetailsByCode(code: string) {
-    console.log("IN GET DETAILS BY CODE", code);
     let data = await this.savedFilterDetailRepo.find({
       where: { mapped_filter_code: code },
     });

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

@@ -686,7 +686,6 @@ export class FilterService {
     filter: any,
     meta: any,
   ): { query: string; params: any } | null {
-    console.log(filter, meta, 'FILTER AND META');
     if (!meta) return null;
 
     let attr = filter.filter_attribute;

package/src/module/integration/integration.module.ts

@@ -45,6 +45,8 @@ import { IntegrationSource } from './entity/integration-source.entity';
 import { UserIntegration } from './entity/user-integration.entity';
 import { IntegrationEntityMapper } from './entity/integration-entity-mapper.entity';
 import { IntegrationEntityMapperService } from './service/integration-entity-mapper.service';
+import { MapperModule } from '../mapper/mapper.module';
+import { EntityModule } from '../meta/entity.module';
 
 @Module({
   imports: [
@@ -55,6 +57,8 @@ import { IntegrationEntityMapperService } from './service/integration-entity-map
       IntegrationEntityMapper,
     ]),
     IcsMeetingModule,
+    MapperModule,
+    EntityModule
   ],
   controllers: [IntegrationController, GoogleController, WrapperController],
   providers: [
@@ -102,4 +106,5 @@ import { IntegrationEntityMapperService } from './service/integration-entity-map
     IntegrationEntityMapperService,
   ],
 })
-export class IntegrationModule {}
+export class IntegrationModule {
+}

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

@@ -17,6 +17,9 @@ import {
   CreateUserIntegrationDto,
   UpdateUserIntegrationDto,
 } from '../dto/create-config.dto';
+import { FieldMapperService } from '../../mapper/service/field-mapper.service';
+import { COMM_TEMPLATE } from '../../../constant/global.constant';
+import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
 
 export interface SendMessageDto {
   levelId: number;
@@ -46,6 +49,8 @@ export interface GenericMessageDto {
   templateId?: string;
   variables?: Record<string, any>;
   user_id?: number;
+  entity_type?: string;
+  entity_id?: number;
 }
 
 export interface IntegrationConfigWithConfig extends IntegrationConfig {
@@ -77,15 +82,17 @@ export class IntegrationService {
     private readonly userIntegrationRepository: Repository<UserIntegration>,
     @InjectRepository(IntegrationEntityMapper)
     private readonly entityMapperRepository: Repository<IntegrationEntityMapper>,
-
     private readonly dataSource: DataSource,
     private readonly integrationFactory: IntegrationFactory,
     private readonly gmailApiStrategy: GmailApiStrategy,
     private readonly sendGridApiStrategy: SendGridApiStrategy,
     private readonly configService: ConfigService,
+    @Inject('FieldMapperService') private readonly fieldMapperService: FieldMapperService,
+    private readonly entityService: EntityServiceImpl,
     @Inject(forwardRef(() => IntegrationQueueService))
     private readonly queueService?: IntegrationQueueService,
-  ) {}
+  ) {
+  }
 
   private deriveServiceType(
     integration_type: string,
@@ -97,15 +104,15 @@ export class IntegrationService {
   }
 
   async sendMessage({
-    levelId,
-    levelType,
-    app_code,
-    to,
-    message,
-    mode,
-    priority = 1,
-    user_id,
-  }: SendMessageDto): Promise<IntegrationResult> {
+                      levelId,
+                      levelType,
+                      app_code,
+                      to,
+                      message,
+                      mode,
+                      priority = 1,
+                      user_id,
+                    }: SendMessageDto): Promise<IntegrationResult> {
     try {
       // Get active communication configs for the level
       const configs = await this.getActiveConfigs(
@@ -201,7 +208,8 @@ export class IntegrationService {
   ): Promise<any[]> {
     try {
       const allIntegrationData = await this.dataSource.query(
-        `SELECT * FROM cr_integration_master`,
+        `SELECT *
+         FROM cr_integration_master`,
       );
 
       // if entityType is provided, filter the results
@@ -695,7 +703,7 @@ export class IntegrationService {
             if (configJson?.[field]) {
               safeConfig[
                 `has${field.charAt(0).toUpperCase() + field.slice(1)}`
-              ] = true;
+                ] = true;
             }
           });
 
@@ -839,8 +847,9 @@ export class IntegrationService {
         attachments,
         mediaUrl,
         templateId,
-        variables,
         user_id,
+        entity_id,
+        entity_type,
       } = messageDto;
 
       // Auto-detect communication type if not specified
@@ -899,17 +908,27 @@ export class IntegrationService {
               );
 
               // Process template if provided
-              let processedMessage = message;
-              if (templateId && variables) {
-                processedMessage = this.processTemplate(message, variables);
+              let variables;
+              let richText;
+              let externalTemplateId: string | undefined = undefined;
+              if (templateId && entity_type && entity_id) {
+                const templateData = await this.processTemplate(
+                  parseInt(templateId, 10),
+                  entity_type,
+                  entity_id,
+                );
+                variables = templateData.variables;
+                externalTemplateId = templateData.externalTemplateId;
+                richText = templateData.rich_text;
               }
 
               // Merge config with enhanced parameters
               let finalConfig = {
                 ...hub.config_json,
                 ...enhancedConfig,
-                templateId,
+                templateId: externalTemplateId,
                 variables,
+                richText,
               };
 
               // Handle user integration if user_id provided
@@ -927,7 +946,7 @@ export class IntegrationService {
 
               const result = await strategy.sendMessage(
                 recipient,
-                processedMessage,
+                message,
                 finalConfig,
               );
 
@@ -978,20 +997,27 @@ export class IntegrationService {
             );
 
             // Process template if provided
-            let processedMessage = message;
-            if (html && variables) {
-              processedMessage = this.processTemplate(
-                html ? html : message,
-                variables,
+            let variables;
+            let externalTemplateId: string | undefined = undefined;
+            let richText;
+            if (templateId && entity_type && entity_id) {
+              const templateData = await this.processTemplate(
+                parseInt(templateId, 10),
+                entity_type,
+                entity_id,
               );
+              variables = templateData.variables;
+              externalTemplateId = templateData.externalTemplateId;
+              richText = templateData.rich_text;
             }
 
             // Merge config with enhanced parameters
             let finalConfig = {
               ...hub.config_json,
               ...enhancedConfig,
-              templateId,
+              templateId: externalTemplateId,
               variables,
+              richText
             };
 
             // Handle user integration if user_id provided
@@ -1009,7 +1035,7 @@ export class IntegrationService {
 
             const result = await strategy.sendMessage(
               to,
-              processedMessage,
+              message,
               finalConfig,
             );
 
@@ -1157,12 +1183,12 @@ export class IntegrationService {
     // Get template content (integrate with your template system)
     const template = await this.getTemplate(templateDto.templateId);
 
-    const processedMessage = this.processTemplate(
+    const processedMessage = this.replaceTemplateVariables(
       template.content,
       templateDto.variables,
     );
     const processedSubject = template.subject
-      ? this.processTemplate(template.subject, templateDto.variables)
+      ? this.replaceTemplateVariables(template.subject, templateDto.variables)
       : undefined;
 
     const messageDto: GenericMessageDto = {
@@ -1227,7 +1253,49 @@ export class IntegrationService {
     });
   }
 
-  private processTemplate(
+  private async processTemplate(
+    templateId: number,
+    entity_type: string,
+    entity_id: number,
+  ): Promise<{ variables?: Record<string, any>; externalTemplateId?: string; rich_text?: string }> {
+    const commTemplate: any = await this.entityService.getEntityData(COMM_TEMPLATE, templateId, {} as any);
+    if (!commTemplate) {
+      return {
+        variables: {},
+        externalTemplateId: undefined,
+      };
+    }
+
+    let variables = {};
+    if (commTemplate.mapper_id) {
+      variables = await this.fieldMapperService.resolveData(
+        commTemplate.mapper_id,
+        entity_type,
+        entity_id,
+        {} as any,
+      );
+    }
+
+    if (!commTemplate.template_id) {
+      let richText = commTemplate.rich_text;
+
+      richText.replace(/\{\{(\w+)\}\}/g, (match, key) => {
+        const value = variables[key];
+        return value !== undefined ? String(value) : match;
+      });
+
+      return {
+        rich_text: richText,
+      };
+    }
+
+    return {
+      variables,
+      externalTemplateId: commTemplate.template_id,
+    };
+  }
+
+  private replaceTemplateVariables(
     template: string,
     variables: Record<string, any>,
   ): string {
@@ -1905,10 +1973,10 @@ export class IntegrationService {
 
   async getIntegrationConfigById(hubId: number): Promise<
     | (IntegrationConfig & {
-        config: IntegrationConfig;
-        linkedSource?: string;
-        configDetails?: any;
-      })
+    config: IntegrationConfig;
+    linkedSource?: string;
+    configDetails?: any;
+  })
     | null
   > {
     try {

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

@@ -10,7 +10,9 @@ import {
 
 @Injectable()
 export class GmailApiStrategy implements IntegrationStrategy {
-  constructor(private readonly configService: ConfigService) {}
+  constructor(private readonly configService: ConfigService) {
+  }
+
   async sendMessage(
     to: string | string[],
     message: string,
@@ -54,20 +56,20 @@ export class GmailApiStrategy implements IntegrationStrategy {
       const emailContent =
         attachments && attachments.length > 0
           ? this.buildMultipartEmail(
-              toRecipients,
-              ccRecipients,
-              bccRecipients,
-              subject,
-              message,
-              attachments,
-            )
+            toRecipients,
+            ccRecipients,
+            bccRecipients,
+            subject,
+            config.rich_text || message,
+            attachments,
+          )
           : this.buildSimpleEmail(
-              toRecipients,
-              ccRecipients,
-              bccRecipients,
-              subject,
-              message,
-            );
+            toRecipients,
+            ccRecipients,
+            bccRecipients,
+            subject,
+            config.rich_text || message,
+          );
 
       const encodedMessage = Buffer.from(emailContent)
         .toString('base64')

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

@@ -19,9 +19,10 @@ export class SendGridApiStrategy implements IntegrationStrategy {
         apiKey,
         fromEmail,
         templateId,
-        dynamicTemplateData,
         subject,
-        html,
+        richText,
+        variables
+
       } = config;
 
       if (!apiKey || !fromEmail) {
@@ -42,12 +43,12 @@ export class SendGridApiStrategy implements IntegrationStrategy {
       // Handle template emails
       if (templateId) {
         mailData.templateId = templateId;
-        if (dynamicTemplateData) {
-          mailData.dynamicTemplateData = dynamicTemplateData;
+        if (variables) {
+          mailData.dynamicTemplateData = variables;
         }
       } else {
         // Regular email content
-        mailData.html = message || 'Hello from SendGrid!';
+        mailData.html = richText || message;
       }
 
       // Add CC/BCC if provided

package/src/module/layout_preference/service/layout_preference.service.ts

@@ -22,7 +22,6 @@ export class LayoutPreferenceService extends EntityServiceImpl {
       throw new Error('User ID is required to create layout preference.');
     }
 
-    console.log(mapped_entity_type, loggedInUser, userId);
     const existingLayoutPreference =
       await this.layoutPreferenceRepository.findByEntityUserId(
         mapped_entity_type,
@@ -32,7 +31,6 @@ export class LayoutPreferenceService extends EntityServiceImpl {
         type,
       );
 
-    console.log(existingLayoutPreference, 'existingLayoutPreference');
     if (existingLayoutPreference) {
       return await super.updateEntity(
         { ...entityData, id: existingLayoutPreference.id },

package/src/module/mapper/mapper.module.ts

@@ -24,6 +24,9 @@ import { MapperController } from './controller/mapper.controller';
     FieldMapperRepository,
     FieldLovsRepository,
   ],
+  exports: [
+    { provide: 'FieldMapperService', useClass: FieldMapperService },
+  ],
   controllers: [FieldMapperController,MapperController],
 })
 export class MapperModule {

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

@@ -229,12 +229,10 @@ export class MasterService {
         loggedInUser,
       );
 
-    console.log(attributes, 'attributes');
     const uniqueFields = attributes
       .filter((attr) => attr.is_unique)
       .map((attr) => attr.attribute_key);
 
-    console.log(uniqueFields, 'uniqueFields');
 
     if (uniqueFields.length === 0) {
       throw new Error(`No unique fields found for entityType: ${entityType}`);

package/src/module/meta/repository/entity-table.repository.ts

@@ -36,7 +36,6 @@ export class EntityTableRepository {
     displayType: string,
     organization_id: number,
   ) {
-    console.log(entityType, listType, displayType, organization_id);
 
     const whereCondition: any = {
       mapped_entity_type: entityType,

package/src/module/meta/service/entity-dynamic.service.ts

@@ -335,7 +335,6 @@ export class EntityDynamicService {
           let targetEntityId;
           let entityData;
 
-          console.log(id, 'id=============');
 
           if (item.id) {
             // Update existing entity
@@ -412,7 +411,6 @@ export class EntityDynamicService {
   ): Promise<any> {
     const organizationId = loggedInUser.organization_id;
 
-    console.log('mainID', mainID);
 
     const tableName = await this.getTableName(entityType, organizationId);
     const validAttributes = await this.getAttributeCodes(

package/src/module/meta/service/entity-table.service.ts

@@ -79,14 +79,12 @@ export class EntityTableService {
     displayType: string,
     loggedInUser: any,
   ) {
-    console.log(entityType, listType, displayType, loggedInUser);
     const entityTable = await this.findByEntityTypeAndListTypeAndDisplayType(
       entityType,
       listType,
       displayType,
       loggedInUser?.organization_id,
     );
-    console.log(entityTable, 'entityTable');
     const entityTableDto = entityTable as EntityTableDto;
     if (entityTable) {
       entityTableDto.column_list =

package/src/module/meta/service/field-group.service.ts

@@ -53,10 +53,8 @@ export class FieldGroupService extends EntityServiceImpl {
 
     if (layoutJson?.form?.children && Array.isArray(layoutJson.form.children)) {
       const firstChild = layoutJson.form.children[0];
-      console.log('First Child:', firstChild);
 
       if (firstChild.type === 'wizard' && Array.isArray(firstChild.steps)) {
-        console.log('Wizard Steps:', firstChild.steps);
         let i = 0;
         for (const step of firstChild.steps) {
           if (step.type === 'step') {

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

@@ -90,7 +90,6 @@ export class OtpController {
       payload: any;
     },
   ) {
-    // console.log('result', result);
     return await this.emailService.sendEmailWithDynamicTemplate(
       body.to,
       body.subject,

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

@@ -43,7 +43,6 @@ export class LoginService {
 
     let organization;
 
-    console.log('data', data);
 
     // 🔹 Step 2: Find the user by email + organization check
     const user = await this.userService.findByEmailId(email);

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

@@ -37,4 +37,7 @@ export class CommTemplate extends BaseEntity {
 
   @Column({ type: 'varchar', nullable: true })
   template_id: string;
+
+  @Column({ type: 'int', nullable: true })
+  mapper_id: number;
 }

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

@@ -107,7 +107,6 @@ export class StageRepository {
     //   [stageGroup.workflow_id, organization_id],
     // );
 
-    console.log(rows, '-----------LEFT JOIN----------');
     // console.log(rows2, '-----------INNER JOIN----------');
 
     if (!rows || rows.length === 0) {

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

@@ -122,7 +122,6 @@ export class ActionService extends EntityServiceImpl {
     entityData: BaseEntity,
     loggedInUser: UserData,
   ): Promise<any> {
-    console.log('entityData', entityData);
 
     // Extract template from entityData, keep the rest for ActionEntity
     const { template, stage_id, form, ...actionData } =

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

@@ -39,9 +39,6 @@ export class CommTemplateService extends EntityServiceImpl {
 
   async updateEntity(entityData: any, loggedInUser: UserData): Promise<any> {
     const { attachments, ...templateData } = entityData;
-
-    console.log('update for template hit', entityData, loggedInUser);
-
     if (
       loggedInUser.level_type === 'SCH' &&
       templateData.level_type === 'ORG'

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

@@ -498,7 +498,6 @@ export class TaskService extends EntityServiceImpl {
       stage_group_id: entity.stage_group_id,
     } as any;
 
-    console.log(notePayload);
     return await super.createEntity(notePayload, loggedInUser);
   }
 }