rez_core 5.0.138 → 5.0.140

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "5.0.138",
+  "version": "5.0.140",
   "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'),
-        port: this.configService.get<number>('REDIS_PORT'),
-        password: this.configService.get<string>('REDIS_PASSWORD'),
+        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'),
         db: this.configService.get<number>('REDIS_DB', 0),
         // Enable offline queue to handle Redis disconnections
         enableOfflineQueue: true,

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

@@ -157,6 +157,7 @@ export class MediaDataService extends EntityServiceImpl {
         Bucket: this.bucketName,
         Key: mediaData.media_url,
         Expires: Number(expiresIn) || 60 * 5,
+        ResponseContentDisposition: 'inline',
       });
       return {
         signedUrl,
@@ -171,6 +172,52 @@ export class MediaDataService extends EntityServiceImpl {
   }
 
   // media-data.service.ts
+  // async getMediaInlineUrl(id: number, loggedInUser, expiresIn?: number) {
+  //   try {
+  //     const entityData = await this.getEntityData(
+  //       ENTITYTYPE_MEDIA,
+  //       id,
+  //       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');
+  //     }
+
+  //     const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
+  //       Bucket: this.bucketName,
+  //       Key: mediaData.media_url,
+  //       Expires: Number(expiresIn) || 60 * 5,
+  //       ResponseContentDisposition: 'inline',
+  //       ResponseContentType: this.getContentType(
+  //         mediaData.file_name.split('.').pop() || '',
+  //       ),
+  //     });
+
+  //     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');
+  //   }
+  // }
+
   async getMediaInlineUrl(id: number, loggedInUser, expiresIn?: number) {
     try {
       const entityData = await this.getEntityData(
@@ -180,6 +227,13 @@ export class MediaDataService extends EntityServiceImpl {
       );
       const mediaData = entityData as MediaData;
       let fileSize: number | undefined;
+
+      if (!mediaData) {
+        throw new Error('Media not found');
+      }
+
+      const ext = mediaData.file_name.split('.').pop()?.toLowerCase() || '';
+
       if (this.bucketName) {
         const head = await this.s3
           .headObject({
@@ -190,22 +244,23 @@ export class MediaDataService extends EntityServiceImpl {
         fileSize = head.ContentLength;
       }
 
-      if (!mediaData) {
-        throw new Error('Media not found');
-      }
-
       const signedUrl = await this.s3.getSignedUrlPromise('getObject', {
         Bucket: this.bucketName,
         Key: mediaData.media_url,
         Expires: Number(expiresIn) || 60 * 5,
         ResponseContentDisposition: 'inline',
-        ResponseContentType: this.getContentType(
-          mediaData.file_name.split('.').pop() || '',
-        ),
+        ResponseContentType: this.getContentType(ext),
       });
 
+      let previewUrl = signedUrl;
+      if (ext === 'doc' || ext === 'docx') {
+        previewUrl =
+          `https://view.officeapps.live.com/op/embed.aspx?src=` +
+          encodeURIComponent(signedUrl);
+      }
+
       return {
-        signedUrl,
+        signedUrl: previewUrl,
         fileName: mediaData.file_name,
         id: mediaData.id,
         size: fileSize,

package/src/resources/uat.properties.yaml

@@ -17,9 +17,6 @@ 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'