rez_core 3.1.162 → 3.1.164

package/package.json

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

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

@@ -1,6 +1,6 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import { IntegrationService, GenericMessageDto } from './integration.service';
+import { GenericMessageDto, IntegrationService } from './integration.service';
 import { GoogleService } from './calendar-event.service';
 import { IcsMeetingService } from 'src/module/ics/service/ics.service';
 
@@ -384,6 +384,21 @@ export class WrapperService {
       `Generating ICS file. Payload: ${JSON.stringify(payload)}`,
     );
 
+    if (payload.template_code) {
+      let templates = await this.datasource.query(
+        `SELECT id FROM cr_wf_comm_template 
+         WHERE code = ? 
+           AND level_id = ? 
+           AND level_type = ? 
+         LIMIT 1`,
+        [payload.template_code, levelId, levelType],
+      );
+
+      if (templates && templates.length > 0) {
+        payload['templateId'] = templates[0].id;
+      }
+    }
+
     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})`);

package/src/module/listmaster/controller/list-master.controller.ts

@@ -50,31 +50,49 @@ export class ListMasterController {
     );
   }
 
-    // Public/internal endpoint (no JWT required)
-    @Get('/getDropdownDataPublic/:type')
-    @HttpCode(HttpStatus.OK)
-    async getDropdownDataPublic(
-      @Param('type') type: string,
-      @Query() queryParams: Record<string, string>,
+  // Public/internal endpoint (no JWT required)
+  @Get('/getDropdownDataPublic/:type')
+  @HttpCode(HttpStatus.OK)
+  async getDropdownDataPublic(
+    @Param('type') type: string,
+    @Query() queryParams: Record<string, string>,
+  ) {
+    const {
+      inactiveIds,
+      loggedInUser: loggedInUserParam,
+      ...params
+    } = queryParams;
+
+    const inactiveIdsArray = inactiveIds
+      ? inactiveIds.split(',').map((id) => parseInt(id, 10))
+      : [];
+
+    // Default user object (if organization_id or appcode is needed in service)
+    let loggedInUser: any = {};
+
+    if (typeof loggedInUserParam === 'string') {
+      try {
+        loggedInUser = JSON.parse(loggedInUserParam);
+      } catch (e) {
+        loggedInUser = {};
+      }
+    } else if (
+      typeof loggedInUserParam === 'object' &&
+      loggedInUserParam !== null
     ) {
-      const { inactiveIds,loggedInUser, ...params } = queryParams;
-  
-      const inactiveIdsArray = inactiveIds
-        ? inactiveIds.split(',').map((id) => parseInt(id, 10))
-        : [];
-  
-      // Default user object (if organization_id or appcode is needed in service)
-  
-  
-      return await this.service.getDropdownOptions(
-        type,
-        params,
-        inactiveIdsArray,
-        loggedInUser,
-      );
+      loggedInUser = loggedInUserParam;
+    } else {
+      loggedInUser = {};
     }
-  
 
+    return await this.service.getDropdownOptions(
+      type,
+      params,
+      inactiveIdsArray,
+      loggedInUser,
+      true, // publicCall flag set to true
+    );
+  }
 
   @Get('/getDataSourceList/:source')
   @UseGuards(JwtAuthGuard)

package/src/module/listmaster/service/list-master.service.ts

@@ -68,6 +68,7 @@ export class ListMasterService {
     params: Record<string, string>,
     inactiveIdsArray?: number[],
     loggedInUser?,
+    publicCall = false,
   ) {
     const config = await this.listMasterRepo.findByType(
       type,
@@ -76,15 +77,23 @@ export class ListMasterService {
 
     if (!config) throw new NotFoundException(`Type ${type} not found`);
 
-    if (config.appcode != loggedInUser?.appcode) {
+    if (config.appcode != loggedInUser?.appcode && !publicCall) {
       // Call internal API for appcode mismatch
       try {
-        const response = await axios.post(
-          `${this.configService.get('REDIRECT_BE_URL')}/api/list-master/getDropdownData/${type}`,
-          {},
+        const baseUrl = this.configService.get<string>('REDIRECT_BE_URL');
+
+        // Prepare the query string
+        const queryParams = new URLSearchParams({
+          inactiveIds: inactiveIdsArray?.join(',') || '',
+          loggedInUser: JSON.stringify(loggedInUser),
+          ...params, // Spread other params into the query string
+        }).toString();
+
+        // Make the GET request with query parameters
+        const response = await axios.get(
+          `${baseUrl}/list-master/getDropdownDataPublic/${type}?${queryParams}`,
           {
             headers: {
-              Authorization: `Bearer ${loggedInUser?.token || ''}`,
               'Content-Type': 'application/json',
             },
           },