@flusys/nestjs-storage 1.0.0-beta → 1.0.0

package/fesm/services/folder.service.js

@@ -27,8 +27,9 @@ function _ts_param(paramIndex, decorator) {
 }
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, Scope } from '@nestjs/common';
-import { StorageConfigService } from '../config';
+import { StorageConfigService } from './storage-config.service';
 import { Folder, FolderWithCompany } from '../entities';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
 export class FolderService extends RequestScopedApiService {
@@ -38,16 +39,13 @@ export class FolderService extends RequestScopedApiService {
     getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
-        // Set companyId from user context if company feature enabled
         if (this.storageConfig.isCompanyFeatureEnabled()) {
             entity.companyId = user?.companyId ?? null;
         }
         return entity;
     }
-    // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
             select = [
@@ -69,11 +67,10 @@ export class FolderService extends RequestScopedApiService {
     }
     async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
-        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            query.andWhere('folder.companyId = :companyId', {
-                companyId: user.companyId
-            });
-        }
+        applyCompanyFilter(query, {
+            isCompanyFeatureEnabled: this.storageConfig.isCompanyFeatureEnabled(),
+            entityAlias: 'folder'
+        }, user);
         return result;
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){

package/fesm/services/index.js

@@ -1,5 +1,6 @@
 export * from './file-manager.service';
 export * from './folder.service';
+export * from './storage-config.service';
 export * from './storage-provider-config.service';
 export * from './storage-datasource.provider';
 export * from './upload.service';

package/fesm/{config → services}/storage-config.service.js

@@ -27,115 +27,71 @@ function _ts_param(paramIndex, decorator) {
 }
 import { Inject, Injectable } from '@nestjs/common';
 import { StorageModuleOptions } from '../interfaces';
-import { STORAGE_MODULE_OPTIONS, DEFAULT_MAX_FILE_SIZE, DEFAULT_ALLOWED_FILE_TYPES } from './storage.constants';
+import { STORAGE_MODULE_OPTIONS, DEFAULT_MAX_FILE_SIZE, DEFAULT_ALLOWED_FILE_TYPES } from '../config/storage.constants';
+const BYTES_PER_MB = 1024 * 1024;
+const DEFAULT_LOCAL_PATH = './uploads';
+const DEFAULT_PORT = '3000';
 export class StorageConfigService {
-    /**
-   * Check if company feature is enabled
-   */ isCompanyFeatureEnabled() {
+    // ─── IModuleConfigService Implementation ────────────────────────────────────
+    isCompanyFeatureEnabled() {
         return this.options.bootstrapAppConfig?.enableCompanyFeature ?? false;
     }
-    /**
-   * Get database mode
-   */ getDatabaseMode() {
+    getDatabaseMode() {
         return this.options.bootstrapAppConfig?.databaseMode ?? 'single';
     }
-    /**
-   * Get maximum file size in bytes
-   */ getMaxFileSize() {
+    isMultiTenant() {
+        return this.getDatabaseMode() === 'multi-tenant';
+    }
+    // ─── Config Getters ─────────────────────────────────────────────────────────
+    getMaxFileSize() {
         return this.options.config?.maxFileSize ?? DEFAULT_MAX_FILE_SIZE;
     }
-    /**
-   * Get allowed file types (MIME types or patterns)
-   */ getAllowedFileTypes() {
+    getAllowedFileTypes() {
         return this.options.config?.allowedFileTypes ?? DEFAULT_ALLOWED_FILE_TYPES;
     }
-    /**
-   * Check if file type is allowed
-   */ isFileTypeAllowed(mimeType) {
+    getOptions() {
+        return this.options;
+    }
+    getDefaultLocalStoragePath() {
+        return this.options.config?.localStoragePath ?? DEFAULT_LOCAL_PATH;
+    }
+    getAppUrl() {
+        return this.options.config?.appUrl ?? process.env.APP_URL ?? `http://localhost:${process.env.PORT ?? DEFAULT_PORT}`;
+    }
+    // ─── Validation Methods ─────────────────────────────────────────────────────
+    isFileTypeAllowed(mimeType) {
         const allowedTypes = this.getAllowedFileTypes();
-        // If wildcard, allow all
         if (allowedTypes.includes('*/*')) {
             return true;
         }
-        // Check exact match or wildcard pattern
-        return allowedTypes.some((allowedType)=>{
-            if (allowedType.endsWith('/*')) {
-                const prefix = allowedType.slice(0, -2);
-                return mimeType.startsWith(prefix);
-            }
-            return allowedType === mimeType;
-        });
+        return allowedTypes.some((type)=>type.endsWith('/*') ? mimeType.startsWith(type.slice(0, -2)) : type === mimeType);
     }
-    /**
-   * Validate file size
-   */ validateFileSize(fileSize) {
+    validateFileSize(fileSize) {
         const maxSize = this.getMaxFileSize();
         if (fileSize > maxSize) {
-            const maxSizeMB = (maxSize / (1024 * 1024)).toFixed(2);
-            const fileSizeMB = (fileSize / (1024 * 1024)).toFixed(2);
             return {
                 valid: false,
-                message: `File size (${fileSizeMB}MB) exceeds the maximum allowed size of ${maxSizeMB}MB`
+                message: `File size (${this.toMB(fileSize)}MB) exceeds maximum ${this.toMB(maxSize)}MB`
             };
         }
         return {
             valid: true
         };
     }
-    /**
-   * Validate file type
-   */ validateFileType(mimeType) {
+    validateFileType(mimeType) {
         if (!this.isFileTypeAllowed(mimeType)) {
-            const allowedTypes = this.getAllowedFileTypes();
             return {
                 valid: false,
-                message: `File type "${mimeType}" is not allowed. Allowed types: ${allowedTypes.join(', ')}`
+                message: `File type "${mimeType}" not allowed. Allowed: ${this.getAllowedFileTypes().join(', ')}`
             };
         }
         return {
             valid: true
         };
     }
-    /**
-   * Get default database config
-   */ getDefaultDatabaseConfig() {
-        return this.options.config?.defaultDatabaseConfig;
-    }
-    /**
-   * Get all options
-   */ getOptions() {
-        return this.options;
-    }
-    /**
-   * Get default local storage base path
-   * Used for serving local files without database lookup
-   * Falls back to './uploads' if not configured
-   */ getDefaultLocalStoragePath() {
-        // Check if localStoragePath is configured in module options
-        const configuredPath = this.options.config?.localStoragePath;
-        if (configuredPath) {
-            return configuredPath;
-        }
-        // Default to ./uploads in the project root
-        return './uploads';
-    }
-    /**
-   * Get application base URL for generating file URLs
-   * - First tries module config
-   * - Falls back to APP_URL env var
-   * - Finally constructs from PORT env var
-   */ getAppUrl() {
-        // Try from module config first
-        if (this.options.config?.appUrl) {
-            return this.options.config.appUrl;
-        }
-        // Fallback: read directly from environment
-        if (process.env.APP_URL) {
-            return process.env.APP_URL;
-        }
-        // Last resort: construct from PORT
-        const port = process.env.PORT || '3000';
-        return `http://localhost:${port}`;
+    // ─── Private Helpers ────────────────────────────────────────────────────────
+    toMB(bytes) {
+        return (bytes / BYTES_PER_MB).toFixed(2);
     }
     constructor(options){
         _define_property(this, "options", void 0);

package/fesm/services/storage-datasource.provider.js

@@ -29,8 +29,7 @@ import { MultiTenantDataSourceService } from '@flusys/nestjs-shared/modules';
 import { Inject, Injectable, Logger, Optional, Scope } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { Request } from 'express';
-import { StorageModuleOptions } from '../interfaces';
-import { STORAGE_MODULE_OPTIONS } from '../config/storage.constants';
+import { StorageConfigService } from './storage-config.service';
 export class StorageDataSourceProvider extends MultiTenantDataSourceService {
     // Factory Methods
     /** Build parent options from StorageModuleOptions */ static buildParentOptions(options) {
@@ -42,14 +41,11 @@ export class StorageDataSourceProvider extends MultiTenantDataSourceService {
         };
     }
     // Feature Flags
-    /** Get global enable company feature flag */ getEnableCompanyFeature() {
-        return this.storageOptions.bootstrapAppConfig?.enableCompanyFeature ?? false;
-    }
     /**
    * Get enable company feature for specific tenant
    * Falls back to global setting if not specified per-tenant
    */ getEnableCompanyFeatureForTenant(tenant) {
-        return tenant?.enableCompanyFeature ?? this.getEnableCompanyFeature();
+        return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
     /**
    * Get enable company feature for current request context
@@ -62,22 +58,16 @@ export class StorageDataSourceProvider extends MultiTenantDataSourceService {
    * For TypeORM repositories, we always use the base entities (FileManager, etc.)
    * but for migrations, we need the correct entity based on the feature flag.
    */ async getStorageEntities(enableCompanyFeature) {
-        const enable = enableCompanyFeature ?? this.getEnableCompanyFeature();
-        const { FileManager, Folder, StorageConfig } = await import('../entities');
-        // For migrations and schema sync, return the appropriate entity
-        // Both versions map to the same table, but with different columns
-        if (enable) {
-            const { FileManagerWithCompany, FolderWithCompany, StorageConfigWithCompany } = await import('../entities');
-            return [
-                FileManagerWithCompany,
-                FolderWithCompany,
-                StorageConfigWithCompany
-            ];
-        }
-        return [
-            FileManager,
-            Folder,
-            StorageConfig
+        const enable = enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
+        const entities = await import('../entities');
+        return enable ? [
+            entities.FileManagerWithCompany,
+            entities.FolderWithCompany,
+            entities.StorageConfigWithCompany
+        ] : [
+            entities.FileManager,
+            entities.Folder,
+            entities.StorageConfig
         ];
     }
     // Overrides
@@ -138,8 +128,8 @@ export class StorageDataSourceProvider extends MultiTenantDataSourceService {
             StorageDataSourceProvider.connectionLocks.delete(tenant.id);
         }
     }
-    constructor(storageOptions, request){
-        super(StorageDataSourceProvider.buildParentOptions(storageOptions), request), _define_property(this, "storageOptions", void 0), _define_property(this, "logger", void 0), this.storageOptions = storageOptions, this.logger = new Logger(StorageDataSourceProvider.name);
+    constructor(configService, request){
+        super(StorageDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), _define_property(this, "logger", void 0), this.configService = configService, this.logger = new Logger(StorageDataSourceProvider.name);
     }
 }
 // Override parent's static properties to have Storage-specific cache
@@ -153,12 +143,12 @@ StorageDataSourceProvider = _ts_decorate([
     Injectable({
         scope: Scope.REQUEST
     }),
-    _ts_param(0, Inject(STORAGE_MODULE_OPTIONS)),
+    _ts_param(0, Inject(StorageConfigService)),
     _ts_param(1, Optional()),
     _ts_param(1, Inject(REQUEST)),
     _ts_metadata("design:type", Function),
     _ts_metadata("design:paramtypes", [
-        typeof StorageModuleOptions === "undefined" ? Object : StorageModuleOptions,
+        typeof StorageConfigService === "undefined" ? Object : StorageConfigService,
         typeof Request === "undefined" ? Object : Request
     ])
 ], StorageDataSourceProvider);

package/fesm/services/storage-provider-config.service.js

@@ -27,8 +27,9 @@ function _ts_param(paramIndex, decorator) {
 }
 import { RequestScopedApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
+import { applyCompanyFilter, buildCompanyWhereCondition } from '@flusys/nestjs-shared/utils';
 import { Inject, Injectable, Scope } from '@nestjs/common';
-import { StorageConfigService } from '../config';
+import { StorageConfigService } from './storage-config.service';
 import { StorageConfig, StorageConfigWithCompany } from '../entities';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
 export class StorageProviderConfigService extends RequestScopedApiService {
@@ -38,16 +39,13 @@ export class StorageProviderConfigService extends RequestScopedApiService {
     getDataSourceProvider() {
         return this.dataSourceProvider;
     }
-    // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
-        // Set companyId from user context if company feature enabled
         if (this.storageConfig.isCompanyFeatureEnabled()) {
             entity.companyId = user?.companyId ?? null;
         }
         return entity;
     }
-    // Query Customization
     async getSelectQuery(query, _user, select) {
         if (!select?.length) {
             select = [
@@ -55,6 +53,8 @@ export class StorageProviderConfigService extends RequestScopedApiService {
                 'name',
                 'storage',
                 'config',
+                'isActive',
+                'isDefault',
                 'createdAt',
                 'updatedAt'
             ];
@@ -70,19 +70,14 @@ export class StorageProviderConfigService extends RequestScopedApiService {
     }
     async getExtraManipulateQuery(query, filterDto, user) {
         const result = await super.getExtraManipulateQuery(query, filterDto, user);
-        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            query.andWhere('storageConfig.companyId = :companyId', {
-                companyId: user.companyId
-            });
-        }
+        applyCompanyFilter(query, {
+            isCompanyFeatureEnabled: this.storageConfig.isCompanyFeatureEnabled(),
+            entityAlias: 'storageConfig'
+        }, user);
         query.orderBy(`${this.entityName}.createdAt`, 'DESC');
         return result;
     }
-    /**
-   * Find storage config by ID without throwing (returns null if not found)
-   * Uses direct repository query - bypasses company filtering
-   * Use for internal operations like file deletion where config ID is already known
-   */ async findByIdDirect(id) {
+    async findByIdDirect(id) {
         await this.ensureRepositoryInitialized();
         return await this.repository.findOne({
             where: {
@@ -90,21 +85,15 @@ export class StorageProviderConfigService extends RequestScopedApiService {
             }
         });
     }
-    /**
-   * Get default storage configuration (scoped to user's company if enabled)
-   * Falls back to any available config if 'default' not found
-   */ async getDefaultConfig(user) {
+    async getDefaultConfig(user) {
         await this.ensureRepositoryInitialized();
-        const baseWhere = {};
-        // Filter by company only if company feature is enabled and user is provided
-        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            baseWhere.companyId = user.companyId;
-        }
-        // First try to find config named 'default'
+        const baseWhere = buildCompanyWhereCondition({
+            isActive: true
+        }, this.storageConfig.isCompanyFeatureEnabled(), user);
         const defaultConfig = await this.repository.findOne({
             where: {
                 ...baseWhere,
-                name: 'default'
+                isDefault: true
             },
             order: {
                 createdAt: 'ASC'
@@ -113,7 +102,6 @@ export class StorageProviderConfigService extends RequestScopedApiService {
         if (defaultConfig) {
             return defaultConfig;
         }
-        // Fall back to any available config for this company/user
         return await this.repository.findOne({
             where: baseWhere,
             order: {
@@ -121,17 +109,12 @@ export class StorageProviderConfigService extends RequestScopedApiService {
             }
         });
     }
-    /**
-   * Get storage configuration by type (scoped to user's company if enabled)
-   */ async getConfigByType(storage, user) {
+    async getConfigByType(storage, user) {
         await this.ensureRepositoryInitialized();
-        const where = {
-            storage
-        };
-        // Filter by company only if company feature is enabled and user is provided
-        if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
-            where.companyId = user.companyId;
-        }
+        const where = buildCompanyWhereCondition({
+            storage,
+            isActive: true
+        }, this.storageConfig.isCompanyFeatureEnabled(), user);
         return await this.repository.find({
             where
         });