@flusys/nestjs-shared 1.1.0 → 1.2.0-rc.1

package/cjs/classes/api-service.class.js

@@ -8,9 +8,14 @@ Object.defineProperty(exports, "ApiService", {
         return ApiService;
     }
 });
-const _errorhandlerutil = require("../utils/error-handler.util");
 const _common = require("@nestjs/common");
 const _typeorm = require("typeorm");
+const _constants = require("../constants");
+const _logactiondecorator = require("../decorators/log-action.decorator");
+const _dtos = require("../dtos");
+const _interfaces = require("../interfaces");
+const _utilsservice = require("../modules/utils/utils.service");
+const _hybridcacheclass = require("./hybrid-cache.class");
 function _define_property(obj, key, value) {
     if (key in obj) {
         Object.defineProperty(obj, key, {
@@ -24,13 +29,47 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
+function _ts_decorate(decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for(var i = decorators.length - 1; i >= 0; i--)if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+function _ts_metadata(k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+}
 let ApiService = class ApiService {
+    resolveEntity() {
+        return this._entity;
+    }
+    getDataSourceProvider() {
+        return this._dataSourceProvider;
+    }
+    async ensureDataSourceRepository() {
+        if (!this.repositoryInitialized) {
+            const entity = this.resolveEntity();
+            const provider = this.getDataSourceProvider();
+            this.repository = await provider.getRepository(entity);
+            this.repositoryInitialized = true;
+        }
+    }
+    async resolveRepositories(entities) {
+        const provider = this.getDataSourceProvider();
+        const repositories = [];
+        for (const entity of entities){
+            repositories.push(await provider.getRepository(entity));
+        }
+        return repositories;
+    }
+    async getDataSourceForService() {
+        return this.getDataSourceProvider().getDataSource();
+    }
     async insert(dto, user) {
         return this.executeInTransaction('insert', async (qr)=>{
             await this.beforeInsertOperation(dto, user, qr);
             const entities = await this.convertRequestDtoToEntity(dto, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterInsertOperation(this.ensureArray(saved), user, qr);
+            await this.afterInsertOperation(this.ensureArray(saved), dto, user, qr);
             return {
                 saved,
                 returnFirst: true
@@ -42,7 +81,7 @@ let ApiService = class ApiService {
             await this.beforeInsertOperation(dtos, user, qr);
             const entities = await this.convertRequestDtoToEntity(dtos, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterInsertOperation(this.ensureArray(saved), user, qr);
+            await this.afterInsertOperation(this.ensureArray(saved), dtos, user, qr);
             return {
                 saved,
                 returnFirst: false
@@ -54,7 +93,7 @@ let ApiService = class ApiService {
             await this.beforeUpdateOperation(dto, user, qr);
             const entities = await this.convertRequestDtoToEntity(dto, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterUpdateOperation(this.ensureArray(saved), user, qr);
+            await this.afterUpdateOperation(this.ensureArray(saved), dto, user, qr);
             return {
                 saved,
                 returnFirst: true
@@ -66,21 +105,45 @@ let ApiService = class ApiService {
             await this.beforeUpdateOperation(dtos, user, qr);
             const entities = await this.convertRequestDtoToEntity(dtos, user);
             const saved = await qr.manager.save(this.repository.target, entities);
-            await this.afterUpdateOperation(this.ensureArray(saved), user, qr);
+            await this.afterUpdateOperation(this.ensureArray(saved), dtos, user, qr);
             return {
                 saved,
                 returnFirst: false
             };
         });
     }
-    async findByIds(ids, user) {
-        await this.ensureRepositoryInitialized();
+    async bulkUpsert(toInsert, toUpdate, user) {
+        return this.executeInTransaction('bulkUpsert', async (qr)=>{
+            const allResults = [];
+            if (toInsert.length > 0) {
+                await this.beforeInsertOperation(toInsert, user, qr);
+                const insertedEntities = await this.convertRequestDtoToEntity(toInsert, user);
+                const insertedSaved = await qr.manager.save(this.repository.target, insertedEntities);
+                await this.afterInsertOperation(this.ensureArray(insertedSaved), toInsert, user, qr);
+                allResults.push(...this.ensureArray(insertedSaved));
+            }
+            if (toUpdate.length > 0) {
+                await this.beforeUpdateOperation(toUpdate, user, qr);
+                const updatedEntities = await this.convertRequestDtoToEntity(toUpdate, user);
+                const updatedSaved = await qr.manager.save(this.repository.target, updatedEntities);
+                await this.afterUpdateOperation(this.ensureArray(updatedSaved), toUpdate, user, qr);
+                allResults.push(...this.ensureArray(updatedSaved));
+            }
+            return {
+                saved: allResults,
+                returnFirst: false
+            };
+        });
+    }
+    async findByIds(ids, user, select) {
+        await this.ensureDataSourceRepository();
         try {
             const query = this.repository.createQueryBuilder(this.entityName);
             query.where({
                 id: (0, _typeorm.In)(ids)
             });
-            const { query: finalQuery, isRaw } = await this.getSelectQuery(query, user);
+            const selectArray = typeof select === 'string' ? select.split(',').map((s)=>s.trim()) : select;
+            const { query: finalQuery, isRaw } = await this.getSelectQuery(query, user, selectArray);
             let output;
             if (isRaw) {
                 output = await finalQuery.getRawMany();
@@ -88,7 +151,10 @@ let ApiService = class ApiService {
                 output = await finalQuery.getMany();
             }
             const result = this.convertEntityListToResponseListDto(output, isRaw);
-            if (!result || !result.length) throw new _common.NotFoundException('No Data Found');
+            if (!result || !result.length) throw new _common.NotFoundException({
+                message: 'No Data Found',
+                messageKey: _constants.ERROR_MESSAGES.NOT_FOUND
+            });
             return result;
         } catch (error) {
             if (error instanceof _common.NotFoundException) {
@@ -98,7 +164,7 @@ let ApiService = class ApiService {
         }
     }
     async findById(id, user, select) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         try {
             const query = this.repository.createQueryBuilder(this.entityName);
             query.where({
@@ -112,15 +178,17 @@ let ApiService = class ApiService {
                 result = await this.cacheManager.get(cacheKey);
             }
             if (!result) {
-                let output;
                 if (isRaw) {
-                    output = await finalQuery.getRawMany();
-                    const convertResult = this.convertEntityListToResponseListDto(output, isRaw);
+                    const rawOutput = await finalQuery.getRawMany();
+                    const convertResult = this.convertEntityListToResponseListDto(rawOutput, isRaw);
                     if (convertResult.length) result = convertResult[0];
                 } else {
-                    output = await finalQuery.getOne();
-                    if (!output) throw new _common.NotFoundException('No Data Found');
-                    result = this.convertEntityToResponseDto(output, false);
+                    const singleOutput = await finalQuery.getOne();
+                    if (!singleOutput) throw new _common.NotFoundException({
+                        message: 'No Data Found',
+                        messageKey: _constants.ERROR_MESSAGES.NOT_FOUND
+                    });
+                    result = this.convertEntityToResponseDto(singleOutput, false);
                 }
                 if (this.isCacheable) {
                     await this.cacheManager.set(cacheKey, result);
@@ -136,43 +204,34 @@ let ApiService = class ApiService {
         }
     }
     async getAll(search, filterAndPaginationDto, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         try {
             let data;
             let total;
             let isRaw = false;
             let query = this.repository.createQueryBuilder(this.entityName);
-            // Apply filters
             if (filterAndPaginationDto.filter) {
                 const { query: filterQuery, isRaw: filterIsRaw } = await this.getFilterQuery(query, filterAndPaginationDto.filter, user);
                 query = filterQuery;
                 isRaw = isRaw || filterIsRaw;
             }
-            // Apply search
             if (search) {
                 const { query: searchQuery, isRaw: searchIsRaw } = await this.getGlobalSearchQuery(query, search, user);
                 query = searchQuery;
                 isRaw = isRaw || searchIsRaw;
             }
-            // Apply select
-            if (filterAndPaginationDto.select) {
-                const { query: selectQuery, isRaw: selectIsRaw } = await this.getSelectQuery(query, user, filterAndPaginationDto.select);
-                query = selectQuery;
-                isRaw = isRaw || selectIsRaw;
-            }
-            // Apply sort
+            const { query: selectQuery, isRaw: selectIsRaw } = await this.getSelectQuery(query, user, filterAndPaginationDto.select);
+            query = selectQuery;
+            isRaw = isRaw || selectIsRaw;
             if (filterAndPaginationDto.sort) {
                 const { query: sortQuery, isRaw: sortIsRaw } = await this.getSortQuery(query, filterAndPaginationDto.sort, user);
                 query = sortQuery;
                 isRaw = isRaw || sortIsRaw;
             }
-            // Include soft-deleted if requested
             if (filterAndPaginationDto.withDeleted) query.withDeleted();
-            // Extra manipulation
             const { query: extraQuery, isRaw: extraIsRaw } = await this.getExtraManipulateQuery(query, filterAndPaginationDto, user);
             query = extraQuery;
             isRaw = isRaw || extraIsRaw;
-            // Pagination
             if (filterAndPaginationDto.pagination) {
                 const offset = filterAndPaginationDto.pagination.currentPage * filterAndPaginationDto.pagination.pageSize;
                 const limit = filterAndPaginationDto.pagination.pageSize;
@@ -182,7 +241,6 @@ let ApiService = class ApiService {
                     query.skip(offset).take(limit);
                 }
             }
-            // Generate cache key
             let cacheKey = '';
             if (this.isCacheable) {
                 cacheKey = this.utilsService.getCacheKey(this.entityName, {
@@ -196,8 +254,9 @@ let ApiService = class ApiService {
                 }
             }
             if (isRaw) {
-                // Handle raw query count manually
-                const rawSubQuery = query.clone().offset(undefined).limit(undefined).distinct(true);
+                const rawSubQuery = query.clone().offset(undefined).limit(undefined);
+                rawSubQuery.expressionMap.orderBys = {};
+                rawSubQuery.distinct(true);
                 const countSql = `
             SELECT COUNT(*) as count
             FROM (
@@ -208,10 +267,20 @@ let ApiService = class ApiService {
           `;
                 const parameters = rawSubQuery.getParameters();
                 const orderedValues = [];
+                const isPostgres = this.repository.manager.connection.options.type === 'postgres';
+                let paramIndex = 0;
                 const convertedQuery = countSql.replace(/:(\w+)/g, (_, key)=>{
-                    if (!(key in parameters)) throw new Error(`Missing parameter value for: ${key}`);
+                    if (!(key in parameters)) {
+                        throw new _common.InternalServerErrorException({
+                            message: `Missing parameter value for: ${key}`,
+                            messageKey: _constants.SYSTEM_MESSAGES.MISSING_PARAMETER,
+                            messageVariables: {
+                                key
+                            }
+                        });
+                    }
                     orderedValues.push(parameters[key]);
-                    return '?';
+                    return isPostgres ? `$${++paramIndex}` : '?';
                 });
                 const result = await this.repository.query(convertedQuery, orderedValues);
                 total = Number(result[0]?.count || 0);
@@ -234,7 +303,7 @@ let ApiService = class ApiService {
         }
     }
     async delete(option, user) {
-        await this.ensureRepositoryInitialized();
+        await this.ensureDataSourceRepository();
         const queryRunner = this.repository.manager.connection.createQueryRunner();
         await queryRunner.connect();
         await queryRunner.startTransaction();
@@ -260,13 +329,12 @@ let ApiService = class ApiService {
                     id
                 };
             });
-            await this.afterDeleteOperation(ids, user, queryRunner);
+            await this.afterDeleteOperation(ids, option, user, queryRunner);
             await queryRunner.commitTransaction();
             await Promise.all([
                 this.clearCacheForAll(),
                 this.clearCacheForId(ids)
             ]);
-            // return null per IService contract
             return null;
         } catch (error) {
             await queryRunner.rollbackTransaction();
@@ -275,28 +343,28 @@ let ApiService = class ApiService {
             await queryRunner.release();
         }
     }
-    // Caching
     async clearCacheForAll() {
         await this.utilsService.clearCache(this.entityName, this.cacheManager);
     }
     async clearCacheForId(entities) {
         await Promise.all(entities.map((item)=>this.utilsService.clearCache(this.entityName, this.cacheManager, item.id)));
     }
-    /**
-   * Helper method to handle errors with proper logging and type safety
-   */ handleError(error, operation) {
-        _errorhandlerutil.ErrorHandler.logError(this.logger, error, operation, {
-            entity: this.entityName
+    handleError(error, _operation) {
+        if (error instanceof Error) {
+            throw error;
+        }
+        throw new _common.InternalServerErrorException({
+            message: typeof error === 'string' ? error : 'Unknown error',
+            messageKey: _constants.ERROR_MESSAGES.INTERNAL
         });
-        _errorhandlerutil.ErrorHandler.rethrowError(error);
     }
-    /** Ensures value is always an array */ ensureArray(value) {
+    ensureArray(value) {
         return Array.isArray(value) ? value : [
             value
         ];
     }
-    /** Executes operation in transaction with automatic cache clearing */ async executeInTransaction(operation, fn) {
-        await this.ensureRepositoryInitialized();
+    async executeInTransaction(operation, fn) {
+        await this.ensureDataSourceRepository();
         const qr = this.repository.manager.connection.createQueryRunner();
         await qr.connect();
         await qr.startTransaction();
@@ -321,14 +389,12 @@ let ApiService = class ApiService {
             await qr.release();
         }
     }
-    // Hooks (override in child classes)
-    async ensureRepositoryInitialized() {}
     async beforeInsertOperation(_dto, _user, _queryRunner) {}
-    async afterInsertOperation(_entity, _user, _queryRunner) {}
+    async afterInsertOperation(_entity, _dto, _user, _queryRunner) {}
     async beforeUpdateOperation(_dto, _user, _queryRunner) {}
-    async afterUpdateOperation(_entity, _user, _queryRunner) {}
+    async afterUpdateOperation(_entity, _dto, _user, _queryRunner) {}
     async beforeDeleteOperation(_dto, _user, _queryRunner) {}
-    async afterDeleteOperation(_entity, _user, _queryRunner) {}
+    async afterDeleteOperation(_entity, _dto, _user, _queryRunner) {}
     async getFilterQuery(query, filter, _user) {
         Object.entries(filter).forEach(([key, value])=>{
             query.andWhere(`${this.entityName}.${key} = :value`, {
@@ -371,7 +437,6 @@ let ApiService = class ApiService {
             isRaw: false
         };
     }
-    // DTO conversion
     async convertRequestDtoToEntity(dto, user) {
         return Array.isArray(dto) ? await this.convertArrayDtoToEntities(dto, user) : [
             await this.convertSingleDtoToEntity(dto, user)
@@ -385,7 +450,10 @@ let ApiService = class ApiService {
                     id: d.id
                 }
             });
-            if (!existing) throw new _common.NotFoundException('No such entity data found for update! Please, Try Again.');
+            if (!existing) throw new _common.NotFoundException({
+                message: 'No such entity data found for update! Please, Try Again.',
+                messageKey: _constants.ERROR_MESSAGES.NOT_FOUND
+            });
             return Object.assign(existing, d);
         }
         delete d.id;
@@ -398,26 +466,113 @@ let ApiService = class ApiService {
         return Object.assign({}, entity);
     }
     convertEntityListToResponseListDto(entities, _isRaw) {
-        return entities.map((entity)=>Object.assign({}, entity));
+        return entities.map((entity)=>this.convertEntityToResponseDto(entity, _isRaw));
     }
     async getEntityClass() {
-        return await this.repository.create();
+        return this.repository.create();
     }
-    constructor(entityName, repository, cacheManager, utilsService, loggerName, isCacheable = false){
+    constructor(entityName, cacheManager, utilsService, _loggerName, isCacheable = false, moduleName, entity, dataSourceProvider){
         _define_property(this, "entityName", void 0);
-        _define_property(this, "repository", void 0);
         _define_property(this, "cacheManager", void 0);
         _define_property(this, "utilsService", void 0);
-        _define_property(this, "loggerName", void 0);
+        _define_property(this, "_loggerName", void 0);
         _define_property(this, "isCacheable", void 0);
-        _define_property(this, "logger", void 0);
+        _define_property(this, "moduleName", void 0);
+        _define_property(this, "repository", void 0);
+        _define_property(this, "repositoryInitialized", void 0);
+        _define_property(this, "_entity", void 0);
+        _define_property(this, "_dataSourceProvider", void 0);
         this.entityName = entityName;
-        this.repository = repository;
         this.cacheManager = cacheManager;
         this.utilsService = utilsService;
-        this.loggerName = loggerName;
+        this._loggerName = _loggerName;
         this.isCacheable = isCacheable;
-        this.logger = new _common.Logger('ApiService');
-        this.logger = new _common.Logger(loggerName);
+        this.moduleName = moduleName;
+        this.repositoryInitialized = false;
+        this._entity = entity;
+        this._dataSourceProvider = dataSourceProvider;
     }
 };
+_ts_decorate([
+    (0, _logactiondecorator.LogAction)({
+        action: 'create'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof CreateDtoT === "undefined" ? Object : CreateDtoT,
+        Object
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ApiService.prototype, "insert", null);
+_ts_decorate([
+    (0, _logactiondecorator.LogAction)({
+        action: 'createMany'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof Array === "undefined" ? Object : Array,
+        Object
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ApiService.prototype, "insertMany", null);
+_ts_decorate([
+    (0, _logactiondecorator.LogAction)({
+        action: 'update'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof UpdateDtoT === "undefined" ? Object : UpdateDtoT,
+        Object
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ApiService.prototype, "update", null);
+_ts_decorate([
+    (0, _logactiondecorator.LogAction)({
+        action: 'updateMany'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        Array,
+        Object
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ApiService.prototype, "updateMany", null);
+_ts_decorate([
+    (0, _logactiondecorator.LogAction)({
+        action: 'bulkUpsert'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        Array,
+        Array,
+        Object
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ApiService.prototype, "bulkUpsert", null);
+_ts_decorate([
+    (0, _logactiondecorator.LogAction)({
+        action: 'delete'
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        typeof _dtos.DeleteDto === "undefined" ? Object : _dtos.DeleteDto,
+        Object
+    ]),
+    _ts_metadata("design:returntype", Promise)
+], ApiService.prototype, "delete", null);
+ApiService = _ts_decorate([
+    (0, _common.Injectable)({
+        scope: _common.Scope.REQUEST
+    }),
+    _ts_metadata("design:type", Function),
+    _ts_metadata("design:paramtypes", [
+        String,
+        typeof _hybridcacheclass.HybridCache === "undefined" ? Object : _hybridcacheclass.HybridCache,
+        typeof _utilsservice.UtilsService === "undefined" ? Object : _utilsservice.UtilsService,
+        String,
+        Boolean,
+        String,
+        typeof _typeorm.EntityTarget === "undefined" ? Object : _typeorm.EntityTarget,
+        typeof _interfaces.IDataSourceProvider === "undefined" ? Object : _interfaces.IDataSourceProvider
+    ])
+], ApiService);

package/cjs/classes/handle-custome-db.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get buildQuery () {
+        return buildQuery;
+    },
+    get getCastIntType () {
+        return getCastIntType;
+    },
+    get getJsonColumnType () {
+        return getJsonColumnType;
+    }
+});
+const _nestjscore = require("@flusys/nestjs-core");
+function getJsonColumnType() {
+    const driver = _nestjscore.envConfig.getTypeOrmConfig().type;
+    if (driver === 'postgres') return 'jsonb';
+    if (driver === 'mysql') return 'json';
+    return 'simple-json';
+}
+function getCastIntType() {
+    const driver = _nestjscore.envConfig.getTypeOrmConfig().type;
+    return driver === 'postgres' ? 'INTEGER' : 'UNSIGNED';
+}
+function buildQuery(sql, dbType) {
+    if (dbType !== 'postgres') return sql;
+    let index = 0;
+    return sql.replace(/\?/g, ()=>`$${++index}`);
+}

package/cjs/classes/index.js

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 _export_star(require("./api-controller.class"), exports);
 _export_star(require("./api-service.class"), exports);
-_export_star(require("./request-scoped-api.service"), exports);
+_export_star(require("./handle-custome-db"), exports);
 _export_star(require("./hybrid-cache.class"), exports);
-_export_star(require("./winston-logger-adapter.class"), exports);
 _export_star(require("./winston.logger.class"), exports);
 _export_star(require("../constants/permissions"), exports);
 function _export_star(from, to) {