@node-c/persistance-rdb 1.0.0-alpha2 → 1.0.0-alpha20

package/README.md

@@ -1,4 +1,4 @@
 # Node-C / Persistance: RDB
-This is Node-C's package providing the functionality for relational databases. Currently, PostgreSQL and MySQL are supported.
+This is Node-C's package providing the functionality for relational databases that TypeORMDB can work with. Currently, PostgreSQL and MySQL are supported.
 
 The documentation can be found on the [Node-C Github repo homepage](https://github.com/RazorDude/node-c).

package/dist/common/definitions/common.constants.d.ts

@@ -1,4 +1,8 @@
 export declare enum Constants {
+    RDB_ENTITY_REPOSITORY = "RDB_ENTITY_REPOSITORY",
+    RDB_REPOSITORY_CONNECTION_NAME = "RDB_REPOSITORY_CONNECTION_NAME",
+    RDB_REPOSITORY_DATASOURCE = "RDB_REPOSITORY_DATASOURCE",
+    RDB_REPOSITORY_ENTITY_CLASS = "RDB_REPOSITORY_ENTITY_CLASS",
     SQL_BUILDER_DB_CONFIG_PATH = "SQL_BUILDER_DB_CONFIG_PATH",
     SQL_BUILDER_SERVICE_TOKEN_SUFFIX = "_SQL_BUILDER_SERVICE"
 }

package/dist/common/definitions/common.constants.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Constants = void 0;
 var Constants;
 (function (Constants) {
+    Constants["RDB_ENTITY_REPOSITORY"] = "RDB_ENTITY_REPOSITORY";
+    Constants["RDB_REPOSITORY_CONNECTION_NAME"] = "RDB_REPOSITORY_CONNECTION_NAME";
+    Constants["RDB_REPOSITORY_DATASOURCE"] = "RDB_REPOSITORY_DATASOURCE";
+    Constants["RDB_REPOSITORY_ENTITY_CLASS"] = "RDB_REPOSITORY_ENTITY_CLASS";
     Constants["SQL_BUILDER_DB_CONFIG_PATH"] = "SQL_BUILDER_DB_CONFIG_PATH";
     Constants["SQL_BUILDER_SERVICE_TOKEN_SUFFIX"] = "_SQL_BUILDER_SERVICE";
-})(Constants = exports.Constants || (exports.Constants = {}));
+})(Constants || (exports.Constants = Constants = {}));
 //# sourceMappingURL=common.constants.js.map

package/dist/common/definitions/common.constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.constants.js","sourceRoot":"","sources":["../../../src/common/definitions/common.constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAKX;AALD,WAAY,SAAS;IAEnB,sEAAyD,CAAA;IAEzD,sEAAyD,CAAA;AAC3D,CAAC,EALW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAKpB"}
+{"version":3,"file":"common.constants.js","sourceRoot":"","sources":["../../../src/common/definitions/common.constants.ts"],"names":[],"mappings":";;;AAAA,IAAY,SAaX;AAbD,WAAY,SAAS;IAEnB,4DAA+C,CAAA;IAE/C,8EAAiE,CAAA;IAEjE,oEAAuD,CAAA;IAEvD,wEAA2D,CAAA;IAE3D,sEAAyD,CAAA;IAEzD,sEAAyD,CAAA;AAC3D,CAAC,EAbW,SAAS,yBAAT,SAAS,QAapB"}

package/dist/{entityService → entity}/index.d.ts

@@ -1,2 +1,3 @@
-export * from './rdb.entity.service.definitions';
+export * from './rdb.entity.schema';
 export * from './rdb.entity.service';
+export * from './rdb.entity.service.definitions';

package/dist/{entityService → entity}/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./rdb.entity.service.definitions"), exports);
+__exportStar(require("./rdb.entity.schema"), exports);
 __exportStar(require("./rdb.entity.service"), exports);
+__exportStar(require("./rdb.entity.service.definitions"), exports);
 //# sourceMappingURL=index.js.map

package/dist/entity/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/entity/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,uDAAqC;AACrC,mEAAiD"}

package/dist/entity/rdb.entity.schema.d.ts

@@ -0,0 +1,10 @@
+export interface RDBEntitySchema {
+    options: {
+        columns: {
+            [columnName: string]: {
+                deleteDate?: boolean;
+                primary?: boolean;
+            } | undefined;
+        };
+    };
+}

package/dist/{module/rdb.module.definitions.js → entity/rdb.entity.schema.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=rdb.module.definitions.js.map
+//# sourceMappingURL=rdb.entity.schema.js.map

package/dist/entity/rdb.entity.schema.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rdb.entity.schema.js","sourceRoot":"","sources":["../../src/entity/rdb.entity.schema.ts"],"names":[],"mappings":""}

package/dist/entity/rdb.entity.service.d.ts

@@ -0,0 +1,39 @@
+import { GenericObject, PersistanceDeleteResult, PersistanceEntityService, PersistanceFindResults, PersistanceNumberItem, PersistanceUpdateResult } from '@node-c/core';
+import { RDBEntitySchema } from './rdb.entity.schema';
+import { BulkCreateOptions, BulkCreatePrivateOptions, CountOptions, CountPrivateOptions, CreateOptions, CreatePrivateOptions, DeleteOptions, DeletePrivateOptions, FindOneOptions, FindOnePrivateOptions, FindOptions, FindPrivateOptions, UpdateOptions, UpdatePrivateOptions } from './rdb.entity.service.definitions';
+import { RDBEntityManager, RDBRepository } from '../repository';
+import { ParsedFilter, SQLQueryBuilderService } from '../sqlQueryBuilder';
+export declare class RDBEntityService<Entity extends GenericObject<unknown>> extends PersistanceEntityService<Entity> {
+    protected qb: SQLQueryBuilderService;
+    protected repository: RDBRepository<Entity>;
+    protected schema: RDBEntitySchema;
+    protected columNames: string[];
+    protected deletedColumnName?: string;
+    protected primaryKeys: string[];
+    constructor(qb: SQLQueryBuilderService, repository: RDBRepository<Entity>, schema: RDBEntitySchema);
+    protected buildPrimaryKeyWhereClause(data: Entity[]): {
+        field: string;
+        value: ParsedFilter;
+    };
+    bulkCreate(data: Partial<Entity>[], options?: BulkCreateOptions, privateOptions?: BulkCreatePrivateOptions): Promise<Entity[]>;
+    count(options: CountOptions, privateOptions?: CountPrivateOptions): Promise<number | undefined>;
+    create(data: Partial<Entity>, options?: CreateOptions, privateOptions?: CreatePrivateOptions): Promise<Entity>;
+    delete(options: DeleteOptions, privateOptions?: DeletePrivateOptions): Promise<PersistanceDeleteResult<Entity>>;
+    find(options: FindOptions, privateOptions?: FindPrivateOptions): Promise<PersistanceFindResults<Entity>>;
+    findOne(options: FindOneOptions, privateOptions?: FindOnePrivateOptions): Promise<Entity | null>;
+    getEntityTarget(): unknown;
+    protected getRepository(transactionManager?: RDBEntityManager): RDBRepository<Entity>;
+    protected processManyToMany(data: {
+        counterpartColumn: string;
+        currentEntityColumn: string;
+        id: number;
+        items: PersistanceNumberItem[];
+        tableName: string;
+    }, options?: {
+        transactionManager?: RDBEntityManager;
+    }): Promise<void>;
+    protected save<Data = unknown, ReturnData = unknown>(data: Data, transactionManager?: RDBEntityManager, options?: {
+        processObjectAllowedFieldsEnabled?: boolean;
+    }): Promise<ReturnData>;
+    update(data: Entity, options: UpdateOptions, privateOptions?: UpdatePrivateOptions): Promise<PersistanceUpdateResult<Entity>>;
+}

package/dist/entity/rdb.entity.service.definitions.d.ts

@@ -0,0 +1,28 @@
+import { PersistanceBulkCreatePrivateOptions, PersistanceCountOptions, PersistanceCountPrivateOptions, PersistanceCreatePrivateOptions, PersistanceDeleteOptions, PersistanceDeletePrivateOptions, PersistanceFindOneOptions, PersistanceFindOnePrivateOptions, PersistanceFindOptions, PersistanceFindPrivateOptions, PersistanceUpdateOptions, PersistanceUpdatePrivateOptions } from '@node-c/core';
+import { RDBEntityManager } from '../repository';
+export interface BaseOptions {
+    forceTransaction?: boolean;
+    transactionManager?: RDBEntityManager;
+}
+export type BulkCreateOptions = BaseOptions;
+export type BulkCreatePrivateOptions = PersistanceBulkCreatePrivateOptions;
+export interface CountOptions extends BaseOptions, PersistanceCountOptions {
+}
+export type CountPrivateOptions = PersistanceCountPrivateOptions;
+export type CreateOptions = BaseOptions;
+export type CreatePrivateOptions = PersistanceCreatePrivateOptions;
+export interface DeleteOptions extends BaseOptions, PersistanceDeleteOptions {
+}
+export type DeletePrivateOptions = PersistanceDeletePrivateOptions;
+export interface FindOneOptions extends BaseOptions, PersistanceFindOneOptions {
+}
+export type FindOnePrivateOptions = PersistanceFindOnePrivateOptions;
+export interface FindOptions extends BaseOptions, PersistanceFindOptions {
+}
+export type FindPrivateOptions = PersistanceFindPrivateOptions;
+export declare enum PostgresErrorCode {
+    UniqueViolation = "23505"
+}
+export interface UpdateOptions extends BaseOptions, PersistanceUpdateOptions {
+}
+export type UpdatePrivateOptions = PersistanceUpdatePrivateOptions;

package/dist/{entityService → entity}/rdb.entity.service.definitions.js

@@ -4,5 +4,5 @@ exports.PostgresErrorCode = void 0;
 var PostgresErrorCode;
 (function (PostgresErrorCode) {
     PostgresErrorCode["UniqueViolation"] = "23505";
-})(PostgresErrorCode = exports.PostgresErrorCode || (exports.PostgresErrorCode = {}));
+})(PostgresErrorCode || (exports.PostgresErrorCode = PostgresErrorCode = {}));
 //# sourceMappingURL=rdb.entity.service.definitions.js.map

package/dist/entity/rdb.entity.service.definitions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rdb.entity.service.definitions.js","sourceRoot":"","sources":["../../src/entity/rdb.entity.service.definitions.ts"],"names":[],"mappings":";;;AA8CA,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAE3B,8CAAyB,CAAA;AAC3B,CAAC,EAHW,iBAAiB,iCAAjB,iBAAiB,QAG5B"}

package/dist/{entityService → entity}/rdb.entity.service.js

@@ -14,18 +14,25 @@ const core_1 = require("@node-c/core");
 const rdb_entity_service_definitions_1 = require("./rdb.entity.service.definitions");
 class RDBEntityService extends core_1.PersistanceEntityService {
     constructor(qb, repository, schema) {
-        var _a;
         super();
         this.qb = qb;
         this.repository = repository;
         this.schema = schema;
         const { columns } = schema.options;
         const primaryKeys = [];
+        let deletedColumnName;
+        this.columNames = [];
         for (const columnName in columns) {
-            if ((_a = columns[columnName]) === null || _a === void 0 ? void 0 : _a.primary) {
+            const { deleteDate, primary } = columns[columnName] || {};
+            this.columNames.push(columnName);
+            if (primary) {
                 primaryKeys.push(columnName);
             }
+            if (!deletedColumnName && deleteDate) {
+                deletedColumnName = columnName;
+            }
         }
+        this.deletedColumnName = deletedColumnName;
         this.primaryKeys = primaryKeys;
     }
     buildPrimaryKeyWhereClause(data) {
@@ -55,91 +62,115 @@ class RDBEntityService extends core_1.PersistanceEntityService {
         });
         return { field: core_1.PersistanceSelectOperator.Or, value: { params, query: `(${query.join(' or ')})` } };
     }
-    bulkCreate(data, options) {
+    bulkCreate(data, options, privateOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const actualOptions = Object.assign(options || {});
+            const actualOptions = options || {};
+            const actualPrivateOptions = privateOptions || {};
             const { forceTransaction, transactionManager } = actualOptions;
+            const { processInputAllowedFieldsEnabled } = actualPrivateOptions;
             if (!transactionManager && forceTransaction) {
                 return this.repository.manager.transaction(tm => {
-                    return this.bulkCreate(data, Object.assign(Object.assign({}, actualOptions), { transactionManager: tm }));
+                    return this.bulkCreate(data, Object.assign(Object.assign({}, actualOptions), { transactionManager: tm }), actualPrivateOptions);
                 });
             }
-            return yield this.save(data, transactionManager);
+            return yield this.save(data, transactionManager, {
+                processObjectAllowedFieldsEnabled: processInputAllowedFieldsEnabled
+            });
         });
     }
-    create(data, options) {
+    count(options, privateOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const actualOptions = Object.assign(options || {});
-            const { forceTransaction, transactionManager } = actualOptions;
+            const { filters, forceTransaction, transactionManager, withDeleted = false } = options;
+            const actualPrivateOptions = privateOptions || {};
             if (!transactionManager && forceTransaction) {
                 return this.repository.manager.transaction(tm => {
-                    return this.create(data, Object.assign(Object.assign({}, actualOptions), { transactionManager: tm }));
+                    return this.count(Object.assign(Object.assign({}, options), { transactionManager: tm }), actualPrivateOptions);
                 });
             }
-            try {
-                return yield this.save(data, transactionManager);
-            }
-            catch (e) {
-                const error = e;
-                if (error.code === rdb_entity_service_definitions_1.PostgresErrorCode.UniqueViolation) {
-                    const extractVariableName = new RegExp(/^Key \((.*)\)\=(.*)$/g);
-                    const result = extractVariableName.exec(error.detail);
-                    throw new core_1.ApplicationError(`${error.table}: ${result ? result[1] : 'a column value you have provided'} needs to be unique`);
-                }
-                throw e;
+            const { processFiltersAllowedFieldsEnabled } = actualPrivateOptions;
+            const entityName = this.repository.metadata.name;
+            const tableName = this.repository.metadata.name;
+            const queryBuilder = this.getRepository(transactionManager).createQueryBuilder(entityName);
+            const parsedFilters = (yield this.processObjectAllowedFields(filters, {
+                allowedFields: this.columNames,
+                isEnabled: processFiltersAllowedFieldsEnabled,
+                objectType: core_1.ProcessObjectAllowedFieldsType.Filters
+            }));
+            if (!Object.keys(parsedFilters).length) {
+                throw new core_1.ApplicationError('At least one filter field for counting is required.');
             }
+            const { where, include: includeFromFilters } = this.qb.parseFilters(tableName, parsedFilters);
+            const include = this.qb.parseRelations(tableName, [], includeFromFilters);
+            this.qb.buildQuery(queryBuilder, {
+                deletedColumnName: this.deletedColumnName,
+                include,
+                where,
+                withDeleted
+            });
+            return yield queryBuilder.getCount();
         });
     }
-    count(options) {
+    create(data, options, privateOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { filters, forceTransaction, transactionManager, withDeleted = false } = options;
+            const actualOptions = options || {};
+            const actualPrivateOptions = privateOptions || {};
+            const { forceTransaction, transactionManager } = actualOptions;
             if (!transactionManager && forceTransaction) {
                 return this.repository.manager.transaction(tm => {
-                    return this.count(Object.assign(Object.assign({}, options), { transactionManager: tm }));
+                    return this.create(data, Object.assign(Object.assign({}, actualOptions), { transactionManager: tm }), actualPrivateOptions);
                 });
             }
-            const entityName = this.repository.metadata.name;
-            const tableName = this.repository.metadata.name;
-            const queryBuilder = this.getRepository(transactionManager).createQueryBuilder(entityName);
-            const { where, include: includeFromFilters } = this.qb.parseFilters(tableName, filters);
-            const include = this.qb.parseRelations(tableName, [], includeFromFilters);
-            this.qb.buildQuery(queryBuilder, { where, include, withDeleted });
-            return yield queryBuilder.getCount();
+            return yield this.save(data, transactionManager, {
+                processObjectAllowedFieldsEnabled: actualPrivateOptions.processInputAllowedFieldsEnabled
+            });
         });
     }
-    delete(options) {
+    delete(options, privateOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { filters, forceTransaction, transactionManager, softDelete = true } = options;
+            const { filters, forceTransaction, returnOriginalItems, transactionManager, softDelete = true } = options;
+            const actualPrivateOptions = privateOptions || {};
             if (!transactionManager && forceTransaction) {
                 return this.repository.manager.transaction(tm => {
-                    return this.delete(Object.assign(Object.assign({}, options), { transactionManager: tm }));
+                    return this.delete(Object.assign(Object.assign({}, options), { transactionManager: tm }), actualPrivateOptions);
                 });
             }
+            const { processFiltersAllowedFieldsEnabled } = actualPrivateOptions;
             const entityName = this.repository.metadata.name;
-            const tableName = this.repository.metadata.tableName;
+            const tableName = this.repository.metadata.name;
+            const dataToReturn = {};
             const deleteType = softDelete ? 'softDelete' : 'delete';
             const queryBuilder = this.getRepository(transactionManager).createQueryBuilder(entityName)[deleteType]();
-            const { where: parsedWhere, include } = this.qb.parseFilters(tableName, filters);
+            const parsedFilters = (yield this.processObjectAllowedFields(filters, {
+                allowedFields: this.columNames,
+                isEnabled: processFiltersAllowedFieldsEnabled,
+                objectType: core_1.ProcessObjectAllowedFieldsType.Filters
+            }));
+            if (!Object.keys(parsedFilters).length) {
+                throw new core_1.ApplicationError('At least one filter field for deletion is required.');
+            }
+            const { where: parsedWhere, include } = this.qb.parseFilters(tableName, parsedFilters);
             let where = {};
-            if (Object.keys(include).length) {
-                const findData = yield this.find({ filters, transactionManager });
+            if (Object.keys(include).length || returnOriginalItems) {
+                const findData = yield this.find({ filters: parsedFilters, transactionManager });
                 const { field, value } = this.buildPrimaryKeyWhereClause(findData.items);
                 where[field] = value;
+                dataToReturn.originalItems = findData.items;
             }
             else {
                 where = parsedWhere;
             }
-            this.qb.buildQuery(queryBuilder, { where });
+            this.qb.buildQuery(queryBuilder, { deletedColumnName: this.deletedColumnName, where });
             const result = yield queryBuilder.execute();
-            return { count: typeof result.affected === 'number' ? result.affected : undefined };
+            return Object.assign(Object.assign({}, dataToReturn), { count: typeof result.affected === 'number' ? result.affected : undefined });
         });
     }
-    find(options) {
+    find(options, privateOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { filters, forceTransaction, page: optPage, perPage: optPerPage, findAll: optFindAll, include: optRelations, orderBy: optOrderBy, transactionManager, withDeleted = false } = options;
+            const { filters, forceTransaction, getTotalCount = true, page: optPage, perPage: optPerPage, findAll: optFindAll, include: optRelations, orderBy: optOrderBy, transactionManager, withDeleted = false } = options;
+            const actualPrivateOptions = privateOptions || {};
             if (!transactionManager && forceTransaction) {
                 return this.repository.manager.transaction(tm => {
-                    return this.find(Object.assign(Object.assign({}, options), { transactionManager: tm }));
+                    return this.find(Object.assign(Object.assign({}, options), { transactionManager: tm }), actualPrivateOptions);
                 });
             }
             const page = optPage ? parseInt(optPage, 10) : 1;
@@ -147,13 +178,18 @@ class RDBEntityService extends core_1.PersistanceEntityService {
             const findAll = optFindAll === true || optFindAll === 'true';
             const findResults = { page: 1, perPage: 0, items: [], more: false };
             const entityName = this.repository.metadata.name;
+            const processedFilters = (yield this.processObjectAllowedFields(filters || {}, {
+                allowedFields: this.columNames,
+                isEnabled: actualPrivateOptions.processFiltersAllowedFieldsEnabled,
+                objectType: core_1.ProcessObjectAllowedFieldsType.Filters
+            }));
             const tableName = this.repository.metadata.name;
             const queryBuilder = this.getRepository(transactionManager).createQueryBuilder(entityName);
             let where = {};
             let include = {};
             let orderBy = [];
-            if (filters) {
-                const parsedFiltersData = this.qb.parseFilters(tableName, filters);
+            if (Object.keys(processedFilters).length) {
+                const parsedFiltersData = this.qb.parseFilters(tableName, processedFilters);
                 where = Object.assign({}, parsedFiltersData.where);
                 include = Object.assign({}, parsedFiltersData.include);
             }
@@ -163,7 +199,13 @@ class RDBEntityService extends core_1.PersistanceEntityService {
                 include = Object.assign(Object.assign({}, parsedOrderByData.include), include);
                 orderBy = [...parsedOrderByData.orderBy];
             }
-            this.qb.buildQuery(queryBuilder, { where, include, orderBy, withDeleted });
+            this.qb.buildQuery(queryBuilder, {
+                deletedColumnName: this.deletedColumnName,
+                where,
+                include,
+                orderBy,
+                withDeleted
+            });
             if (!findAll) {
                 queryBuilder.skip((page - 1) * perPage).take(perPage + 1);
                 findResults.page = page;
@@ -173,26 +215,40 @@ class RDBEntityService extends core_1.PersistanceEntityService {
             if (findAll) {
                 findResults.perPage = items.length;
             }
-            else if (items.length === perPage + 1) {
-                items.pop();
-                findResults.more = true;
+            else {
+                if (items.length === perPage + 1) {
+                    items.pop();
+                    findResults.more = true;
+                }
+                if (getTotalCount) {
+                    findResults.totalCount = yield this.count(Object.assign(Object.assign({}, options), { filters: processedFilters }));
+                }
             }
             findResults.items = items;
             return findResults;
         });
     }
-    findOne(options) {
+    findOne(options, privateOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             const { filters, forceTransaction, transactionManager, selectOperator, include: optRelations, orderBy: optOrderBy, withDeleted = false } = options;
+            const actualPrivateOptions = privateOptions || {};
             if (!transactionManager && forceTransaction) {
                 return this.repository.manager.transaction(tm => {
-                    return this.findOne(Object.assign(Object.assign({}, options), { transactionManager: tm }));
+                    return this.findOne(Object.assign(Object.assign({}, options), { transactionManager: tm }), actualPrivateOptions);
                 });
             }
             const entityName = this.repository.metadata.name;
             const tableName = this.repository.metadata.name;
             const queryBuilder = this.getRepository(transactionManager).createQueryBuilder(entityName);
-            const { where, include: includeFromFilters } = this.qb.parseFilters(tableName, filters, {
+            const parsedFilters = (yield this.processObjectAllowedFields(filters, {
+                allowedFields: this.columNames,
+                isEnabled: actualPrivateOptions.processFiltersAllowedFieldsEnabled,
+                objectType: core_1.ProcessObjectAllowedFieldsType.Filters
+            }));
+            if (!Object.keys(parsedFilters).length) {
+                throw new core_1.ApplicationError('At least one filter field is required for the findOne method.');
+            }
+            const { where, include: includeFromFilters } = this.qb.parseFilters(tableName, parsedFilters, {
                 operator: selectOperator,
                 isTopLevel: true
             });
@@ -202,7 +258,13 @@ class RDBEntityService extends core_1.PersistanceEntityService {
                 const parsedOrderByData = this.qb.parseOrderBy(tableName, optOrderBy);
                 orderBy = [...parsedOrderByData.orderBy];
             }
-            this.qb.buildQuery(queryBuilder, { where, include, orderBy, withDeleted });
+            this.qb.buildQuery(queryBuilder, {
+                deletedColumnName: this.deletedColumnName,
+                where,
+                include,
+                orderBy,
+                withDeleted
+            });
             return yield queryBuilder.getOne();
         });
     }
@@ -258,45 +320,91 @@ class RDBEntityService extends core_1.PersistanceEntityService {
             }
         });
     }
-    save(data, transactionManager) {
+    save(data, transactionManager, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (transactionManager) {
-                return (yield transactionManager.save(this.repository.target, data));
+            const { columNames, repository } = this;
+            const { processObjectAllowedFieldsEnabled } = options || {};
+            const dataToSave = yield this.processObjectAllowedFields(data, {
+                allowedFields: columNames,
+                isEnabled: processObjectAllowedFieldsEnabled,
+                objectType: core_1.ProcessObjectAllowedFieldsType.Input
+            });
+            try {
+                if (transactionManager) {
+                    return (yield transactionManager.save(repository.target, dataToSave));
+                }
+                return repository.save(dataToSave);
+            }
+            catch (e) {
+                const error = e;
+                if (error.code === rdb_entity_service_definitions_1.PostgresErrorCode.UniqueViolation) {
+                    const extractVariableName = new RegExp(/^Key \((.*)\)\=(.*)$/g);
+                    const result = extractVariableName.exec(error.detail);
+                    throw new core_1.ApplicationError(`${error.table}: ${result ? result[1] : 'a column value you have provided'} needs to be unique`);
+                }
+                throw e;
             }
-            return this.repository.save(data);
         });
     }
-    update(data, options) {
+    update(data, options, privateOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { filters, forceTransaction, returnData, transactionManager } = options;
+            const { columNames, repository } = this;
+            const { filters, forceTransaction, returnData, returnOriginalItems, transactionManager } = options;
+            const { processFiltersAllowedFieldsEnabled, processInputAllowedFieldsEnabled } = privateOptions || {};
             if (!transactionManager && forceTransaction) {
-                return this.repository.manager.transaction(tm => {
-                    return this.update(data, Object.assign(Object.assign({}, options), { transactionManager: tm }));
+                return repository.manager.transaction(tm => {
+                    return this.update(data, Object.assign(Object.assign({}, options), { transactionManager: tm }), privateOptions);
                 });
             }
-            const entityName = this.repository.metadata.name;
-            const tableName = this.repository.metadata.tableName;
+            const dataToUpdate = (yield this.processObjectAllowedFields(data, {
+                allowedFields: columNames,
+                isEnabled: processInputAllowedFieldsEnabled,
+                objectType: core_1.ProcessObjectAllowedFieldsType.Input
+            }));
+            if (!Object.keys(dataToUpdate).length) {
+                throw new core_1.ApplicationError('At least one field for update is required.');
+            }
+            const entityName = repository.metadata.name;
+            const tableName = repository.metadata.name;
+            const processedFilters = (yield this.processObjectAllowedFields(filters, {
+                allowedFields: this.columNames,
+                isEnabled: processFiltersAllowedFieldsEnabled,
+                objectType: core_1.ProcessObjectAllowedFieldsType.Filters
+            }));
+            if (!Object.keys(processedFilters).length) {
+                throw new core_1.ApplicationError('At least one filter field for update is required.');
+            }
             const queryBuilder = this.getRepository(transactionManager)
                 .createQueryBuilder(entityName)
                 .update()
-                .set(data);
-            const { where: parsedWhere, include } = this.qb.parseFilters(tableName, filters);
+                .set(dataToUpdate);
+            const { where: parsedWhere, include } = this.qb.parseFilters(tableName, processedFilters);
+            let originalItems = [];
             let where = {};
-            if (Object.keys(include).length) {
-                const findData = yield this.find({ filters, transactionManager });
+            if (Object.keys(include).length || returnOriginalItems) {
+                const findData = yield this.find({ filters: processedFilters, transactionManager });
                 const { field, value } = this.buildPrimaryKeyWhereClause(findData.items);
+                originalItems = findData.items;
                 where[field] = value;
             }
             else {
                 where = parsedWhere;
             }
-            this.qb.buildQuery(queryBuilder, { where });
+            this.qb.buildQuery(queryBuilder, { deletedColumnName: this.deletedColumnName, where });
+            const dataToReturn = {};
+            if (returnOriginalItems) {
+                dataToReturn.originalItems = originalItems;
+            }
             if (returnData) {
                 const result = yield queryBuilder.returning('*').execute();
-                return { items: result.raw };
+                dataToReturn.count = result.raw.length;
+                dataToReturn.items = result.raw;
             }
-            const result = yield queryBuilder.execute();
-            return { count: typeof result.affected === 'number' ? result.affected : undefined };
+            else {
+                const result = yield queryBuilder.execute();
+                dataToReturn.count = typeof result.affected === 'number' ? result.affected : undefined;
+            }
+            return dataToReturn;
         });
     }
 }

package/dist/entity/rdb.entity.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rdb.entity.service.js","sourceRoot":"","sources":["../../src/entity/rdb.entity.service.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from './common/definitions';
-export * from './entityService';
-export * from './module';
+export * from './entity';
+export * from './ormQueryBuilder';
 export * from './repository';
 export * from './sqlQueryBuilder';

package/dist/index.js

@@ -15,8 +15,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./common/definitions"), exports);
-__exportStar(require("./entityService"), exports);
-__exportStar(require("./module"), exports);
+__exportStar(require("./entity"), exports);
+__exportStar(require("./ormQueryBuilder"), exports);
 __exportStar(require("./repository"), exports);
 __exportStar(require("./sqlQueryBuilder"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,kDAAgC;AAChC,2CAAyB;AACzB,+CAA6B;AAC7B,oDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,2CAAyB;AACzB,oDAAkC;AAClC,+CAA6B;AAC7B,oDAAkC"}

package/dist/ormQueryBuilder/index.d.ts

@@ -0,0 +1 @@
+export * from './rdb.ormQueryBuilder';

package/dist/{module → ormQueryBuilder}/index.js

@@ -14,6 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./rdb.module.definitions"), exports);
-__exportStar(require("./rdb.module"), exports);
+__exportStar(require("./rdb.ormQueryBuilder"), exports);
 //# sourceMappingURL=index.js.map