@flusys/nestjs-email 5.1.2 → 5.1.3

package/cjs/services/email-datasource.provider.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "EmailDataSourceProvider", {
     }
 });
 const _modules = require("@flusys/nestjs-shared/modules");
-const _constants = require("@flusys/nestjs-shared/constants");
 const _common = require("@nestjs/common");
 const _core = require("@nestjs/core");
 const _express = require("express");
@@ -43,7 +42,6 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 let EmailDataSourceProvider = class EmailDataSourceProvider extends _modules.MultiTenantDataSourceService {
-    // ─── Factory Methods ────────────────────────────────────────────────────────
     static buildParentOptions(options) {
         return {
             bootstrapAppConfig: options.bootstrapAppConfig,
@@ -52,61 +50,15 @@ let EmailDataSourceProvider = class EmailDataSourceProvider extends _modules.Mul
             tenants: options.config?.tenants
         };
     }
-    // ─── Feature Flags ──────────────────────────────────────────────────────────
     getEnableCompanyFeatureForTenant(tenant) {
         return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
-    // ─── Overrides ──────────────────────────────────────────────────────────────
     async createDataSourceFromConfig(config) {
         const currentTenant = this.getCurrentTenant();
         const enableCompanyFeature = this.getEnableCompanyFeatureForTenant(currentTenant ?? undefined);
         const entities = (0, _entities.getEmailEntitiesByConfig)(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    async getSingleDataSource() {
-        if (EmailDataSourceProvider.singleDataSource?.isInitialized) {
-            return EmailDataSourceProvider.singleDataSource;
-        }
-        if (EmailDataSourceProvider.singleConnectionLock) {
-            return EmailDataSourceProvider.singleConnectionLock;
-        }
-        const config = this.getDefaultDatabaseConfig();
-        if (!config) {
-            throw new _common.InternalServerErrorException({
-                message: 'No database config available. Provide defaultDatabaseConfig or tenantDefaultDatabaseConfig.',
-                messageKey: _constants.SYSTEM_MESSAGES.DATABASE_CONFIG_NOT_AVAILABLE
-            });
-        }
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        EmailDataSourceProvider.singleConnectionLock = connectionPromise;
-        try {
-            const dataSource = await connectionPromise;
-            EmailDataSourceProvider.singleDataSource = dataSource;
-            return dataSource;
-        } finally{
-            EmailDataSourceProvider.singleConnectionLock = null;
-        }
-    }
-    async getOrCreateTenantConnection(tenant) {
-        const existing = EmailDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        const pendingConnection = EmailDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        EmailDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            EmailDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            EmailDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(EmailDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }

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

@@ -42,13 +42,10 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let EmailProviderConfigService = class EmailProviderConfigService extends _classes.RequestScopedApiService {
+let EmailProviderConfigService = class EmailProviderConfigService extends _classes.ApiService {
     resolveEntity() {
         return this.emailConfig.isCompanyFeatureEnabled() ? _entities.EmailConfigWithCompany : _entities.EmailConfig;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     async convertSingleDtoToEntity(dto, user) {
         const entity = {
             ...dto
@@ -90,7 +87,7 @@ let EmailProviderConfigService = class EmailProviderConfigService extends _class
         return result;
     }
     async findByIdDirect(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         return this.repository.findOne({
             where: {
                 id
@@ -98,7 +95,7 @@ let EmailProviderConfigService = class EmailProviderConfigService extends _class
         });
     }
     async getDefaultConfig(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const baseWhere = (0, _utils.buildCompanyWhereCondition)({
             isActive: true
         }, this.emailConfig.isCompanyFeatureEnabled(), user);
@@ -119,7 +116,7 @@ let EmailProviderConfigService = class EmailProviderConfigService extends _class
         });
     }
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super('emailConfig', null, cacheManager, utilsService, EmailProviderConfigService.name, true, 'email'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig, this.dataSourceProvider = dataSourceProvider;
+        super('emailConfig', cacheManager, utilsService, EmailProviderConfigService.name, true, 'email', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
     }
 };
 EmailProviderConfigService = _ts_decorate([

package/cjs/services/email-template.service.js

@@ -57,13 +57,10 @@ const DEFAULT_SELECT_FIELDS = [
     'createdAt',
     'updatedAt'
 ];
-let EmailTemplateService = class EmailTemplateService extends _classes.RequestScopedApiService {
+let EmailTemplateService = class EmailTemplateService extends _classes.ApiService {
     resolveEntity() {
         return this.emailConfig.isCompanyFeatureEnabled() ? _entities.EmailTemplateWithCompany : _entities.EmailTemplate;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
         await this.incrementSchemaVersionIfChanged(dto, entity);
@@ -96,7 +93,7 @@ let EmailTemplateService = class EmailTemplateService extends _classes.RequestSc
     }
     // ─── Public Query Methods ───────────────────────────────────────────────────
     async findByIdDirect(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         return this.repository.findOne({
             where: {
                 id
@@ -104,7 +101,7 @@ let EmailTemplateService = class EmailTemplateService extends _classes.RequestSc
         });
     }
     async findBySlug(slug, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = (0, _utils.buildCompanyWhereCondition)({
             slug,
             isActive: true
@@ -117,7 +114,7 @@ let EmailTemplateService = class EmailTemplateService extends _classes.RequestSc
     async incrementSchemaVersionIfChanged(dto, entity) {
         const updateDto = dto;
         if (!updateDto.id || !dto.schema) return;
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const existing = await this.repository.findOne({
             where: {
                 id: updateDto.id
@@ -128,7 +125,7 @@ let EmailTemplateService = class EmailTemplateService extends _classes.RequestSc
         }
     }
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super('emailTemplate', null, cacheManager, utilsService, EmailTemplateService.name, true, 'email'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig, this.dataSourceProvider = dataSourceProvider;
+        super('emailTemplate', cacheManager, utilsService, EmailTemplateService.name, true, 'email', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
     }
 };
 EmailTemplateService = _ts_decorate([

package/controllers/email-config.controller.d.ts

@@ -1,9 +1,9 @@
 import { CreateEmailConfigDto, EmailConfigResponseDto, UpdateEmailConfigDto } from '../dtos';
 import { EmailProviderConfigService } from '../services';
 declare const EmailConfigController_base: abstract new (service: EmailProviderConfigService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: EmailProviderConfigService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateEmailConfigDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<EmailConfigResponseDto>>;
     insertMany(addDto: CreateEmailConfigDto[], user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<EmailConfigResponseDto>>;
     getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: import("@flusys/nestjs-shared").ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").SingleResponseDto<EmailConfigResponseDto>>;

package/controllers/email-template.controller.d.ts

@@ -4,19 +4,19 @@ import { CreateEmailTemplateDto, EmailTemplateResponseDto, UpdateEmailTemplateDt
 import { IEmailTemplate } from '../interfaces';
 import { EmailTemplateService } from '../services';
 declare const EmailTemplateController_base: abstract new (service: EmailTemplateService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: EmailTemplateService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateEmailTemplateDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<EmailTemplateResponseDto>>;
-    insertMany(addDto: CreateEmailTemplateDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<EmailTemplateResponseDto>>;
-    getById(id: string, body: import("@flusys/nestjs-shared/dtos").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<EmailTemplateResponseDto>>;
-    getByIds(body: import("@flusys/nestjs-shared/dtos").GetByIdsDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").ListResponseDto<EmailTemplateResponseDto>>;
+    insertMany(addDto: CreateEmailTemplateDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<EmailTemplateResponseDto>>;
+    getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<EmailTemplateResponseDto>>;
+    getByIds(body: import("@flusys/nestjs-shared").GetByIdsDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").ListResponseDto<EmailTemplateResponseDto>>;
     update(updateDto: UpdateEmailTemplateDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<EmailTemplateResponseDto>>;
-    updateMany(updateDtos: UpdateEmailTemplateDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<EmailTemplateResponseDto>>;
-    bulkUpsert(dtos: (CreateEmailTemplateDto | UpdateEmailTemplateDto)[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<EmailTemplateResponseDto>>;
+    updateMany(updateDtos: UpdateEmailTemplateDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<EmailTemplateResponseDto>>;
+    bulkUpsert(dtos: (CreateEmailTemplateDto | UpdateEmailTemplateDto)[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<EmailTemplateResponseDto>>;
     getByFilter(filter: Record<string, any>, user: ILoggedUserInfo | null): Promise<SingleResponseDto<EmailTemplateResponseDto>>;
-    getAll(filterAndPaginationDto: import("@flusys/nestjs-shared/dtos").FilterAndPaginationDto, user: ILoggedUserInfo | null, search?: string): Promise<import("@flusys/nestjs-shared/dtos").ListResponseDto<EmailTemplateResponseDto>>;
-    delete(deleteDto: import("@flusys/nestjs-shared/dtos").DeleteDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").MessageResponseDto>;
+    getAll(filterAndPaginationDto: import("@flusys/nestjs-shared").FilterAndPaginationDto, user: ILoggedUserInfo | null, search?: string): Promise<import("@flusys/nestjs-shared").ListResponseDto<EmailTemplateResponseDto>>;
+    delete(deleteDto: import("@flusys/nestjs-shared").DeleteDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").MessageResponseDto>;
 };
 export declare class EmailTemplateController extends EmailTemplateController_base {
     emailTemplateService: EmailTemplateService;

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

@@ -26,14 +26,12 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 import { MultiTenantDataSourceService } from '@flusys/nestjs-shared/modules';
-import { SYSTEM_MESSAGES } from '@flusys/nestjs-shared/constants';
-import { Inject, Injectable, InternalServerErrorException, Optional, Scope } from '@nestjs/common';
+import { Inject, Injectable, Optional, Scope } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { Request } from 'express';
 import { getEmailEntitiesByConfig } from '../entities';
 import { EmailConfigService } from './email-config.service';
 export class EmailDataSourceProvider extends MultiTenantDataSourceService {
-    // ─── Factory Methods ────────────────────────────────────────────────────────
     static buildParentOptions(options) {
         return {
             bootstrapAppConfig: options.bootstrapAppConfig,
@@ -42,61 +40,15 @@ export class EmailDataSourceProvider extends MultiTenantDataSourceService {
             tenants: options.config?.tenants
         };
     }
-    // ─── Feature Flags ──────────────────────────────────────────────────────────
     getEnableCompanyFeatureForTenant(tenant) {
         return tenant?.enableCompanyFeature ?? this.configService.isCompanyFeatureEnabled();
     }
-    // ─── Overrides ──────────────────────────────────────────────────────────────
     async createDataSourceFromConfig(config) {
         const currentTenant = this.getCurrentTenant();
         const enableCompanyFeature = this.getEnableCompanyFeatureForTenant(currentTenant ?? undefined);
         const entities = getEmailEntitiesByConfig(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    async getSingleDataSource() {
-        if (EmailDataSourceProvider.singleDataSource?.isInitialized) {
-            return EmailDataSourceProvider.singleDataSource;
-        }
-        if (EmailDataSourceProvider.singleConnectionLock) {
-            return EmailDataSourceProvider.singleConnectionLock;
-        }
-        const config = this.getDefaultDatabaseConfig();
-        if (!config) {
-            throw new InternalServerErrorException({
-                message: 'No database config available. Provide defaultDatabaseConfig or tenantDefaultDatabaseConfig.',
-                messageKey: SYSTEM_MESSAGES.DATABASE_CONFIG_NOT_AVAILABLE
-            });
-        }
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        EmailDataSourceProvider.singleConnectionLock = connectionPromise;
-        try {
-            const dataSource = await connectionPromise;
-            EmailDataSourceProvider.singleDataSource = dataSource;
-            return dataSource;
-        } finally{
-            EmailDataSourceProvider.singleConnectionLock = null;
-        }
-    }
-    async getOrCreateTenantConnection(tenant) {
-        const existing = EmailDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        const pendingConnection = EmailDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        EmailDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            EmailDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            EmailDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(EmailDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }

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

@@ -25,20 +25,17 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } 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 { EmailConfig, EmailConfigWithCompany } from '../entities';
 import { EmailConfigService } from './email-config.service';
 import { EmailDataSourceProvider } from './email-datasource.provider';
-export class EmailProviderConfigService extends RequestScopedApiService {
+export class EmailProviderConfigService extends ApiService {
     resolveEntity() {
         return this.emailConfig.isCompanyFeatureEnabled() ? EmailConfigWithCompany : EmailConfig;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     async convertSingleDtoToEntity(dto, user) {
         const entity = {
             ...dto
@@ -80,7 +77,7 @@ export class EmailProviderConfigService extends RequestScopedApiService {
         return result;
     }
     async findByIdDirect(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         return this.repository.findOne({
             where: {
                 id
@@ -88,7 +85,7 @@ export class EmailProviderConfigService extends RequestScopedApiService {
         });
     }
     async getDefaultConfig(user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const baseWhere = buildCompanyWhereCondition({
             isActive: true
         }, this.emailConfig.isCompanyFeatureEnabled(), user);
@@ -109,7 +106,7 @@ export class EmailProviderConfigService extends RequestScopedApiService {
         });
     }
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super('emailConfig', null, cacheManager, utilsService, EmailProviderConfigService.name, true, 'email'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig, this.dataSourceProvider = dataSourceProvider;
+        super('emailConfig', cacheManager, utilsService, EmailProviderConfigService.name, true, 'email', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
     }
 }
 EmailProviderConfigService = _ts_decorate([

package/fesm/services/email-template.service.js

@@ -25,7 +25,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } 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';
@@ -47,13 +47,10 @@ const DEFAULT_SELECT_FIELDS = [
     'createdAt',
     'updatedAt'
 ];
-export class EmailTemplateService extends RequestScopedApiService {
+export class EmailTemplateService extends ApiService {
     resolveEntity() {
         return this.emailConfig.isCompanyFeatureEnabled() ? EmailTemplateWithCompany : EmailTemplate;
     }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
     async convertSingleDtoToEntity(dto, user) {
         const entity = await super.convertSingleDtoToEntity(dto, user);
         await this.incrementSchemaVersionIfChanged(dto, entity);
@@ -86,7 +83,7 @@ export class EmailTemplateService extends RequestScopedApiService {
     }
     // ─── Public Query Methods ───────────────────────────────────────────────────
     async findByIdDirect(id) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         return this.repository.findOne({
             where: {
                 id
@@ -94,7 +91,7 @@ export class EmailTemplateService extends RequestScopedApiService {
         });
     }
     async findBySlug(slug, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const where = buildCompanyWhereCondition({
             slug,
             isActive: true
@@ -107,7 +104,7 @@ export class EmailTemplateService extends RequestScopedApiService {
     async incrementSchemaVersionIfChanged(dto, entity) {
         const updateDto = dto;
         if (!updateDto.id || !dto.schema) return;
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const existing = await this.repository.findOne({
             where: {
                 id: updateDto.id
@@ -118,7 +115,7 @@ export class EmailTemplateService extends RequestScopedApiService {
         }
     }
     constructor(cacheManager, utilsService, emailConfig, dataSourceProvider){
-        super('emailTemplate', null, cacheManager, utilsService, EmailTemplateService.name, true, 'email'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig, this.dataSourceProvider = dataSourceProvider;
+        super('emailTemplate', cacheManager, utilsService, EmailTemplateService.name, true, 'email', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "emailConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.emailConfig = emailConfig;
     }
 }
 EmailTemplateService = _ts_decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-email",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "description": "Modular email package with SMTP, SendGrid, and Mailgun providers",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -79,19 +79,19 @@
     }
   },
   "peerDependencies": {
-    "@nestjs/common": "^10.0.0 || ^11.0.0",
-    "@nestjs/config": "^3.0.0 || ^4.0.0",
-    "@nestjs/core": "^10.0.0 || ^11.0.0",
-    "@nestjs/platform-express": "^10.0.0 || ^11.0.0",
-    "@nestjs/swagger": "^7.0.0 || ^11.0.0",
-    "@nestjs/typeorm": "^10.0.0 || ^11.0.0",
-    "class-transformer": "^0.5.0",
-    "class-validator": "^0.14.0",
+    "@nestjs/common": "^11.0.0",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.0.0",
+    "@nestjs/platform-express": "^11.0.0",
+    "@nestjs/swagger": "^11.0.0",
+    "@nestjs/typeorm": "^11.0.0",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.0 || ^0.15.0",
     "typeorm": "^0.3.0",
-    "nodemailer": "^7.0.0",
+    "nodemailer": "^7.0.0 || ^8.0.0",
     "@sendgrid/mail": "^8.0.0",
     "mailgun.js": "^10.0.0",
-    "express": "^4.18.0"
+    "express": "^4.18.0 || ^5.0.0"
   },
   "peerDependenciesMeta": {
     "nodemailer": {
@@ -105,7 +105,7 @@
     }
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.1.2",
-    "@flusys/nestjs-shared": "5.1.2"
+    "@flusys/nestjs-core": "5.1.3",
+    "@flusys/nestjs-shared": "5.1.3"
   }
 }

package/services/email-datasource.provider.d.ts

@@ -15,6 +15,4 @@ export declare class EmailDataSourceProvider extends MultiTenantDataSourceServic
     private static buildParentOptions;
     getEnableCompanyFeatureForTenant(tenant?: ITenantDatabaseConfig): boolean;
     protected createDataSourceFromConfig(config: IDatabaseConfig): Promise<DataSource>;
-    protected getSingleDataSource(): Promise<DataSource>;
-    protected getOrCreateTenantConnection(tenant: ITenantDatabaseConfig): Promise<DataSource>;
 }

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

@@ -1,4 +1,4 @@
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
@@ -8,14 +8,12 @@ import { EmailConfig, EmailConfigBase } from '../entities';
 import { IEmailConfig } from '../interfaces';
 import { EmailConfigService } from './email-config.service';
 import { EmailDataSourceProvider } from './email-datasource.provider';
-export declare class EmailProviderConfigService extends RequestScopedApiService<CreateEmailConfigDto, UpdateEmailConfigDto, IEmailConfig, EmailConfigBase> {
+export declare class EmailProviderConfigService extends ApiService<CreateEmailConfigDto, UpdateEmailConfigDto, IEmailConfig, EmailConfigBase> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly emailConfig;
-    private readonly dataSourceProvider;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, emailConfig: EmailConfigService, dataSourceProvider: EmailDataSourceProvider);
     protected resolveEntity(): EntityTarget<EmailConfigBase>;
-    protected getDataSourceProvider(): EmailDataSourceProvider;
     convertSingleDtoToEntity(dto: CreateEmailConfigDto | UpdateEmailConfigDto, user: ILoggedUserInfo | null): Promise<EmailConfigBase>;
     getSelectQuery(query: SelectQueryBuilder<EmailConfigBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<EmailConfig>;

package/services/email-template.service.d.ts

@@ -1,4 +1,4 @@
-import { HybridCache, RequestScopedApiService } from '@flusys/nestjs-shared/classes';
+import { HybridCache, ApiService } from '@flusys/nestjs-shared/classes';
 import { FilterAndPaginationDto } from '@flusys/nestjs-shared/dtos';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
@@ -8,14 +8,12 @@ import { EmailTemplate, EmailTemplateBase } from '../entities';
 import { IEmailTemplate } from '../interfaces';
 import { EmailConfigService } from './email-config.service';
 import { EmailDataSourceProvider } from './email-datasource.provider';
-export declare class EmailTemplateService extends RequestScopedApiService<CreateEmailTemplateDto, UpdateEmailTemplateDto, IEmailTemplate, EmailTemplateBase> {
+export declare class EmailTemplateService extends ApiService<CreateEmailTemplateDto, UpdateEmailTemplateDto, IEmailTemplate, EmailTemplateBase> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly emailConfig;
-    private readonly dataSourceProvider;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, emailConfig: EmailConfigService, dataSourceProvider: EmailDataSourceProvider);
     protected resolveEntity(): EntityTarget<EmailTemplateBase>;
-    protected getDataSourceProvider(): EmailDataSourceProvider;
     convertSingleDtoToEntity(dto: CreateEmailTemplateDto | UpdateEmailTemplateDto, user: ILoggedUserInfo | null): Promise<EmailTemplateBase>;
     getSelectQuery(query: SelectQueryBuilder<EmailTemplateBase>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<EmailTemplate>;