rez_core 4.0.15 → 4.0.17

package/package.json

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

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

@@ -56,6 +56,7 @@ export interface GenericMessageDto {
   user_id?: number;
   entity_type?: string;
   entity_id?: number;
+  organization_id?: number;
 }
 
 export interface IntegrationConfigWithConfig extends IntegrationConfig {
@@ -888,6 +889,7 @@ export class IntegrationService {
         user_id,
         entity_id,
         entity_type,
+        organization_id,
       } = messageDto;
 
       let subject = messageDto.subject;
@@ -928,6 +930,14 @@ export class IntegrationService {
         mediaUrl,
       };
 
+      const loggedInUser = {
+        id: user_id || null,
+        organization_id: organization_id || null,
+        level_id: levelId,
+        level_type: levelType,
+        app_code: app_code,
+      };
+
       // Handle multiple recipients by sending to each individually
       if (Array.isArray(to)) {
         const results: IntegrationResult[] = [];
@@ -956,6 +966,7 @@ export class IntegrationService {
                   parseInt(templateId, 10),
                   entity_type,
                   entity_id,
+                  loggedInUser,
                 );
                 variables = templateData.variables;
                 externalTemplateId = templateData.externalTemplateId;
@@ -1048,6 +1059,7 @@ export class IntegrationService {
                 parseInt(templateId, 10),
                 entity_type,
                 entity_id,
+                loggedInUser,
               );
               variables = templateData.variables;
               externalTemplateId = templateData.externalTemplateId;

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

@@ -256,6 +256,7 @@ export class WrapperService {
         entity_id: entity.entity_id,
         attachments: entity.attachments,
         mediaUrl: entity.mediaUrl,
+        organization_id: organization_id,
       } as any;
 
       this.logger.debug(
@@ -318,12 +319,24 @@ export class WrapperService {
         ),
       ];
 
-      let integrationConfig = await this.integrationService.getSingleActiveConfig(payload.level_id, payload.level_type, payload.app_code, 'EMAIL');
+      let integrationConfig =
+        await this.integrationService.getSingleActiveConfig(
+          payload.level_id,
+          payload.level_type,
+          payload.app_code,
+          'EMAIL',
+        );
 
       if (integrationConfig) {
         return {
           success: true,
-          data: await this.sendIcsInvite(payload, payload.level_id, payload.level_type, payload.app_code),
+          data: await this.sendIcsInvite(
+            payload,
+            payload.level_id,
+            payload.level_type,
+            payload.app_code,
+            loggedInUser.organization_id,
+          ),
         };
       }
 
@@ -340,14 +353,25 @@ export class WrapperService {
         [],
       );
 
-      integrationConfig = await this.integrationService.getSingleActiveConfig(1, 'ORG', 'DEFAULT', 'EMAIL');
+      integrationConfig = await this.integrationService.getSingleActiveConfig(
+        1,
+        'ORG',
+        'DEFAULT',
+        'EMAIL',
+      );
 
       this.logger.debug(`ORG configs found: ${JSON.stringify(orgConfigs)}`);
 
       if (integrationConfig) {
         return {
           success: true,
-          data: await this.sendIcsInvite(payload, 1, 'ORG', 'DEFAULT'),
+          data: await this.sendIcsInvite(
+            payload,
+            1,
+            'ORG',
+            'DEFAULT',
+            loggedInUser.organization_id,
+          ),
         };
       }
     } catch (error: any) {
@@ -378,11 +402,10 @@ export class WrapperService {
     payload: any,
     levelId: number,
     levelType: string,
-    appCode: string
+    appCode: string,
+    organizationId: number,
   ) {
-    this.logger.log(
-      `Generating ICS file. Payload: ${JSON.stringify(payload)}`,
-    );
+    this.logger.log(`Generating ICS file. Payload: ${JSON.stringify(payload)}`);
 
     if (payload.template_code) {
       let templates = await this.datasource.query(
@@ -398,8 +421,16 @@ export class WrapperService {
       }
     }
 
-    let activeConfig = await this.integrationService.getSingleActiveConfig(levelId, levelType, appCode, 'EMAIL');
-    const base64String = await this.icsService.generateIcs(payload, activeConfig?.config_json);
+    let activeConfig = await this.integrationService.getSingleActiveConfig(
+      levelId,
+      levelType,
+      appCode,
+      'EMAIL',
+    );
+    const base64String = await this.icsService.generateIcs(
+      payload,
+      activeConfig?.config_json,
+    );
     this.logger.debug(`ICS generated (base64 length: ${base64String?.length})`);
 
     //  Normalize attendees
@@ -418,8 +449,8 @@ export class WrapperService {
               ? [payload.to]
               : []),
           ...attendeeEmails,
-        ].map(email => email.toLowerCase().trim())
-      )
+        ].map((email) => email.toLowerCase().trim()),
+      ),
     );
 
     const payloadSendMail: GenericMessageDto = {
@@ -443,7 +474,8 @@ export class WrapperService {
       ],
       templateId: payload.templateId,
       entity_id: payload.entity_id,
-      entity_type: payload.entity_type
+      entity_type: payload.entity_type,
+      organization_id: organizationId,
     };
 
     this.logger.debug(