@flusys/nestjs-form-builder 5.1.2 → 5.2.0

package/cjs/services/form-builder-datasource.provider.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "FormBuilderDataSourceProvider", {
 });
 const _modules = require("@flusys/nestjs-shared/modules");
 const _common = require("@nestjs/common");
-const _constants = require("@flusys/nestjs-shared/constants");
 const _core = require("@nestjs/core");
 const _express = require("express");
 const _formbuilderconfigservice = require("./form-builder-config.service");
@@ -101,50 +100,6 @@ let FormBuilderDataSourceProvider = class FormBuilderDataSourceProvider extends
         const entities = await this.getFormBuilderEntities(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    async getSingleDataSource() {
-        if (FormBuilderDataSourceProvider.singleDataSource?.isInitialized) {
-            return FormBuilderDataSourceProvider.singleDataSource;
-        }
-        if (FormBuilderDataSourceProvider.singleConnectionLock) {
-            return FormBuilderDataSourceProvider.singleConnectionLock;
-        }
-        const config = this.getDefaultDatabaseConfig();
-        if (!config) {
-            throw new _common.InternalServerErrorException({
-                message: 'No database config available. Provide defaultDatabaseConfig in FormBuilderModule options.',
-                messageKey: _constants.SYSTEM_MESSAGES.DATABASE_CONFIG_NOT_AVAILABLE
-            });
-        }
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        FormBuilderDataSourceProvider.singleConnectionLock = connectionPromise;
-        try {
-            const dataSource = await connectionPromise;
-            FormBuilderDataSourceProvider.singleDataSource = dataSource;
-            return dataSource;
-        } finally{
-            FormBuilderDataSourceProvider.singleConnectionLock = null;
-        }
-    }
-    async getOrCreateTenantConnection(tenant) {
-        const existing = FormBuilderDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        const pendingConnection = FormBuilderDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        FormBuilderDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            FormBuilderDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            FormBuilderDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(FormBuilderDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }

package/cjs/services/form-result.service.js

@@ -49,13 +49,7 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let FormResultService = class FormResultService extends _classes.RequestScopedApiService {
-    resolveEntity() {
-        return _entities.FormResult;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
+let FormResultService = class FormResultService extends _classes.ApiService {
     async ensureFormRepositoryInitialized() {
         if (!this.formRepository) {
             const enableCompanyFeature = this.formBuilderConfig.isCompanyFeatureEnabled();
@@ -191,7 +185,7 @@ let FormResultService = class FormResultService extends _classes.RequestScopedAp
     }
     // Form Submission
     async submitForm(dto, user, isPublic = false) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const form = await this.getActiveForm(dto.formId);
         await this.validateSubmissionAccess(form, user, isPublic);
         const isDraft = dto.isDraft ?? false;
@@ -226,7 +220,7 @@ let FormResultService = class FormResultService extends _classes.RequestScopedAp
         return this.convertEntityToResponseDto(saved, false);
     }
     async getMyDraft(formId, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const draft = await this.repository.findOne({
             where: this.buildUserDraftWhere(formId, user.id),
             order: {
@@ -236,7 +230,7 @@ let FormResultService = class FormResultService extends _classes.RequestScopedAp
         return draft ? this.convertEntityToResponseDto(draft, false) : null;
     }
     async updateDraft(draftId, dto, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const draft = await this.repository.findOne({
             where: {
                 id: draftId,
@@ -263,7 +257,7 @@ let FormResultService = class FormResultService extends _classes.RequestScopedAp
         return this.convertEntityToResponseDto(saved, false);
     }
     async getByFormId(formId, user, pagination) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const query = this.repository.createQueryBuilder(this.entityName).where('form_result.formId = :formId', {
             formId
         }).andWhere('form_result.deletedAt IS NULL');
@@ -278,7 +272,7 @@ let FormResultService = class FormResultService extends _classes.RequestScopedAp
         };
     }
     async hasUserSubmitted(formId, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const count = await this.repository.count({
             where: {
                 formId,
@@ -290,7 +284,7 @@ let FormResultService = class FormResultService extends _classes.RequestScopedAp
         return count > 0;
     }
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider){
-        super('form_result', null, cacheManager, utilsService, FormResultService.name, true, 'form-builder'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "formRepository", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formRepository = null;
+        super('form_result', cacheManager, utilsService, FormResultService.name, true, 'form-builder', _entities.FormResult, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "formRepository", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formRepository = null;
     }
 };
 _ts_decorate([

package/cjs/services/form.service.js

@@ -46,13 +46,9 @@ function _ts_param(paramIndex, decorator) {
         decorator(target, key, paramIndex);
     };
 }
-let FormService = class FormService extends _classes.RequestScopedApiService {
+let FormService = class FormService extends _classes.ApiService {
     resolveEntity() {
-        const enableCompanyFeature = this.formBuilderConfig.isCompanyFeatureEnabled();
-        return enableCompanyFeature ? _entities.FormWithCompany : _entities.Form;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
+        return this.formBuilderConfig.isCompanyFeatureEnabled() ? _entities.FormWithCompany : _entities.Form;
     }
     // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
@@ -170,7 +166,7 @@ let FormService = class FormService extends _classes.RequestScopedApiService {
         };
     }
     async findPublicActiveForm(where) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         return await this.repository.findOne({
             where: {
                 ...where,
@@ -194,7 +190,7 @@ let FormService = class FormService extends _classes.RequestScopedApiService {
         return this.toPublicForm(form);
     }
     async getFormForSubmission(formId, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const form = await this.repository.findOne({
             where: {
                 id: formId,
@@ -228,7 +224,7 @@ let FormService = class FormService extends _classes.RequestScopedApiService {
         });
     }
     async getBySlug(slug) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const form = await this.repository.findOne({
             where: {
                 slug,
@@ -247,7 +243,7 @@ let FormService = class FormService extends _classes.RequestScopedApiService {
         return form ? this.toPublicForm(form) : null;
     }
     async getFormAccessInfo(formId) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const form = await this.repository.findOne({
             where: {
                 id: formId,
@@ -292,7 +288,7 @@ let FormService = class FormService extends _classes.RequestScopedApiService {
         return this.toPublicForm(form);
     }
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider){
-        super('form', null, cacheManager, utilsService, FormService.name, true, 'form-builder'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider;
+        super('form', cacheManager, utilsService, FormService.name, true, 'form-builder', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig;
     }
 };
 FormService = _ts_decorate([

package/controllers/form-result.controller.d.ts

@@ -3,19 +3,19 @@ import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { CreateFormResultDto, FormResultResponseDto, GetMyDraftDto, GetResultsByFormDto, SubmitFormDto, UpdateDraftDto, UpdateFormResultDto } from '../dtos';
 import { FormResultService } from '../services/form-result.service';
 declare const FormResultController_base: abstract new (service: FormResultService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: FormResultService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateFormResultDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResultResponseDto>>;
-    insertMany(addDto: CreateFormResultDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<FormResultResponseDto>>;
-    getById(id: string, body: import("@flusys/nestjs-shared/dtos").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResultResponseDto>>;
-    getByIds(body: import("@flusys/nestjs-shared/dtos").GetByIdsDto, user: ILoggedUserInfo | null): Promise<ListResponseDto<FormResultResponseDto>>;
+    insertMany(addDto: CreateFormResultDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResultResponseDto>>;
+    getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResultResponseDto>>;
+    getByIds(body: import("@flusys/nestjs-shared").GetByIdsDto, user: ILoggedUserInfo | null): Promise<ListResponseDto<FormResultResponseDto>>;
     update(updateDto: UpdateFormResultDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResultResponseDto>>;
-    updateMany(updateDtos: UpdateFormResultDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<FormResultResponseDto>>;
-    bulkUpsert(dtos: (CreateFormResultDto | UpdateFormResultDto)[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<FormResultResponseDto>>;
+    updateMany(updateDtos: UpdateFormResultDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResultResponseDto>>;
+    bulkUpsert(dtos: (CreateFormResultDto | UpdateFormResultDto)[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResultResponseDto>>;
     getByFilter(filter: Record<string, any>, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResultResponseDto>>;
-    getAll(filterAndPaginationDto: import("@flusys/nestjs-shared/dtos").FilterAndPaginationDto, user: ILoggedUserInfo | null, search?: string): Promise<ListResponseDto<FormResultResponseDto>>;
-    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<ListResponseDto<FormResultResponseDto>>;
+    delete(deleteDto: import("@flusys/nestjs-shared").DeleteDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").MessageResponseDto>;
 };
 export declare class FormResultController extends FormResultController_base {
     formResultService: FormResultService;

package/controllers/form.controller.d.ts

@@ -3,19 +3,19 @@ import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { CreateFormDto, FormAccessInfoResponseDto, FormResponseDto, PublicFormResponseDto, UpdateFormDto } from '../dtos';
 import { FormService } from '../services/form.service';
 declare const FormController_base: abstract new (service: FormService) => {
-    readonly enabledEndpoints: import("@flusys/nestjs-shared/classes").ApiEndpoint[] | "all";
+    readonly enabledEndpoints: import("@flusys/nestjs-shared").ApiEndpoint[] | "all";
     service: FormService;
-    isEnabled(endpoint: import("@flusys/nestjs-shared/classes").ApiEndpoint): boolean;
+    isEnabled(endpoint: import("@flusys/nestjs-shared").ApiEndpoint): boolean;
     insert(addDto: CreateFormDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResponseDto>>;
-    insertMany(addDto: CreateFormDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<FormResponseDto>>;
-    getById(id: string, body: import("@flusys/nestjs-shared/dtos").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResponseDto>>;
-    getByIds(body: import("@flusys/nestjs-shared/dtos").GetByIdsDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").ListResponseDto<FormResponseDto>>;
+    insertMany(addDto: CreateFormDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResponseDto>>;
+    getById(id: string, body: import("@flusys/nestjs-shared").GetByIdBodyDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResponseDto>>;
+    getByIds(body: import("@flusys/nestjs-shared").GetByIdsDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").ListResponseDto<FormResponseDto>>;
     update(updateDto: UpdateFormDto, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResponseDto>>;
-    updateMany(updateDtos: UpdateFormDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<FormResponseDto>>;
-    bulkUpsert(dtos: (CreateFormDto | UpdateFormDto)[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared/dtos").BulkResponseDto<FormResponseDto>>;
+    updateMany(updateDtos: UpdateFormDto[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResponseDto>>;
+    bulkUpsert(dtos: (CreateFormDto | UpdateFormDto)[], user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").BulkResponseDto<FormResponseDto>>;
     getByFilter(filter: Record<string, any>, user: ILoggedUserInfo | null): Promise<SingleResponseDto<FormResponseDto>>;
-    getAll(filterAndPaginationDto: import("@flusys/nestjs-shared/dtos").FilterAndPaginationDto, user: ILoggedUserInfo | null, search?: string): Promise<import("@flusys/nestjs-shared/dtos").ListResponseDto<FormResponseDto>>;
-    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<FormResponseDto>>;
+    delete(deleteDto: import("@flusys/nestjs-shared").DeleteDto, user: ILoggedUserInfo | null): Promise<import("@flusys/nestjs-shared").MessageResponseDto>;
 };
 export declare class FormController extends FormController_base {
     formService: FormService;

package/fesm/services/form-builder-datasource.provider.js

@@ -26,8 +26,7 @@ function _ts_param(paramIndex, decorator) {
     };
 }
 import { MultiTenantDataSourceService } from '@flusys/nestjs-shared/modules';
-import { Inject, Injectable, InternalServerErrorException, Optional, Scope } from '@nestjs/common';
-import { SYSTEM_MESSAGES } from '@flusys/nestjs-shared/constants';
+import { Inject, Injectable, Optional, Scope } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { Request } from 'express';
 import { FormBuilderConfigService } from './form-builder-config.service';
@@ -50,50 +49,6 @@ export class FormBuilderDataSourceProvider extends MultiTenantDataSourceService
         const entities = await this.getFormBuilderEntities(enableCompanyFeature);
         return super.createDataSourceFromConfig(config, entities);
     }
-    async getSingleDataSource() {
-        if (FormBuilderDataSourceProvider.singleDataSource?.isInitialized) {
-            return FormBuilderDataSourceProvider.singleDataSource;
-        }
-        if (FormBuilderDataSourceProvider.singleConnectionLock) {
-            return FormBuilderDataSourceProvider.singleConnectionLock;
-        }
-        const config = this.getDefaultDatabaseConfig();
-        if (!config) {
-            throw new InternalServerErrorException({
-                message: 'No database config available. Provide defaultDatabaseConfig in FormBuilderModule options.',
-                messageKey: SYSTEM_MESSAGES.DATABASE_CONFIG_NOT_AVAILABLE
-            });
-        }
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        FormBuilderDataSourceProvider.singleConnectionLock = connectionPromise;
-        try {
-            const dataSource = await connectionPromise;
-            FormBuilderDataSourceProvider.singleDataSource = dataSource;
-            return dataSource;
-        } finally{
-            FormBuilderDataSourceProvider.singleConnectionLock = null;
-        }
-    }
-    async getOrCreateTenantConnection(tenant) {
-        const existing = FormBuilderDataSourceProvider.tenantConnections.get(tenant.id);
-        if (existing?.isInitialized) {
-            return existing;
-        }
-        const pendingConnection = FormBuilderDataSourceProvider.connectionLocks.get(tenant.id);
-        if (pendingConnection) {
-            return pendingConnection;
-        }
-        const config = this.buildTenantDatabaseConfig(tenant);
-        const connectionPromise = this.createDataSourceFromConfig(config);
-        FormBuilderDataSourceProvider.connectionLocks.set(tenant.id, connectionPromise);
-        try {
-            const dataSource = await connectionPromise;
-            FormBuilderDataSourceProvider.tenantConnections.set(tenant.id, dataSource);
-            return dataSource;
-        } finally{
-            FormBuilderDataSourceProvider.connectionLocks.delete(tenant.id);
-        }
-    }
     constructor(configService, request){
         super(FormBuilderDataSourceProvider.buildParentOptions(configService.getOptions()), request), _define_property(this, "configService", void 0), this.configService = configService;
     }

package/fesm/services/form-result.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 { LogAction } from '@flusys/nestjs-shared/decorators';
 import { ILoggedUserInfo } from '@flusys/nestjs-shared/interfaces';
 import { UtilsService } from '@flusys/nestjs-shared/modules';
@@ -39,13 +39,7 @@ import { calculateComputedFields } from '../utils/computed-field.utils';
 import { validateUserPermissions } from '../utils/permission.utils';
 import { FormBuilderConfigService } from './form-builder-config.service';
 import { FormBuilderDataSourceProvider } from './form-builder-datasource.provider';
-export class FormResultService extends RequestScopedApiService {
-    resolveEntity() {
-        return FormResult;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
-    }
+export class FormResultService extends ApiService {
     async ensureFormRepositoryInitialized() {
         if (!this.formRepository) {
             const enableCompanyFeature = this.formBuilderConfig.isCompanyFeatureEnabled();
@@ -181,7 +175,7 @@ export class FormResultService extends RequestScopedApiService {
     }
     // Form Submission
     async submitForm(dto, user, isPublic = false) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const form = await this.getActiveForm(dto.formId);
         await this.validateSubmissionAccess(form, user, isPublic);
         const isDraft = dto.isDraft ?? false;
@@ -216,7 +210,7 @@ export class FormResultService extends RequestScopedApiService {
         return this.convertEntityToResponseDto(saved, false);
     }
     async getMyDraft(formId, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const draft = await this.repository.findOne({
             where: this.buildUserDraftWhere(formId, user.id),
             order: {
@@ -226,7 +220,7 @@ export class FormResultService extends RequestScopedApiService {
         return draft ? this.convertEntityToResponseDto(draft, false) : null;
     }
     async updateDraft(draftId, dto, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const draft = await this.repository.findOne({
             where: {
                 id: draftId,
@@ -253,7 +247,7 @@ export class FormResultService extends RequestScopedApiService {
         return this.convertEntityToResponseDto(saved, false);
     }
     async getByFormId(formId, user, pagination) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const query = this.repository.createQueryBuilder(this.entityName).where('form_result.formId = :formId', {
             formId
         }).andWhere('form_result.deletedAt IS NULL');
@@ -268,7 +262,7 @@ export class FormResultService extends RequestScopedApiService {
         };
     }
     async hasUserSubmitted(formId, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const count = await this.repository.count({
             where: {
                 formId,
@@ -280,7 +274,7 @@ export class FormResultService extends RequestScopedApiService {
         return count > 0;
     }
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider){
-        super('form_result', null, cacheManager, utilsService, FormResultService.name, true, 'form-builder'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "formRepository", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formRepository = null;
+        super('form_result', cacheManager, utilsService, FormResultService.name, true, 'form-builder', FormResult, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), _define_property(this, "formRepository", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider, this.formRepository = null;
     }
 }
 _ts_decorate([

package/fesm/services/form.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 } from '@flusys/nestjs-shared/utils';
 import { BadRequestException, ForbiddenException, Inject, Injectable, NotFoundException, Scope, UnauthorizedException } from '@nestjs/common';
@@ -36,13 +36,9 @@ import { FormAccessType } from '../enums/form-access-type.enum';
 import { validateUserPermissions } from '../utils/permission.utils';
 import { FormBuilderConfigService } from './form-builder-config.service';
 import { FormBuilderDataSourceProvider } from './form-builder-datasource.provider';
-export class FormService extends RequestScopedApiService {
+export class FormService extends ApiService {
     resolveEntity() {
-        const enableCompanyFeature = this.formBuilderConfig.isCompanyFeatureEnabled();
-        return enableCompanyFeature ? FormWithCompany : Form;
-    }
-    getDataSourceProvider() {
-        return this.dataSourceProvider;
+        return this.formBuilderConfig.isCompanyFeatureEnabled() ? FormWithCompany : Form;
     }
     // Entity Conversion
     async convertSingleDtoToEntity(dto, user) {
@@ -160,7 +156,7 @@ export class FormService extends RequestScopedApiService {
         };
     }
     async findPublicActiveForm(where) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         return await this.repository.findOne({
             where: {
                 ...where,
@@ -184,7 +180,7 @@ export class FormService extends RequestScopedApiService {
         return this.toPublicForm(form);
     }
     async getFormForSubmission(formId, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const form = await this.repository.findOne({
             where: {
                 id: formId,
@@ -218,7 +214,7 @@ export class FormService extends RequestScopedApiService {
         });
     }
     async getBySlug(slug) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const form = await this.repository.findOne({
             where: {
                 slug,
@@ -237,7 +233,7 @@ export class FormService extends RequestScopedApiService {
         return form ? this.toPublicForm(form) : null;
     }
     async getFormAccessInfo(formId) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const form = await this.repository.findOne({
             where: {
                 id: formId,
@@ -282,7 +278,7 @@ export class FormService extends RequestScopedApiService {
         return this.toPublicForm(form);
     }
     constructor(cacheManager, utilsService, formBuilderConfig, dataSourceProvider){
-        super('form', null, cacheManager, utilsService, FormService.name, true, 'form-builder'), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), _define_property(this, "dataSourceProvider", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig, this.dataSourceProvider = dataSourceProvider;
+        super('form', cacheManager, utilsService, FormService.name, true, 'form-builder', undefined, dataSourceProvider), _define_property(this, "cacheManager", void 0), _define_property(this, "utilsService", void 0), _define_property(this, "formBuilderConfig", void 0), this.cacheManager = cacheManager, this.utilsService = utilsService, this.formBuilderConfig = formBuilderConfig;
     }
 }
 FormService = _ts_decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flusys/nestjs-form-builder",
-  "version": "5.1.2",
+  "version": "5.2.0",
   "description": "Dynamic form builder module with schema versioning and access control",
   "main": "cjs/index.js",
   "module": "fesm/index.js",
@@ -72,19 +72,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",
-    "express": "^4.18.0"
+    "express": "^4.18.0 || ^5.0.0"
   },
   "dependencies": {
-    "@flusys/nestjs-core": "5.1.2",
-    "@flusys/nestjs-shared": "5.1.2"
+    "@flusys/nestjs-core": "5.2.0",
+    "@flusys/nestjs-shared": "5.2.0"
   }
 }

package/services/form-builder-config.service.d.ts

@@ -8,5 +8,5 @@ export declare class FormBuilderConfigService implements IModuleConfigService {
     getDatabaseMode(): DatabaseMode;
     isMultiTenant(): boolean;
     getOptions(): FormBuilderModuleOptions;
-    getConfig(): import("../interfaces/form-builder-module.interface").IFormBuilderConfig;
+    getConfig(): import("..").IFormBuilderConfig | undefined;
 }

package/services/form-builder-datasource.provider.d.ts

@@ -15,6 +15,4 @@ export declare class FormBuilderDataSourceProvider extends MultiTenantDataSource
     private static buildParentOptions;
     getFormBuilderEntities(enableCompanyFeature?: boolean): Promise<any[]>;
     protected createDataSourceFromConfig(config: IDatabaseConfig): Promise<DataSource>;
-    protected getSingleDataSource(): Promise<DataSource>;
-    protected getOrCreateTenantConnection(tenant: ITenantDatabaseConfig): Promise<DataSource>;
 }

package/services/form-result.service.d.ts

@@ -1,22 +1,20 @@
-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';
-import { EntityTarget, SelectQueryBuilder } from 'typeorm';
+import { SelectQueryBuilder } from 'typeorm';
 import { CreateFormResultDto, SubmitFormDto, UpdateFormResultDto } from '../dtos/form-result.dto';
 import { FormResult } from '../entities';
 import { IFormResult } from '../interfaces/form-result.interface';
 import { FormBuilderConfigService } from './form-builder-config.service';
 import { FormBuilderDataSourceProvider } from './form-builder-datasource.provider';
-export declare class FormResultService extends RequestScopedApiService<CreateFormResultDto, UpdateFormResultDto, IFormResult, FormResult> {
+export declare class FormResultService extends ApiService<CreateFormResultDto, UpdateFormResultDto, IFormResult, FormResult> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly formBuilderConfig;
     private readonly dataSourceProvider;
     private formRepository;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, formBuilderConfig: FormBuilderConfigService, dataSourceProvider: FormBuilderDataSourceProvider);
-    protected resolveEntity(): EntityTarget<FormResult>;
-    protected getDataSourceProvider(): FormBuilderDataSourceProvider;
     private ensureFormRepositoryInitialized;
     private getActiveForm;
     private applyCompanyFilterToQuery;

package/services/form.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';
@@ -9,14 +9,12 @@ import { FormAccessType } from '../enums/form-access-type.enum';
 import { IForm, IPublicForm } from '../interfaces/form.interface';
 import { FormBuilderConfigService } from './form-builder-config.service';
 import { FormBuilderDataSourceProvider } from './form-builder-datasource.provider';
-export declare class FormService extends RequestScopedApiService<CreateFormDto, UpdateFormDto, IForm, Form> {
+export declare class FormService extends ApiService<CreateFormDto, UpdateFormDto, IForm, Form> {
     protected cacheManager: HybridCache;
     protected utilsService: UtilsService;
     private readonly formBuilderConfig;
-    private readonly dataSourceProvider;
     constructor(cacheManager: HybridCache, utilsService: UtilsService, formBuilderConfig: FormBuilderConfigService, dataSourceProvider: FormBuilderDataSourceProvider);
     protected resolveEntity(): EntityTarget<Form>;
-    protected getDataSourceProvider(): FormBuilderDataSourceProvider;
     convertSingleDtoToEntity(dto: CreateFormDto | UpdateFormDto, user: ILoggedUserInfo | null): Promise<Form>;
     getSelectQuery(query: SelectQueryBuilder<Form>, _user: ILoggedUserInfo | null, select?: string[]): Promise<{
         query: SelectQueryBuilder<Form>;