@steroidsjs/nest 1.0.15 → 1.1.3

package/usecases/base/SearchQuery.d.ts

@@ -0,0 +1,17 @@
+import { ICondition } from '../../infrastructure/helpers/ConditionHelper';
+import { Repository } from 'typeorm';
+import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
+export interface IQueryRelation {
+    name: string;
+    alias?: string;
+    isId?: boolean;
+}
+export default class SearchQuery {
+    select?: string[];
+    excludeSelect?: string[];
+    relations?: IQueryRelation[];
+    condition?: ICondition;
+    static createFromSchema(SchemaClass: any): SearchQuery;
+    static prepare(dbRepository: Repository<any>, dbQuery: SelectQueryBuilder<any>, searchQuery: SearchQuery): void;
+    constructor(data?: SearchQuery);
+}

package/usecases/base/SearchQuery.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const MetaHelper_1 = require("../../infrastructure/helpers/MetaHelper");
+const ConditionHelper_1 = require("../../infrastructure/helpers/ConditionHelper");
+class SearchQuery {
+    constructor(data = {}) {
+        this.select = data.select;
+        this.excludeSelect = data.excludeSelect;
+        this.relations = data.relations;
+        this.condition = data.condition;
+    }
+    static createFromSchema(SchemaClass) {
+        return new SearchQuery(MetaHelper_1.MetaHelper.getSchemaQueryData(SchemaClass));
+    }
+    static prepare(dbRepository, dbQuery, searchQuery) {
+        const prefix = dbQuery.expressionMap.mainAlias.name + '.';
+        let select = searchQuery.select;
+        if (searchQuery.excludeSelect) {
+            select = dbRepository.metadata.columns
+                .map(column => column.propertyName)
+                .filter(name => !searchQuery.excludeSelect.includes(name));
+        }
+        if (select) {
+            dbQuery.select(select.map(name => prefix + name));
+        }
+        (searchQuery.relations || []).forEach(relation => {
+            if (relation.isId) {
+                dbQuery.loadRelationIdAndMap(prefix + (relation.alias || relation.name), prefix + relation.name);
+            }
+            else {
+                dbQuery.leftJoinAndSelect(prefix + relation.name, prefix + relation.name);
+            }
+        });
+        if (searchQuery.condition) {
+            dbQuery.andWhere(ConditionHelper_1.ConditionHelper.toTypeOrm(searchQuery.condition));
+        }
+    }
+}
+exports.default = SearchQuery;
+//# sourceMappingURL=SearchQuery.js.map

package/usecases/base/SearchQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SearchQuery.js","sourceRoot":"","sources":["../../../src/usecases/base/SearchQuery.ts"],"names":[],"mappings":";;AAAA,wEAAmE;AACnE,kFAAyF;AAUzF,MAAqB,WAAW;IAiD5B,YAAY,OAAoB,EAAE;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IACpC,CAAC;IAhDD,MAAM,CAAC,gBAAgB,CAAC,WAAW;QAC/B,OAAO,IAAI,WAAW,CAAC,uBAAU,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,CAAC,OAAO,CACV,YAA6B,EAC7B,OAAgC,EAChC,WAAwB;QAGxB,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,GAAG,GAAG,CAAC;QAG1D,IAAI,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;QAChC,IAAI,WAAW,CAAC,aAAa,EAAE;YAC3B,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO;iBACjC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC;iBAClC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SAClE;QAED,IAAI,MAAM,EAAE;YACR,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;SACrD;QAGD,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC7C,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACf,OAAO,CAAC,oBAAoB,CACxB,MAAM,GAAG,CAAC,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI,CAAC,EAC1C,MAAM,GAAG,QAAQ,CAAC,IAAI,CACzB,CAAC;aACL;iBAAM;gBACH,OAAO,CAAC,iBAAiB,CAAC,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;aAE7E;QACL,CAAC,CAAC,CAAC;QAGH,IAAI,WAAW,CAAC,SAAS,EAAE;YACvB,OAAO,CAAC,QAAQ,CAAC,iCAAe,CAAC,SAAS,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;SACtE;IACL,CAAC;CAQJ;AAvDD,8BAuDC"}

package/usecases/dtos/ContextDto.d.ts

@@ -0,0 +1,8 @@
+export interface IContextDto {
+    user?: any | {
+        id?: number;
+    };
+}
+export declare class ContextDto implements IContextDto {
+    user?: any;
+}

package/usecases/dtos/ContextDto.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ContextDto = void 0;
+class ContextDto {
+}
+exports.ContextDto = ContextDto;
+//# sourceMappingURL=ContextDto.js.map

package/usecases/dtos/ContextDto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ContextDto.js","sourceRoot":"","sources":["../../../src/usecases/dtos/ContextDto.ts"],"names":[],"mappings":";;;AAMA,MAAa,UAAU;CAEtB;AAFD,gCAEC"}

package/usecases/helpers/DataMapperHelper.d.ts

@@ -1,5 +1,6 @@
 export declare class DataMapperHelper {
     static getKeys(object: any): any;
-    static anyToModel(obj: any, ModelClass: any): any;
-    static applyFields(target: Record<string, unknown> | any, source: any, fields?: string[]): void;
+    static anyToModel(source: any, ModelClass: any, fieldNames?: any): any;
+    static anyToSchema(source: any, SchemaClass: any): any;
+    static anyToPlain(source: any): any;
 }

package/usecases/helpers/DataMapperHelper.js

@@ -3,19 +3,75 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataMapperHelper = void 0;
 const lodash_1 = require("lodash");
 const BaseField_1 = require("../../infrastructure/decorators/fields/BaseField");
+const MetaHelper_1 = require("../../infrastructure/helpers/MetaHelper");
 class DataMapperHelper {
     static getKeys(object) {
         return Reflect.getMetadata(BaseField_1.MODEL_FIELD_NAMES_KEY, object.prototype) || [];
     }
-    static anyToModel(obj, ModelClass) {
-        const result = new ModelClass();
-        Object.assign(result, obj);
-        return result;
+    static anyToModel(source, ModelClass, fieldNames = null) {
+        if (!fieldNames) {
+            fieldNames = this.getKeys(ModelClass);
+        }
+        const model = new ModelClass();
+        fieldNames.forEach(fieldName => {
+            if ((0, lodash_1.has)(source, fieldName)) {
+                const value = source[fieldName];
+                if ((0, lodash_1.isObject)(value)) {
+                    const modelMeta = MetaHelper_1.MetaHelper.getFieldOptions(ModelClass, fieldName);
+                    if (modelMeta.appType === 'relation') {
+                        model[fieldName] = this.anyToModel(value, modelMeta.modelClass());
+                    }
+                    else {
+                    }
+                }
+                else {
+                    model[fieldName] = value;
+                }
+            }
+            else if ((0, lodash_1.has)(source, fieldName + 'Id')) {
+                model[fieldName + 'Id'] = source[fieldName + 'Id'];
+            }
+            else if ((0, lodash_1.has)(source, fieldName + 'Ids')) {
+                model[fieldName + 'Ids'] = source[fieldName + 'Ids'];
+            }
+        });
+        return model;
+    }
+    static anyToSchema(source, SchemaClass) {
+        const schema = new SchemaClass();
+        const keys = MetaHelper_1.MetaHelper.getFieldNames(SchemaClass);
+        keys.forEach(key => {
+            const meta = MetaHelper_1.MetaHelper.getFieldOptions(SchemaClass, key);
+            if (meta.appType === 'relation' && !/Ids?$/.exec(key)) {
+                let subSchemaClass = Reflect.getOwnMetadata('design:type', SchemaClass.prototype, key);
+                if (!(typeof subSchemaClass === 'function')) {
+                    subSchemaClass = meta.modelClass();
+                }
+                schema[key] = DataMapperHelper.anyToSchema((0, lodash_1.has)(source, key) ? source[key] : null, subSchemaClass);
+            }
+            else if ((0, lodash_1.has)(source, key)) {
+                schema[key] = source[key];
+            }
+        });
+        return schema;
     }
-    static applyFields(target, source, fields = null) {
+    static anyToPlain(source) {
+        if (Array.isArray(source)) {
+            return source.map(item => this.anyToPlain(item));
+        }
+        if ((0, lodash_1.isDate)(source)) {
+            return source;
+        }
         if ((0, lodash_1.isObject)(source)) {
-            Object.assign(target, source);
+            const keys = MetaHelper_1.MetaHelper.getFieldNames(source.constructor);
+            return Object.keys(source).reduce((obj, key) => {
+                if (!keys || keys.includes(key)) {
+                    obj[key] = DataMapperHelper.anyToPlain(source[key]);
+                }
+                return obj;
+            }, {});
         }
+        return source;
     }
 }
 exports.DataMapperHelper = DataMapperHelper;

package/usecases/helpers/DataMapperHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataMapperHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapperHelper.ts"],"names":[],"mappings":";;;AAAA,mCAIgB;AAEhB,gFAAuF;AAEvF,MAAa,gBAAgB;IACzB,MAAM,CAAC,OAAO,CAAC,MAAM;QACjB,OAAO,OAAO,CAAC,WAAW,CAAC,iCAAqB,EAAE,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IAC9E,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU;QAC7B,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAChC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC3B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,MAAqC,EAAE,MAAW,EAAE,SAAmB,IAAI;QAC1F,IAAI,IAAA,iBAAS,EAAC,MAAM,CAAC,EAAE;YACnB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SAkBjC;IACL,CAAC;CACJ;AAjCD,4CAiCC"}
+{"version":3,"file":"DataMapperHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/DataMapperHelper.ts"],"names":[],"mappings":"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"}

package/usecases/helpers/SearchHelper.d.ts

@@ -1,7 +1,8 @@
 import { Repository } from 'typeorm';
 import { SelectQueryBuilder } from 'typeorm/query-builder/SelectQueryBuilder';
-import { SearchInputDto } from '../../usecases/dtos/SearchInputDto';
-import { SearchResultDto } from '../../usecases/dtos/SearchResultDto';
+import { SearchInputDto } from '../dtos/SearchInputDto';
+import { SearchResultDto } from '../dtos/SearchResultDto';
+import SearchQuery from '../base/SearchQuery';
 export declare class SearchHelper {
-    static search<TTable>(repository: Repository<any>, dto: SearchInputDto, prepareHandler?: (query: SelectQueryBuilder<TTable>) => void | null): Promise<SearchResultDto<TTable>>;
+    static search<TTable>(repository: Repository<any>, dto: SearchInputDto, query: SearchQuery, prepareHandler?: (query: SelectQueryBuilder<TTable>) => void | null): Promise<SearchResultDto<TTable>>;
 }

package/usecases/helpers/SearchHelper.js

@@ -1,26 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SearchHelper = void 0;
-const SearchResultDto_1 = require("../../usecases/dtos/SearchResultDto");
+const SearchResultDto_1 = require("../dtos/SearchResultDto");
+const SearchQuery_1 = require("../base/SearchQuery");
 class SearchHelper {
-    static async search(repository, dto, prepareHandler = null) {
+    static async search(repository, dto, query, prepareHandler = null) {
         const result = new SearchResultDto_1.SearchResultDto();
         dto = Object.assign({ page: 1, pageSize: 50 }, dto);
-        const query = repository.createQueryBuilder();
+        const dbQuery = repository.createQueryBuilder();
+        SearchQuery_1.default.prepare(repository, dbQuery, query);
         const sort = typeof dto.sort === 'string' ? dto.sort.split(',') : (dto.sort || []);
         if (sort.length === 0) {
-            query.orderBy(sort.reduce((obj, value) => {
+            dbQuery.orderBy(sort.reduce((obj, value) => {
                 obj[value.replace('!', '')] = value.indexOf('!') === 0 ? 'DESC' : 'ASC';
                 return obj;
             }, {}));
         }
         if (prepareHandler) {
-            prepareHandler.call(null, query);
+            prepareHandler.call(null, dbQuery);
         }
-        query
+        dbQuery
             .offset((dto.page - 1) * dto.pageSize)
             .limit(dto.pageSize);
-        const [items, total] = await query.getManyAndCount();
+        const [items, total] = await dbQuery.getManyAndCount();
         result.items = items;
         result.total = total;
         return result;

package/usecases/helpers/SearchHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/SearchHelper.ts"],"names":[],"mappings":";;;AAGA,yEAAoE;AAEpE,MAAa,YAAY;IACrB,MAAM,CAAC,KAAK,CAAC,MAAM,CACf,UAA2B,EAC3B,GAAmB,EACnB,iBAAqE,IAAI;QAEzE,MAAM,MAAM,GAAG,IAAI,iCAAe,EAAU,CAAC;QAG7C,GAAG,mBACC,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,EAAE,IACT,GAAG,CACT,CAAC;QAGF,MAAM,KAAK,GAAG,UAAU,CAAC,kBAAkB,EAAE,CAAC;QAG9C,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACnF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACnB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACrC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;gBACxE,OAAO,GAAG,CAAC;YACf,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACX;QAGD,IAAI,cAAc,EAAE;YAChB,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACpC;QAGD,KAAK;aACA,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;aACrC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAGzB,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE,CAAC;QACrD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAErB,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA5CD,oCA4CC"}
+{"version":3,"file":"SearchHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/SearchHelper.ts"],"names":[],"mappings":";;;AAGA,6DAAwD;AACxD,qDAA8C;AAE9C,MAAa,YAAY;IAErB,MAAM,CAAC,KAAK,CAAC,MAAM,CACf,UAA2B,EAC3B,GAAmB,EACnB,KAAkB,EAClB,iBAAqE,IAAI;QAEzE,MAAM,MAAM,GAAG,IAAI,iCAAe,EAAU,CAAC;QAG7C,GAAG,mBACC,IAAI,EAAE,CAAC,EACP,QAAQ,EAAE,EAAE,IACT,GAAG,CACT,CAAC;QAGF,MAAM,OAAO,GAAG,UAAU,CAAC,kBAAkB,EAAE,CAAC;QAEhD,qBAAW,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAGhD,MAAM,IAAI,GAAG,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACnF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACnB,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBACvC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;gBACxE,OAAO,GAAG,CAAC;YACf,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACX;QAGD,IAAI,cAAc,EAAE;YAChB,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACtC;QAGD,OAAO;aACF,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;aACrC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAGzB,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;QACvD,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QACrB,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAErB,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAhDD,oCAgDC"}

package/usecases/helpers/ValidationHelper.d.ts

@@ -1,2 +1,2 @@
 import { ValidatorOptions } from 'class-validator';
-export declare function validateOrReject(model: any, validatorOptions?: ValidatorOptions): Promise<void>;
+export declare function validateOrReject(dto: any, validatorOptions?: ValidatorOptions): Promise<void>;

package/usecases/helpers/ValidationHelper.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateOrReject = void 0;
 const class_validator_1 = require("class-validator");
 const ValidationException_1 = require("../exceptions/ValidationException");
-async function validateOrReject(model, validatorOptions) {
-    const errors = await (0, class_validator_1.validate)(model, validatorOptions);
+async function validateOrReject(dto, validatorOptions) {
+    const errors = await (0, class_validator_1.validate)(dto, validatorOptions);
     if (errors.length) {
         throw new ValidationException_1.ValidationException(errors);
     }

package/usecases/helpers/ValidationHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValidationHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/ValidationHelper.ts"],"names":[],"mappings":";;;AAAA,qDAA2D;AAC3D,2EAAsE;AAE/D,KAAK,UAAU,gBAAgB,CAAC,KAAU,EAAE,gBAAmC;IAClF,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,MAAM,EAAE;QACf,MAAM,IAAI,yCAAmB,CAAC,MAAM,CAAC,CAAC;KACzC;AACL,CAAC;AALD,4CAKC"}
+{"version":3,"file":"ValidationHelper.js","sourceRoot":"","sources":["../../../src/usecases/helpers/ValidationHelper.ts"],"names":[],"mappings":";;;AAAA,qDAA2D;AAC3D,2EAAsE;AAE/D,KAAK,UAAU,gBAAgB,CAAC,GAAQ,EAAE,gBAAmC;IAChF,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAQ,EAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;IACrD,IAAI,MAAM,CAAC,MAAM,EAAE;QACf,MAAM,IAAI,yCAAmB,CAAC,MAAM,CAAC,CAAC;KACzC;AACL,CAAC;AALD,4CAKC"}

package/usecases/interfaces/ICrudRepository.d.ts

@@ -2,10 +2,13 @@ import { Repository } from 'typeorm';
 import { SearchResultDto } from '../dtos/SearchResultDto';
 import { SearchInputDto } from '../dtos/SearchInputDto';
 import { ICondition } from '../../infrastructure/helpers/ConditionHelper';
+import { Type } from '@nestjs/common';
+import SearchQuery from '../base/SearchQuery';
 export interface ICrudRepository<TModel> {
     dbRepository: Repository<any>;
-    search: (dto: SearchInputDto) => Promise<SearchResultDto<TModel>>;
-    findOne: (condition: ICondition) => Promise<TModel>;
+    search: <TItem>(dto: SearchInputDto, searchQuery: SearchQuery) => Promise<SearchResultDto<TModel | Type<TItem>>>;
+    findOne: (conditionOrQuery: ICondition | SearchQuery) => Promise<TModel | null>;
+    findMany: (conditionOrQuery: ICondition | SearchQuery) => Promise<TModel[]>;
     create: (model: TModel) => Promise<TModel>;
     update: (id: number, model: TModel) => Promise<TModel>;
     remove: (id: number) => Promise<void>;

package/usecases/services/CrudService.d.ts

@@ -1,16 +1,25 @@
+import { Type } from '@nestjs/common';
 import { ICrudRepository } from '../interfaces/ICrudRepository';
 import { ISearchInputDto } from '../dtos/SearchInputDto';
 import { SearchResultDto } from '../dtos/SearchResultDto';
+import SearchQuery from '../base/SearchQuery';
+import { ContextDto } from '../dtos/ContextDto';
 export declare class CrudService<TModel, TSearchDto = ISearchInputDto, TSaveDto = TModel> {
     protected primaryKey: string;
     protected repository: ICrudRepository<TModel>;
     protected modelClass: any;
     init(repository: ICrudRepository<TModel>, ModelClass: any): void;
-    createModel(): TModel | any;
-    search(dto: TSearchDto): Promise<SearchResultDto<TModel>>;
-    findById(id: number | string): Promise<TModel>;
-    create(dto: TSaveDto): Promise<TModel>;
-    update(id: number | string, dto: TSaveDto): Promise<TModel>;
-    remove(id: number | string): Promise<void>;
-    protected dtoToModel(dto: TSaveDto): TModel;
+    search(dto: TSearchDto, context?: ContextDto | null): Promise<SearchResultDto<TModel>>;
+    search<TSchema>(dto: TSearchDto, context?: ContextDto | null, schemaClass?: Type<TSchema>): Promise<SearchResultDto<Type<TSchema>>>;
+    findById(id: number | string, context?: ContextDto | null): Promise<TModel>;
+    findById<TSchema>(id: number | string, context?: ContextDto | null, schemaClass?: Type<TSchema>): Promise<Type<TSchema>>;
+    findOne(searchQuery: SearchQuery): Promise<TModel>;
+    findMany(searchQuery: SearchQuery): Promise<TModel[]>;
+    create(dto: TSaveDto, context?: ContextDto | null): Promise<TModel>;
+    create<TSchema>(dto: TSaveDto, context?: ContextDto | null, schemaClass?: Type<TSchema>): Promise<Type<TSchema>>;
+    update<TSchema>(id: number | string, dto: TSaveDto, context?: ContextDto | null): Promise<TModel>;
+    update<TSchema>(id: number | string, dto: TSaveDto, context?: ContextDto | null, schemaClass?: Type<TSchema>): Promise<Type<TSchema>>;
+    remove(id: number | string, context?: ContextDto): Promise<void>;
+    protected modelToSchema<TSchema>(model: TModel, schemaClass: Type<TSchema>): Type<TSchema>;
+    protected dtoToModel(dto: TSaveDto): Promise<TModel>;
 }

package/usecases/services/CrudService.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudService = void 0;
 const lodash_1 = require("lodash");
+const DataMapperHelper_1 = require("../helpers/DataMapperHelper");
 const ValidationHelper_1 = require("../helpers/ValidationHelper");
-const class_transformer_1 = require("class-transformer");
+const SearchQuery_1 = require("../base/SearchQuery");
 class CrudService {
     constructor() {
         this.primaryKey = 'id';
@@ -12,38 +13,47 @@ class CrudService {
         this.repository = repository;
         this.modelClass = ModelClass;
     }
-    createModel() {
-        const ModelClass = this.modelClass;
-        return new ModelClass();
-    }
-    async search(dto) {
+    async search(dto, context = null, schemaClass = null) {
         await (0, ValidationHelper_1.validateOrReject)(dto);
-        const repositoryResult = await this.repository.search(dto);
-        return repositoryResult;
+        const result = await this.repository.search(dto, SearchQuery_1.default.createFromSchema(schemaClass));
+        if (schemaClass) {
+            result.items = result.items.map((model) => this.modelToSchema(model, schemaClass));
+        }
+        return result;
+    }
+    async findById(id, context = null, schemaClass = null) {
+        const searchQuery = SearchQuery_1.default.createFromSchema(schemaClass);
+        searchQuery.condition = { [this.primaryKey]: (0, lodash_1.toInteger)(id) };
+        const model = await this.findOne(searchQuery);
+        return schemaClass ? this.modelToSchema(model, schemaClass) : model;
     }
-    async findById(id) {
-        const model = await this.repository.findOne({ [this.primaryKey]: (0, lodash_1.toInteger)(id) });
-        return model;
+    async findOne(searchQuery) {
+        return await this.repository.findOne(searchQuery);
     }
-    async create(dto) {
+    async findMany(searchQuery) {
+        return await this.repository.findMany(searchQuery);
+    }
+    async create(dto, context = null, schemaClass = null) {
         await (0, ValidationHelper_1.validateOrReject)(dto);
-        let model = this.dtoToModel(dto);
-        await (0, ValidationHelper_1.validateOrReject)(model);
-        const tmodel = await this.repository.create(model);
-        return tmodel;
+        const model = await this.repository.create(await this.dtoToModel(dto));
+        return schemaClass ? this.findById(model[this.primaryKey], context, schemaClass) : model;
     }
-    async update(id, dto) {
+    async update(id, dto, context = null, schemaClass = null) {
         await (0, ValidationHelper_1.validateOrReject)(dto);
-        let model = this.dtoToModel(dto);
-        await (0, ValidationHelper_1.validateOrReject)(model);
-        model = await this.repository.update((0, lodash_1.toInteger)(id), model);
-        return model;
+        const model = await this.repository.update((0, lodash_1.toInteger)(id), await this.dtoToModel(dto));
+        return schemaClass ? this.findById(id, context, schemaClass) : model;
     }
-    async remove(id) {
+    async remove(id, context = null) {
         await this.repository.remove((0, lodash_1.toInteger)(id));
     }
+    modelToSchema(model, schemaClass) {
+        return DataMapperHelper_1.DataMapperHelper.anyToSchema(model, schemaClass);
+    }
     dtoToModel(dto) {
-        return (0, class_transformer_1.plainToInstance)(this.modelClass, dto);
+        if (!this.modelClass) {
+            throw new Error('Property modelClass is not set in service: ' + this.constructor.name);
+        }
+        return DataMapperHelper_1.DataMapperHelper.anyToModel(dto, this.modelClass);
     }
 }
 exports.CrudService = CrudService;

package/usecases/services/CrudService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../../../src/usecases/services/CrudService.ts"],"names":[],"mappings":";;;AAAA,mCAA+C;AAK/C,kEAA6D;AAC7D,yDAAkD;AAKlD,MAAa,WAAW;IAAxB;QAQc,eAAU,GAAW,IAAI,CAAC;IAsFxC,CAAC;IAvEG,IAAI,CAAC,UAAmC,EAAE,UAAU;QAChD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,WAAW;QACP,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,OAAO,IAAI,UAAU,EAAE,CAAC;IAC5B,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,GAAe;QACxB,MAAM,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3D,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAMD,KAAK,CAAC,QAAQ,CAAC,EAAmB;QAC9B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAA,kBAAU,EAAC,EAAE,CAAC,EAAC,CAAC,CAAC;QACjF,OAAO,KAAK,CAAC;IACjB,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,GAAa;QACtB,MAAM,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,IAAA,mCAAgB,EAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACnD,OAAO,MAAM,CAAC;IAClB,CAAC;IAOD,KAAK,CAAC,MAAM,CAAC,EAAmB,EAAE,GAAa;QAC3C,MAAM,IAAA,mCAAgB,EAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,IAAA,mCAAgB,EAAC,KAAK,CAAC,CAAC;QAC9B,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,kBAAU,EAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;QAC5D,OAAO,KAAK,CAAC;IACjB,CAAC;IAMD,KAAK,CAAC,MAAM,CAAC,EAAmB;QAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAA,kBAAU,EAAC,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAQS,UAAU,CAAC,GAAa;QAC9B,OAAO,IAAA,mCAAe,EAAC,IAAI,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IACjD,CAAC;CACJ;AA9FD,kCA8FC"}
+{"version":3,"file":"CrudService.js","sourceRoot":"","sources":["../../../src/usecases/services/CrudService.ts"],"names":[],"mappings":"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"}

package/infrastructure/decorators/fields/ExtendFields.d.ts

@@ -1 +0,0 @@
-export declare function ExtendFields(modelClass: any): (object: any) => void;

package/infrastructure/decorators/fields/ExtendFields.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExtendFields = void 0;
-const constants_1 = require("@nestjs/swagger/dist/constants");
-function ExtendFields(modelClass) {
-    return (object) => {
-        const properties = Reflect.getMetadata(constants_1.DECORATORS.API_MODEL_PROPERTIES_ARRAY, modelClass.prototype);
-        (properties || []).forEach(propertyName => {
-            propertyName = propertyName.replace(/^:/, '');
-            console.log(11, Object.keys(object.prototype));
-        });
-    };
-}
-exports.ExtendFields = ExtendFields;
-//# sourceMappingURL=ExtendFields.js.map

package/infrastructure/decorators/fields/ExtendFields.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ExtendFields.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/ExtendFields.ts"],"names":[],"mappings":";;;AAAA,8DAA0D;AAG1D,SAAgB,YAAY,CAAC,UAAU;IACnC,OAAO,CAAC,MAAM,EAAE,EAAE;QACd,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,sBAAU,CAAC,0BAA0B,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;QACpG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;YACtC,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAE9C,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAEnD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC;AACN,CAAC;AAVD,oCAUC"}