@flusys/nestjs-storage 7.0.0 → 7.0.2

package/cjs/services/file-manager.service.js

@@ -102,9 +102,6 @@ const DEFAULT_SELECT_FIELDS = [
     'deletedAt'
 ];
 let FileManagerService = class FileManagerService extends _classes.ApiService {
-    resolveEntity() {
-        return this.storageConfig.isCompanyFeatureEnabled() ? _entities.FileManagerWithCompany : _entities.FileManager;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
@@ -365,7 +362,7 @@ let FileManagerService = class FileManagerService extends _classes.ApiService {
         };
     }
     constructor(cacheManager, utilsService, uploadService, storageConfig, dataSourceProvider, permissionCacheService){
-        super('file_manager', cacheManager, utilsService, FileManagerService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider, this.permissionCacheService = permissionCacheService;
+        super(_config.STORAGE_EVENT_ENTITIES.FILE, cacheManager, utilsService, FileManagerService.name, true, _config.STORAGE_EVENT_MODULE, dataSourceProvider, storageConfig.isCompanyFeatureEnabled() ? _entities.FileManagerWithCompany : _entities.FileManager), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider, this.permissionCacheService = permissionCacheService;
     }
 };
 FileManagerService = _ts_decorate([

package/cjs/services/file-manager.service.spec.js

@@ -36,6 +36,7 @@ function buildFile(overrides = {}) {
 }
 describe('FileManagerService', ()=>{
     let service;
+    let module;
     let mockFileRepo;
     let mockFolderRepo;
     let mockStorageConfigRepo;
@@ -84,7 +85,7 @@ describe('FileManagerService', ()=>{
         mockSharedPermissionCacheService = {
             hasPermission: jest.fn().mockResolvedValue(false)
         };
-        const module = await _testing.Test.createTestingModule({
+        module = await _testing.Test.createTestingModule({
             providers: [
                 _filemanagerservice.FileManagerService,
                 {
@@ -116,13 +117,16 @@ describe('FileManagerService', ()=>{
         service = await module.resolve(_filemanagerservice.FileManagerService);
         await service.ensureDataSourceRepository();
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to the core FileManager entity when company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(_entities.FileManager);
+    describe('entity selection', ()=>{
+        it('uses FileManager when the company feature is disabled', async ()=>{
+            mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(_filemanagerservice.FileManagerService);
+            expect(built['_entity']).toBe(_entities.FileManager);
         });
-        it('resolves to FileManagerWithCompany when company feature is enabled', ()=>{
+        it('uses FileManagerWithCompany when the company feature is enabled', async ()=>{
             mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(_entities.FileManagerWithCompany);
+            const built = await module.resolve(_filemanagerservice.FileManagerService);
+            expect(built['_entity']).toBe(_entities.FileManagerWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/cjs/services/folder.service.js

@@ -12,6 +12,7 @@ const _classes = require("@flusys/nestjs-shared/classes");
 const _modules = require("@flusys/nestjs-shared/modules");
 const _utils = require("@flusys/nestjs-shared/utils");
 const _common = require("@nestjs/common");
+const _config = require("../config");
 const _entities = require("../entities");
 const _storageconfigservice = require("./storage-config.service");
 const _storagedatasourceprovider = require("./storage-datasource.provider");
@@ -43,9 +44,6 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let FolderService = class FolderService extends _classes.ApiService {
-    resolveEntity() {
-        return this.storageConfig.isCompanyFeatureEnabled() ? _entities.FolderWithCompany : _entities.Folder;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -82,7 +80,7 @@ let FolderService = class FolderService extends _classes.ApiService {
         return result;
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        super('folder', cacheManager, utilsService, FolderService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
+        super(_config.STORAGE_EVENT_ENTITIES.FOLDER, cacheManager, utilsService, FolderService.name, true, _config.STORAGE_EVENT_MODULE, dataSourceProvider, storageConfig.isCompanyFeatureEnabled() ? _entities.FolderWithCompany : _entities.Folder), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
     }
 };
 FolderService = _ts_decorate([

package/cjs/services/folder.service.spec.js

@@ -12,6 +12,7 @@ const _storagedatasourceprovider = require("./storage-datasource.provider");
 const _entities = require("../entities");
 describe('FolderService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockStorageConfig;
     beforeEach(async ()=>{
@@ -20,7 +21,7 @@ describe('FolderService', ()=>{
         mockStorageConfig = {
             isCompanyFeatureEnabled: jest.fn().mockReturnValue(false)
         };
-        const module = await _testing.Test.createTestingModule({
+        module = await _testing.Test.createTestingModule({
             providers: [
                 _folderservice.FolderService,
                 {
@@ -43,13 +44,16 @@ describe('FolderService', ()=>{
         }).compile();
         service = await module.resolve(_folderservice.FolderService);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to the core Folder entity when company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(_entities.Folder);
+    describe('entity selection', ()=>{
+        it('uses Folder when the company feature is disabled', async ()=>{
+            mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(_folderservice.FolderService);
+            expect(built['_entity']).toBe(_entities.Folder);
         });
-        it('resolves to FolderWithCompany when company feature is enabled', ()=>{
+        it('uses FolderWithCompany when the company feature is enabled', async ()=>{
             mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(_entities.FolderWithCompany);
+            const built = await module.resolve(_folderservice.FolderService);
+            expect(built['_entity']).toBe(_entities.FolderWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

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

@@ -45,9 +45,6 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let StorageProviderConfigService = class StorageProviderConfigService extends _classes.ApiService {
-    resolveEntity() {
-        return this.storageConfig.isCompanyFeatureEnabled() ? _entities.StorageConfigWithCompany : _entities.StorageConfig;
-    }
     async beforeDeleteOperation(dto, _user, _queryRunner) {
         const ids = Array.isArray(dto.id) ? dto.id : [
             dto.id
@@ -153,7 +150,7 @@ let StorageProviderConfigService = class StorageProviderConfigService extends _c
         });
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        super('storageConfig', cacheManager, utilsService, StorageProviderConfigService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
+        super(_config.STORAGE_EVENT_ENTITIES.STORAGE_CONFIG, cacheManager, utilsService, StorageProviderConfigService.name, true, _config.STORAGE_EVENT_MODULE, dataSourceProvider, storageConfig.isCompanyFeatureEnabled() ? _entities.StorageConfigWithCompany : _entities.StorageConfig), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
     }
 };
 StorageProviderConfigService = _ts_decorate([

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

@@ -31,6 +31,7 @@ function buildStorageConfig(overrides = {}) {
 }
 describe('StorageProviderConfigService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockStorageConfig;
     beforeEach(async ()=>{
@@ -40,7 +41,7 @@ describe('StorageProviderConfigService', ()=>{
             isCompanyFeatureEnabled: jest.fn().mockReturnValue(false),
             getAppUrl: jest.fn().mockReturnValue('http://localhost:2002')
         };
-        const module = await _testing.Test.createTestingModule({
+        module = await _testing.Test.createTestingModule({
             providers: [
                 _storageproviderconfigservice.StorageProviderConfigService,
                 {
@@ -63,13 +64,16 @@ describe('StorageProviderConfigService', ()=>{
         }).compile();
         service = await module.resolve(_storageproviderconfigservice.StorageProviderConfigService);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to the core StorageConfig entity when company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(_entities.StorageConfig);
+    describe('entity selection', ()=>{
+        it('uses StorageConfig when the company feature is disabled', async ()=>{
+            mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(_storageproviderconfigservice.StorageProviderConfigService);
+            expect(built['_entity']).toBe(_entities.StorageConfig);
         });
-        it('resolves to StorageConfigWithCompany when company feature is enabled', ()=>{
+        it('uses StorageConfigWithCompany when the company feature is enabled', async ()=>{
             mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(_entities.StorageConfigWithCompany);
+            const built = await module.resolve(_storageproviderconfigservice.StorageProviderConfigService);
+            expect(built['_entity']).toBe(_entities.StorageConfigWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/fesm/services/file-manager.service.js

@@ -30,7 +30,7 @@ import { SharedPermissionCacheService, UtilsService } from '@flusys/nestjs-share
 import { applyCompanyFilter } from '@flusys/nestjs-shared/utils';
 import { BadRequestException, Inject, Injectable, NotFoundException, Scope } from '@nestjs/common';
 import { Brackets, In } from 'typeorm';
-import { FILE_MESSAGES, FOLDER_MESSAGES, UPLOAD_MESSAGES } from '../config';
+import { FILE_MESSAGES, FOLDER_MESSAGES, STORAGE_EVENT_ENTITIES, STORAGE_EVENT_MODULE, UPLOAD_MESSAGES } from '../config';
 import { FileManager, FileManagerWithCompany, Folder, FolderWithCompany } from '../entities';
 import { FileLocationEnum } from '../enums/file-location.enum';
 import { StorageConfigService } from './storage-config.service';
@@ -51,9 +51,6 @@ const DEFAULT_SELECT_FIELDS = [
     'deletedAt'
 ];
 export class FileManagerService extends ApiService {
-    resolveEntity() {
-        return this.storageConfig.isCompanyFeatureEnabled() ? FileManagerWithCompany : FileManager;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         let entity = {};
@@ -314,7 +311,7 @@ export class FileManagerService extends ApiService {
         };
     }
     constructor(cacheManager, utilsService, uploadService, storageConfig, dataSourceProvider, permissionCacheService){
-        super('file_manager', cacheManager, utilsService, FileManagerService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider, this.permissionCacheService = permissionCacheService;
+        super(STORAGE_EVENT_ENTITIES.FILE, cacheManager, utilsService, FileManagerService.name, true, STORAGE_EVENT_MODULE, dataSourceProvider, storageConfig.isCompanyFeatureEnabled() ? FileManagerWithCompany : FileManager), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "uploadService", void 0), _define_property(this, "storageConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "permissionCacheService", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.uploadService = uploadService, this.storageConfig = storageConfig, this.dataSourceProvider = dataSourceProvider, this.permissionCacheService = permissionCacheService;
     }
 }
 FileManagerService = _ts_decorate([

package/fesm/services/file-manager.service.spec.js

@@ -32,6 +32,7 @@ function buildFile(overrides = {}) {
 }
 describe('FileManagerService', ()=>{
     let service;
+    let module;
     let mockFileRepo;
     let mockFolderRepo;
     let mockStorageConfigRepo;
@@ -80,7 +81,7 @@ describe('FileManagerService', ()=>{
         mockSharedPermissionCacheService = {
             hasPermission: jest.fn().mockResolvedValue(false)
         };
-        const module = await Test.createTestingModule({
+        module = await Test.createTestingModule({
             providers: [
                 FileManagerService,
                 {
@@ -112,13 +113,16 @@ describe('FileManagerService', ()=>{
         service = await module.resolve(FileManagerService);
         await service.ensureDataSourceRepository();
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to the core FileManager entity when company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(FileManager);
+    describe('entity selection', ()=>{
+        it('uses FileManager when the company feature is disabled', async ()=>{
+            mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(FileManagerService);
+            expect(built['_entity']).toBe(FileManager);
         });
-        it('resolves to FileManagerWithCompany when company feature is enabled', ()=>{
+        it('uses FileManagerWithCompany when the company feature is enabled', async ()=>{
             mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(FileManagerWithCompany);
+            const built = await module.resolve(FileManagerService);
+            expect(built['_entity']).toBe(FileManagerWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/fesm/services/folder.service.js

@@ -29,13 +29,11 @@ import { HybridCache, ApiService } 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 { STORAGE_EVENT_ENTITIES, STORAGE_EVENT_MODULE } from '../config';
 import { Folder, FolderWithCompany } from '../entities';
 import { StorageConfigService } from './storage-config.service';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
 export class FolderService extends ApiService {
-    resolveEntity() {
-        return this.storageConfig.isCompanyFeatureEnabled() ? FolderWithCompany : Folder;
-    }
     // ─── Override Methods ───────────────────────────────────────────────────────
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
@@ -72,7 +70,7 @@ export class FolderService extends ApiService {
         return result;
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        super('folder', cacheManager, utilsService, FolderService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
+        super(STORAGE_EVENT_ENTITIES.FOLDER, cacheManager, utilsService, FolderService.name, true, STORAGE_EVENT_MODULE, dataSourceProvider, storageConfig.isCompanyFeatureEnabled() ? FolderWithCompany : Folder), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
     }
 }
 FolderService = _ts_decorate([

package/fesm/services/folder.service.spec.js

@@ -8,6 +8,7 @@ import { StorageDataSourceProvider } from './storage-datasource.provider';
 import { Folder, FolderWithCompany } from '../entities';
 describe('FolderService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockStorageConfig;
     beforeEach(async ()=>{
@@ -16,7 +17,7 @@ describe('FolderService', ()=>{
         mockStorageConfig = {
             isCompanyFeatureEnabled: jest.fn().mockReturnValue(false)
         };
-        const module = await Test.createTestingModule({
+        module = await Test.createTestingModule({
             providers: [
                 FolderService,
                 {
@@ -39,13 +40,16 @@ describe('FolderService', ()=>{
         }).compile();
         service = await module.resolve(FolderService);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to the core Folder entity when company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(Folder);
+    describe('entity selection', ()=>{
+        it('uses Folder when the company feature is disabled', async ()=>{
+            mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(FolderService);
+            expect(built['_entity']).toBe(Folder);
         });
-        it('resolves to FolderWithCompany when company feature is enabled', ()=>{
+        it('uses FolderWithCompany when the company feature is enabled', async ()=>{
             mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(FolderWithCompany);
+            const built = await module.resolve(FolderService);
+            expect(built['_entity']).toBe(FolderWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

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

@@ -30,14 +30,11 @@ import { UtilsService } from '@flusys/nestjs-shared/modules';
 import { applyCompanyFilter, buildCompanyWhereCondition } from '@flusys/nestjs-shared/utils';
 import { ForbiddenException, Inject, Injectable, Scope } from '@nestjs/common';
 import { In, IsNull } from 'typeorm';
-import { STORAGE_CONFIG_MESSAGES } from '../config';
+import { STORAGE_CONFIG_MESSAGES, STORAGE_EVENT_ENTITIES, STORAGE_EVENT_MODULE } from '../config';
 import { StorageConfig, StorageConfigWithCompany } from '../entities';
 import { StorageConfigService } from './storage-config.service';
 import { StorageDataSourceProvider } from './storage-datasource.provider';
 export class StorageProviderConfigService extends ApiService {
-    resolveEntity() {
-        return this.storageConfig.isCompanyFeatureEnabled() ? StorageConfigWithCompany : StorageConfig;
-    }
     async beforeDeleteOperation(dto, _user, _queryRunner) {
         const ids = Array.isArray(dto.id) ? dto.id : [
             dto.id
@@ -143,7 +140,7 @@ export class StorageProviderConfigService extends ApiService {
         });
     }
     constructor(cacheManager, utilsService, storageConfig, dataSourceProvider){
-        super('storageConfig', cacheManager, utilsService, StorageProviderConfigService.name, true, 'storage', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
+        super(STORAGE_EVENT_ENTITIES.STORAGE_CONFIG, cacheManager, utilsService, StorageProviderConfigService.name, true, STORAGE_EVENT_MODULE, dataSourceProvider, storageConfig.isCompanyFeatureEnabled() ? StorageConfigWithCompany : StorageConfig), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "storageConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.storageConfig = storageConfig;
     }
 }
 StorageProviderConfigService = _ts_decorate([

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

@@ -27,6 +27,7 @@ function buildStorageConfig(overrides = {}) {
 }
 describe('StorageProviderConfigService', ()=>{
     let service;
+    let module;
     let mockRepo;
     let mockStorageConfig;
     beforeEach(async ()=>{
@@ -36,7 +37,7 @@ describe('StorageProviderConfigService', ()=>{
             isCompanyFeatureEnabled: jest.fn().mockReturnValue(false),
             getAppUrl: jest.fn().mockReturnValue('http://localhost:2002')
         };
-        const module = await Test.createTestingModule({
+        module = await Test.createTestingModule({
             providers: [
                 StorageProviderConfigService,
                 {
@@ -59,13 +60,16 @@ describe('StorageProviderConfigService', ()=>{
         }).compile();
         service = await module.resolve(StorageProviderConfigService);
     });
-    describe('resolveEntity', ()=>{
-        it('resolves to the core StorageConfig entity when company feature is disabled', ()=>{
-            expect(service.resolveEntity()).toBe(StorageConfig);
+    describe('entity selection', ()=>{
+        it('uses StorageConfig when the company feature is disabled', async ()=>{
+            mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(false);
+            const built = await module.resolve(StorageProviderConfigService);
+            expect(built['_entity']).toBe(StorageConfig);
         });
-        it('resolves to StorageConfigWithCompany when company feature is enabled', ()=>{
+        it('uses StorageConfigWithCompany when the company feature is enabled', async ()=>{
             mockStorageConfig.isCompanyFeatureEnabled.mockReturnValue(true);
-            expect(service.resolveEntity()).toBe(StorageConfigWithCompany);
+            const built = await module.resolve(StorageProviderConfigService);
+            expect(built['_entity']).toBe(StorageConfigWithCompany);
         });
     });
     describe('convertSingleDtoToEntity', ()=>{

package/interfaces/storage-module-options.interface.d.ts

@@ -1,4 +1,4 @@
-import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig, IModuleOptionsFactory } from '@flusys/nestjs-core';
+import { IBootstrapAppConfig, IDataSourceServiceOptions, IDynamicModuleConfig } from '@flusys/nestjs-core';
 import { IModuleEventsConfig } from '@flusys/nestjs-shared/interfaces';
 import { ModuleMetadata, Type } from '@nestjs/common';
 export interface IStorageModuleConfig extends IDataSourceServiceOptions {
@@ -13,7 +13,7 @@ export interface StorageModuleOptions extends IDynamicModuleConfig {
     bootstrapAppConfig?: IBootstrapAppConfig;
     config?: IStorageModuleConfig;
 }
-export interface StorageOptionsFactory extends IModuleOptionsFactory<IStorageModuleConfig> {
+export interface StorageOptionsFactory {
     createStorageOptions(): Promise<IStorageModuleConfig> | IStorageModuleConfig;
 }
 export interface StorageModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'>, IDynamicModuleConfig {

package/package.json

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

package/services/file-manager.service.d.ts

@@ -2,7 +2,7 @@ import { ApiService, HybridCache } from '@flusys/nestjs-shared/classes';
 import { DeleteDto, FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { SharedPermissionCacheService, UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, QueryRunner, SelectQueryBuilder } from 'typeorm';
+import { QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { CreateFileManagerDto, FilesResponseDto, GetFilesRequestDto, UpdateFileManagerDto } from '../dtos';
 import { FileManager, FileManagerBase } from '../entities';
 import { IFileManager } from '../interfaces';
@@ -17,7 +17,6 @@ export declare class FileManagerService extends ApiService<CreateFileManagerDto,
     private readonly dataSourceProvider;
     private readonly permissionCacheService;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, uploadService: UploadService, storageConfig: StorageConfigService, dataSourceProvider: StorageDataSourceProvider, permissionCacheService: SharedPermissionCacheService);
-    protected resolveEntity(): EntityTarget<FileManagerBase>;
     convertSingleDtoToEntity(dto: CreateFileManagerDto | UpdateFileManagerDto, user: ILoggedUserInfo | null): Promise<FileManagerBase>;
     getSelectQuery(query: SelectQueryBuilder<FileManagerBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<FileManager>;

package/services/folder.service.d.ts

@@ -1,7 +1,7 @@
 import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, SelectQueryBuilder } from 'typeorm';
+import { SelectQueryBuilder } from 'typeorm';
 import { CreateFolderDto, UpdateFolderDto } from '../dtos';
 import { Folder, FolderBase } from '../entities';
 import { IFolder } from '../interfaces';
@@ -12,7 +12,6 @@ export declare class FolderService extends ApiService<CreateFolderDto, UpdateFol
     protected utilsService: UtilsService;
     private readonly storageConfig;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, storageConfig: StorageConfigService, dataSourceProvider: StorageDataSourceProvider);
-    protected resolveEntity(): EntityTarget<FolderBase>;
     convertSingleDtoToEntity(dto: CreateFolderDto | UpdateFolderDto, user: ILoggedUserInfo | null): Promise<FolderBase>;
     getSelectQuery(query: SelectQueryBuilder<FolderBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<Folder>;

package/services/storage-provider-config.service.d.ts

@@ -2,7 +2,7 @@ import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { DeleteDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
-import { EntityTarget, QueryRunner, SelectQueryBuilder } from 'typeorm';
+import { QueryRunner, SelectQueryBuilder } from 'typeorm';
 import { CreateStorageConfigDto, UpdateStorageConfigDto } from '../dtos';
 import { StorageConfig, StorageConfigBase } from '../entities';
 import { IStorageConfig } from '../interfaces';
@@ -13,7 +13,6 @@ export declare class StorageProviderConfigService extends ApiService<CreateStora
     protected utilsService: UtilsService;
     private readonly storageConfig;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, storageConfig: StorageConfigService, dataSourceProvider: StorageDataSourceProvider);
-    protected resolveEntity(): EntityTarget<StorageConfigBase>;
     protected beforeDeleteOperation(dto: DeleteDto, _user: ILoggedUserInfo | null, _queryRunner: QueryRunner): Promise<void>;
     convertSingleDtoToEntity(dto: CreateStorageConfigDto | UpdateStorageConfigDto, user: ILoggedUserInfo | null): Promise<StorageConfigBase>;
     getSelectQuery(query: SelectQueryBuilder<StorageConfigBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{