@tomei/media 0.11.0-dev.3 → 0.11.0-dev.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/media",
-  "version": "0.11.0-dev.3",
+  "version": "0.11.0-dev.5",
   "description": "NestJS package for media module",
   "main": "dist/index.js",
   "scripts": {

package/src/base/base.medias.ts

@@ -47,14 +47,10 @@ export abstract class BaseMedias extends ObjectBase {
     this.IsEncryptedYN = media.IsEncryptedYN;
     this.FileName = media.FileName;
     this.FileExtension = media.FileExtension;
-    this.URL =
-      media.URL && media.URL.includes('media')
-        ? media.URL
-        : this.createSaveLocation();
-    this.FilePath =
-      media.FilePath && media.IsExternalYN === 'Y'
-        ? media.FilePath
-        : this.createFilePath();
+    // If URL/FilePath are provided (from DB or external), use them
+    // Only generate paths if they're empty (new media being created)
+    this.URL = media.URL || this.createSaveLocation();
+    this.FilePath = media.FilePath || this.createFilePath();
     this.CreatedById = media.CreatedById;
     this.CreatedAt = media.CreatedAt;
     this.UpdatedById = media.UpdatedById;
@@ -67,13 +63,17 @@ export abstract class BaseMedias extends ObjectBase {
       let basePath: string;
       if (mediaFileStorageType === 'local') {
         basePath = process.env.MEDIA_LOCAL_STORAGE_PATH;
+      } else if (mediaFileStorageType === 's3') {
+        // For S3, use container name (this is just a placeholder, actual upload will set correct path)
+        basePath = process.env.AWS_S3_CONTAINER_NAME || 'media';
       } else {
+        // Azure or default
         basePath = process.env.MEDIA_AZUREBLOB_CONTAINER_NAME;
       }
 
       if (!basePath) {
         throw new BadRequestException(
-          'MEDIA_LOCAL_STORAGE_PATH and or MEDIA_AZUREBLOB_CONTAINER_NAME not found.',
+          'Storage configuration not found. Set MEDIA_LOCAL_STORAGE_PATH, AWS_S3_CONTAINER_NAME, or MEDIA_AZUREBLOB_CONTAINER_NAME.',
         );
       }
       return basePath + `/${this.ObjectType}/${this.ObjectId}`;

package/src/config/media.config.ts

@@ -1,13 +1,5 @@
 import { ComponentConfig } from '@tomei/config';
 
-//Centralized configuration for media module
-//Uses @tomei/config (ComponentConfig) with process.env fallback
-//
-//Usage:
-//1. In your bootstrap/main.ts, call ComponentConfig.loadAllConfig()
-//2. Use MediaConfig static methods to retrieve configuration values
-//
-//ComponentConfig keys should be defined in component-config.json with '@tomei/media' as the component name
 export class MediaConfig {
   private static readonly COMPONENT_NAME = '@tomei/media';
 
@@ -25,10 +17,12 @@ export class MediaConfig {
         configKey,
       );
       if (value !== undefined && value !== null) {
+        console.log(`MediaConfig: Using ComponentConfig for ${configKey}:`, value);
         return String(value);
       }
     } catch (error) {
       //ComponentConfig might not be loaded or key doesn't exist, fall through to process.env
+      console.log(`MediaConfig: ComponentConfig not available for ${configKey}, using env ${envKey}:`, process.env[envKey]);
     }
 
     //Fallback to process.env

package/src/medias.ts

@@ -154,7 +154,10 @@ export class Medias extends BaseMedias {
       }
 
       // Upload new files
-      await this.uploadFile(file);
+      const paths = await this.uploadFile(file);
+      // Use the actual path returned from the storage provider
+      this.URL = paths.filePath;
+      this.FilePath = `${paths.filePath}/${this.FileName}.${this.FileExtension}`;
     } catch (error) {
       throw error;
     }
@@ -175,7 +178,10 @@ export class Medias extends BaseMedias {
           isEncrypted: false,
         };
       }
-      await this.uploadFile(file);
+      const paths = await this.uploadFile(file);
+      // Use the actual path returned from the storage provider
+      this.URL = paths.filePath;
+      this.FilePath = `${paths.filePath}/${this.FileName}.${this.FileExtension}`;
     } catch (error) {
       throw error;
     }