rez_core 5.0.136 → 5.0.138

package/package.json

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

package/src/config/bull.config.ts

@@ -13,9 +13,9 @@ export class BullConfigService implements SharedBullConfigurationFactory {
   createSharedConfiguration(): BullModuleOptions {
     return {
       redis: {
-        host: this.configService.get<string>('REDIS_HOST', '43.205.35.45'),
-        port: this.configService.get<number>('REDIS_PORT', 6379),
-        password: this.configService.get<string>('REDIS_PASSWORD','Rezolut123'),
+        host: this.configService.get<string>('REDIS_HOST'),
+        port: this.configService.get<number>('REDIS_PORT'),
+        password: this.configService.get<string>('REDIS_PASSWORD'),
         db: this.configService.get<number>('REDIS_DB', 0),
         // Enable offline queue to handle Redis disconnections
         enableOfflineQueue: true,

package/src/module/export/controller/export.controller.ts

@@ -33,6 +33,7 @@ export class ExportController {
         attributeFilter,
         tabs,
         sortby,
+        view
       } = body;
 
       const { ...otherQueryParams } = queryParams;
@@ -51,6 +52,7 @@ export class ExportController {
           customLevelType: levelType,
           customLevelId: levelId,
           customAppCode: appCode,
+          view
         },
       );
 

package/src/module/export/export.module.ts

@@ -3,9 +3,11 @@ import { EntityModule } from '../meta/entity.module';
 import { FilterModule } from '../filter/filter.module';
 import { ExportService } from './service/export.service';
 import { ExportController } from './controller/export.controller';
+import { LayoutModule } from '../layout/layout.module';
+import { LayoutPreferenceModule } from '../layout_preference/layout_preference.module';
 
 @Module({
-  imports: [EntityModule, FilterModule],
+  imports: [EntityModule, FilterModule, LayoutPreferenceModule],
   providers: [ExportService],
   exports: [ExportService],
   controllers: [ExportController]

package/src/module/export/service/export.service.ts

@@ -8,6 +8,7 @@ import { ExcelsheetData } from '../../../utils/dto/excelsheet-data.dto';
 import { AttributeMasterService } from '../../meta/service/attribute-master.service';
 import { EntityMasterService } from '../../meta/service/entity-master.service';
 import { FilterService } from '../../filter/service/filter.service';
+import { LayoutPreferenceRepository } from '../../layout_preference/repository/layout_preference.repository';
 
 @Injectable()
 export class ExportService {
@@ -16,6 +17,7 @@ export class ExportService {
     private readonly attributeMasterService: AttributeMasterService,
     private readonly entityMasterService: EntityMasterService,
     private readonly filterService: FilterService,
+    private readonly layoutPreferenceRepo: LayoutPreferenceRepository,
   ) {
   }
 
@@ -54,11 +56,29 @@ export class ExportService {
       dto.loggedInUser,
     );
 
-    const attributes =
-      await this.attributeMasterService.findAttributesByMappedEntityType(
+    let labelValueJson = [] as any;
+
+    if ('current' === dto.view?.toLowerCase()) {
+
+      const layoutPreference = await this.layoutPreferenceRepo.findByEntityUserId(
+        dto.entity_type,
+        dto.loggedInUser.level_id,
+        dto.loggedInUser.level_type,
+        dto.loggedInUser.id,
+        'layout',
+      );
+
+      if (layoutPreference) {
+        const layoutJson = layoutPreference.mapped_json;
+        labelValueJson = layoutJson.column.show_list;
+      }
+    } else {
+      const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(
         dto.entity_type,
         dto.loggedInUser,
       );
+      attributes.map(attibute => labelValueJson.push({label: attibute.name , value: attibute.attribute_key}));
+    }
 
     let filterData = await this.filterService.applyFilterWrapper(dto);
     let entityList = filterData.data.entity_list;
@@ -69,10 +89,10 @@ export class ExportService {
       rowList: [],
     };
 
-    if (attributes) {
-      sheet.headers = attributes.map((col) => col.name);
-      const attributeList = attributes.map(
-        (col) => col.attribute_key,
+    if (labelValueJson) {
+      sheet.headers = labelValueJson.map((col) => col.label);
+      const attributeList = labelValueJson.map(
+        (col) => col.value,
       );
 
       sheet.rowList = entityList.map((item) =>

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

@@ -35,4 +35,5 @@ export interface FilterRequestDto {
   customLevelType?: string;
   customLevelId?: number;
   customAppCode?: string;
+  view?: string;
 }

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

@@ -17,6 +17,6 @@ import { AttributeMaster } from '../meta/entity/attribute-master.entity';
     { provide: 'LayoutPreferenceService', useClass: LayoutPreferenceService },
     LayoutPreferenceRepository,
   ],
-  exports: ['LayoutPreferenceService'],
+  exports: ['LayoutPreferenceService',LayoutPreferenceRepository],
 })
 export class LayoutPreferenceModule {}

package/src/module/meta/service/entity-attribute-update.service.ts

@@ -14,9 +14,7 @@ constructor(
   async execute(payload: any): Promise<any> {
 
     let { entity, user, config } = payload;
-    console.log(entity)
-
-
+    // console.log(entity)
     if (entity.entity_type !== 'LEAD') {
       entity = await this.getEntityData('LEAD', entity.parent_id,user );
     }

package/src/module/meta/service/media-data.service.ts

@@ -157,7 +157,6 @@ export class MediaDataService extends EntityServiceImpl {
         Bucket: this.bucketName,
         Key: mediaData.media_url,
         Expires: Number(expiresIn) || 60 * 5,
-        ResponseContentDisposition: 'inline',
       });
       return {
         signedUrl,
@@ -180,6 +179,16 @@ export class MediaDataService extends EntityServiceImpl {
         loggedInUser,
       );
       const mediaData = entityData as MediaData;
+      let fileSize: number | undefined;
+      if (this.bucketName) {
+        const head = await this.s3
+          .headObject({
+            Bucket: this.bucketName,
+            Key: mediaData.media_url,
+          })
+          .promise();
+        fileSize = head.ContentLength;
+      }
 
       if (!mediaData) {
         throw new Error('Media not found');
@@ -195,7 +204,13 @@ export class MediaDataService extends EntityServiceImpl {
         ),
       });
 
-      return signedUrl;
+      return {
+        signedUrl,
+        fileName: mediaData.file_name,
+        id: mediaData.id,
+        size: fileSize,
+        uploadedDate: mediaData.created_date,
+      };
     } catch (error) {
       console.error('Error generating inline URL:', error);
       throw new Error('Failed to generate inline URL');

package/src/module/meta/service/resolver.service.ts

@@ -38,8 +38,6 @@ export class ResolverService {
     entityData: any,
     entityType: string,
   ): Promise<any> {
-    console.log('entityData - ', entityData);
-    console.log('\nentityType - ', entityType);
     const attributeItems =
       await this.attributeMasterRepo.findAttributesByMappedEntityType(
         entityType,

package/src/resources/uat.properties.yaml

@@ -17,6 +17,9 @@ DEFAULT_OTP: '123456'
 PROFILE: 'UAT'
 DEFAULT_ADMIN: 'ADMIN'
 TOKEN_EXPIRY: 1
+REDIS_HOST: '43.205.35.45'
+REDIS_PORT: 6379
+REDIS_PASSWORD: 'Rezolut123'
 AWS:
   S3:
     AWS_ACCESS_KEY_ID: 'AKIAYYKIBDDSQF3KILGE'