@flusys/nestjs-storage 1.0.0-beta → 1.1.0-beta

package/README.md

@@ -412,6 +412,12 @@ export class StorageConfig extends Identity {
   @Column({ type: 'json' })
   config: Record<string, any>; // Provider-specific config
 
+  @Column({ default: true })
+  isActive: boolean; // Whether config is active and usable
+
+  @Column({ default: false })
+  isDefault: boolean; // Set as default configuration
+
   @Column({ nullable: true })
   companyId: string; // Company scope (when enabled)
 }
@@ -438,6 +444,8 @@ export class SetupService {
           accessKeyId: process.env.AWS_ACCESS_KEY,
           secretAccessKey: process.env.AWS_SECRET_KEY,
         },
+        isActive: true,
+        isDefault: true,  // Set as default configuration
       },
       user,
     );
@@ -453,6 +461,8 @@ export class SetupService {
           privateKey: process.env.SFTP_PRIVATE_KEY,
           basePath: '/backups',
         },
+        isActive: true,
+        isDefault: false, // Not the default
       },
       user,
     );
@@ -462,25 +472,34 @@ export class SetupService {
 
 ### Default Configuration Resolution
 
+When `storageConfigId` is not provided for uploads, the system automatically resolves the default config:
+
+1. **Priority 1:** Find config with `isDefault: true` and `isActive: true`
+2. **Priority 2:** Fall back to oldest active config
+
 ```typescript
 // StorageProviderConfigService
 async getDefaultConfig(user?: ILoggedUserInfo): Promise<StorageConfigBase | null> {
+  await this.ensureRepositoryInitialized();
+
+  const baseWhere: any = { isActive: true };
+
   // Filter by company if enabled
-  const where: any = {};
-  if (this.isCompanyFeatureEnabled() && user?.companyId) {
-    where.companyId = user.companyId;
+  if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {
+    baseWhere.companyId = user.companyId;
   }
 
-  // First try 'default' named config
+  // First try to find config marked as default
   const defaultConfig = await this.repository.findOne({
-    where: { ...where, name: 'default' },
+    where: { ...baseWhere, isDefault: true },
+    order: { createdAt: 'ASC' },
   });
 
   if (defaultConfig) return defaultConfig;
 
-  // Fall back to any available config
+  // Fall back to oldest active config
   return await this.repository.findOne({
-    where,
+    where: baseWhere,
     order: { createdAt: 'ASC' },
   });
 }

package/cjs/dtos/storage-config.dto.js

@@ -50,6 +50,8 @@ let CreateStorageConfigDto = class CreateStorageConfigDto {
         _define_property(this, "name", void 0);
         _define_property(this, "storage", void 0);
         _define_property(this, "config", void 0);
+        _define_property(this, "isActive", void 0);
+        _define_property(this, "isDefault", void 0);
     }
 };
 _ts_decorate([
@@ -97,12 +99,32 @@ _ts_decorate([
     (0, _classvalidator.IsNotEmpty)(),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], CreateStorageConfigDto.prototype, "config", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        example: true,
+        description: 'Whether storage configuration is active'
+    }),
+    (0, _classvalidator.IsBoolean)(),
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Boolean)
+], CreateStorageConfigDto.prototype, "isActive", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        example: false,
+        description: 'Set as default storage configuration'
+    }),
+    (0, _classvalidator.IsBoolean)(),
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Boolean)
+], CreateStorageConfigDto.prototype, "isDefault", void 0);
 let UpdateStorageConfigDto = class UpdateStorageConfigDto {
     constructor(){
         _define_property(this, "id", void 0);
         _define_property(this, "name", void 0);
         _define_property(this, "storage", void 0);
         _define_property(this, "config", void 0);
+        _define_property(this, "isActive", void 0);
+        _define_property(this, "isDefault", void 0);
     }
 };
 _ts_decorate([
@@ -157,8 +179,26 @@ _ts_decorate([
     (0, _classvalidator.IsOptional)(),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], UpdateStorageConfigDto.prototype, "config", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        example: true,
+        description: 'Whether storage configuration is active'
+    }),
+    (0, _classvalidator.IsBoolean)(),
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Boolean)
+], UpdateStorageConfigDto.prototype, "isActive", void 0);
+_ts_decorate([
+    (0, _swagger.ApiPropertyOptional)({
+        example: false,
+        description: 'Set as default storage configuration'
+    }),
+    (0, _classvalidator.IsBoolean)(),
+    (0, _classvalidator.IsOptional)(),
+    _ts_metadata("design:type", Boolean)
+], UpdateStorageConfigDto.prototype, "isDefault", void 0);
 let StorageConfigResponseDto = class StorageConfigResponseDto extends _dtos.IdentityResponseDto {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0), _define_property(this, "isActive", void 0), _define_property(this, "isDefault", void 0);
     }
 };

package/cjs/entities/storage-config-base.entity.js

@@ -35,8 +35,7 @@ function _ts_metadata(k, v) {
 }
 let StorageConfigBase = class StorageConfigBase extends _entities.Identity {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), // add config for storage
-        _define_property(this, "config", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0), _define_property(this, "isActive", void 0), _define_property(this, "isDefault", void 0);
     }
 };
 _ts_decorate([
@@ -62,3 +61,33 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], StorageConfigBase.prototype, "config", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'boolean',
+        default: true,
+        name: 'is_active'
+    }),
+    _ts_metadata("design:type", Boolean)
+], StorageConfigBase.prototype, "isActive", void 0);
+_ts_decorate([
+    (0, _typeorm.Column)({
+        type: 'boolean',
+        default: false,
+        name: 'is_default'
+    }),
+    _ts_metadata("design:type", Boolean)
+], StorageConfigBase.prototype, "isDefault", void 0);
+StorageConfigBase = _ts_decorate([
+    (0, _typeorm.Index)([
+        'name'
+    ]),
+    (0, _typeorm.Index)([
+        'storage'
+    ]),
+    (0, _typeorm.Index)([
+        'isActive'
+    ]),
+    (0, _typeorm.Index)([
+        'isDefault'
+    ])
+], StorageConfigBase);

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

@@ -65,6 +65,8 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
                 'name',
                 'storage',
                 'config',
+                'isActive',
+                'isDefault',
                 'createdAt',
                 'updatedAt'
             ];
@@ -102,19 +104,21 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
     }
     /**
    * Get default storage configuration (scoped to user's company if enabled)
-   * Falls back to any available config if 'default' not found
+   * Priority: isDefault=true > any active config (oldest first)
    */ async getDefaultConfig(user) {
         await this.ensureRepositoryInitialized();
-        const baseWhere = {};
+        const baseWhere = {
+            isActive: true
+        };
         // 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'
+        // First try to find config marked as default
         const defaultConfig = await this.repository.findOne({
             where: {
                 ...baseWhere,
-                name: 'default'
+                isDefault: true
             },
             order: {
                 createdAt: 'ASC'
@@ -123,7 +127,7 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
         if (defaultConfig) {
             return defaultConfig;
         }
-        // Fall back to any available config for this company/user
+        // Fall back to any available active config (oldest first for consistency)
         return await this.repository.findOne({
             where: baseWhere,
             order: {
@@ -136,7 +140,8 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
    */ async getConfigByType(storage, user) {
         await this.ensureRepositoryInitialized();
         const where = {
-            storage
+            storage,
+            isActive: true
         };
         // Filter by company only if company feature is enabled and user is provided
         if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {

package/dtos/storage-config.dto.d.ts

@@ -5,6 +5,8 @@ export declare class CreateStorageConfigDto implements Record<string, unknown> {
     name: string;
     storage: FileLocationEnum;
     config: Record<string, any>;
+    isActive?: boolean;
+    isDefault?: boolean;
 }
 export declare class UpdateStorageConfigDto implements Record<string, unknown> {
     [key: string]: unknown;
@@ -12,10 +14,14 @@ export declare class UpdateStorageConfigDto implements Record<string, unknown> {
     name?: string;
     storage?: FileLocationEnum;
     config?: Record<string, any>;
+    isActive?: boolean;
+    isDefault?: boolean;
 }
 export declare class StorageConfigResponseDto extends IdentityResponseDto implements Record<string, unknown> {
     [key: string]: unknown;
     name: string;
     storage: FileLocationEnum;
     config: Record<string, any>;
+    isActive: boolean;
+    isDefault: boolean;
 }

package/entities/storage-config-base.entity.d.ts

@@ -4,4 +4,6 @@ export declare abstract class StorageConfigBase extends Identity {
     name: string;
     storage: FileLocationEnum;
     config: Record<string, any>;
+    isActive: boolean;
+    isDefault: boolean;
 }

package/fesm/dtos/storage-config.dto.js

@@ -23,7 +23,7 @@ function _ts_metadata(k, v) {
 import { IdentityResponseDto } from '@flusys/nestjs-shared/dtos';
 import { FileLocationEnum } from '../enums';
 import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
-import { IsEnum, IsNotEmpty, IsObject, IsOptional, IsString, MaxLength } from 'class-validator';
+import { IsBoolean, IsEnum, IsNotEmpty, IsObject, IsOptional, IsString, MaxLength } from 'class-validator';
 /**
  * DTO for creating storage configuration
  */ export class CreateStorageConfigDto {
@@ -31,6 +31,8 @@ import { IsEnum, IsNotEmpty, IsObject, IsOptional, IsString, MaxLength } from 'c
         _define_property(this, "name", void 0);
         _define_property(this, "storage", void 0);
         _define_property(this, "config", void 0);
+        _define_property(this, "isActive", void 0);
+        _define_property(this, "isDefault", void 0);
     }
 }
 _ts_decorate([
@@ -78,6 +80,24 @@ _ts_decorate([
     IsNotEmpty(),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], CreateStorageConfigDto.prototype, "config", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        example: true,
+        description: 'Whether storage configuration is active'
+    }),
+    IsBoolean(),
+    IsOptional(),
+    _ts_metadata("design:type", Boolean)
+], CreateStorageConfigDto.prototype, "isActive", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        example: false,
+        description: 'Set as default storage configuration'
+    }),
+    IsBoolean(),
+    IsOptional(),
+    _ts_metadata("design:type", Boolean)
+], CreateStorageConfigDto.prototype, "isDefault", void 0);
 /**
  * DTO for updating storage configuration
  */ export class UpdateStorageConfigDto {
@@ -86,6 +106,8 @@ _ts_decorate([
         _define_property(this, "name", void 0);
         _define_property(this, "storage", void 0);
         _define_property(this, "config", void 0);
+        _define_property(this, "isActive", void 0);
+        _define_property(this, "isDefault", void 0);
     }
 }
 _ts_decorate([
@@ -140,10 +162,28 @@ _ts_decorate([
     IsOptional(),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], UpdateStorageConfigDto.prototype, "config", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        example: true,
+        description: 'Whether storage configuration is active'
+    }),
+    IsBoolean(),
+    IsOptional(),
+    _ts_metadata("design:type", Boolean)
+], UpdateStorageConfigDto.prototype, "isActive", void 0);
+_ts_decorate([
+    ApiPropertyOptional({
+        example: false,
+        description: 'Set as default storage configuration'
+    }),
+    IsBoolean(),
+    IsOptional(),
+    _ts_metadata("design:type", Boolean)
+], UpdateStorageConfigDto.prototype, "isDefault", void 0);
 /**
  * Response DTO for storage configuration
  */ export class StorageConfigResponseDto extends IdentityResponseDto {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0), _define_property(this, "isActive", void 0), _define_property(this, "isDefault", void 0);
     }
 }

package/fesm/entities/storage-config-base.entity.js

@@ -22,14 +22,10 @@ function _ts_metadata(k, v) {
 }
 import { Identity } from '@flusys/nestjs-shared/entities';
 import { FileLocationEnum } from '../enums';
-import { Column } from 'typeorm';
-/**
- * Base StorageConfig Entity
- * Contains common fields shared by both StorageConfig and StorageConfigWithCompany
- */ export class StorageConfigBase extends Identity {
+import { Column, Index } from 'typeorm';
+export class StorageConfigBase extends Identity {
     constructor(...args){
-        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), // add config for storage
-        _define_property(this, "config", void 0);
+        super(...args), _define_property(this, "name", void 0), _define_property(this, "storage", void 0), _define_property(this, "config", void 0), _define_property(this, "isActive", void 0), _define_property(this, "isDefault", void 0);
     }
 }
 _ts_decorate([
@@ -55,3 +51,33 @@ _ts_decorate([
     }),
     _ts_metadata("design:type", typeof Record === "undefined" ? Object : Record)
 ], StorageConfigBase.prototype, "config", void 0);
+_ts_decorate([
+    Column({
+        type: 'boolean',
+        default: true,
+        name: 'is_active'
+    }),
+    _ts_metadata("design:type", Boolean)
+], StorageConfigBase.prototype, "isActive", void 0);
+_ts_decorate([
+    Column({
+        type: 'boolean',
+        default: false,
+        name: 'is_default'
+    }),
+    _ts_metadata("design:type", Boolean)
+], StorageConfigBase.prototype, "isDefault", void 0);
+StorageConfigBase = _ts_decorate([
+    Index([
+        'name'
+    ]),
+    Index([
+        'storage'
+    ]),
+    Index([
+        'isActive'
+    ]),
+    Index([
+        'isDefault'
+    ])
+], StorageConfigBase);

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

@@ -55,6 +55,8 @@ export class StorageProviderConfigService extends RequestScopedApiService {
                 'name',
                 'storage',
                 'config',
+                'isActive',
+                'isDefault',
                 'createdAt',
                 'updatedAt'
             ];
@@ -92,19 +94,21 @@ 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
+   * Priority: isDefault=true > any active config (oldest first)
    */ async getDefaultConfig(user) {
         await this.ensureRepositoryInitialized();
-        const baseWhere = {};
+        const baseWhere = {
+            isActive: true
+        };
         // 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'
+        // First try to find config marked as default
         const defaultConfig = await this.repository.findOne({
             where: {
                 ...baseWhere,
-                name: 'default'
+                isDefault: true
             },
             order: {
                 createdAt: 'ASC'
@@ -113,7 +117,7 @@ export class StorageProviderConfigService extends RequestScopedApiService {
         if (defaultConfig) {
             return defaultConfig;
         }
-        // Fall back to any available config for this company/user
+        // Fall back to any available active config (oldest first for consistency)
         return await this.repository.findOne({
             where: baseWhere,
             order: {
@@ -126,7 +130,8 @@ export class StorageProviderConfigService extends RequestScopedApiService {
    */ async getConfigByType(storage, user) {
         await this.ensureRepositoryInitialized();
         const where = {
-            storage
+            storage,
+            isActive: true
         };
         // Filter by company only if company feature is enabled and user is provided
         if (this.storageConfig.isCompanyFeatureEnabled() && user?.companyId) {

package/interfaces/storage-config.interface.d.ts

@@ -4,6 +4,8 @@ export interface IStorageConfig extends IIdentity {
     name: string;
     storage: FileLocationEnum;
     config: Record<string, any>;
+    isActive: boolean;
+    isDefault: boolean;
     companyId?: string | null;
 }
 export interface IAwsS3Config {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-storage",
-  "version": "1.0.0-beta",
+  "version": "1.1.0-beta",
   "description": "Modular storage package with optional AWS S3, Azure Blob, and SFTP providers",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -128,7 +128,7 @@
     }
   },
   "dependencies": {
-    "@flusys/nestjs-core": "1.0.0-beta",
-    "@flusys/nestjs-shared": "1.0.0-beta"
+    "@flusys/nestjs-core": "1.1.0-beta",
+    "@flusys/nestjs-shared": "1.1.0-beta"
   }
 }