@steroidsjs/nest 1.6.0 → 1.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/infrastructure/adapters/QueryAdapterTypeORM.d.ts +4 -0
- package/infrastructure/adapters/QueryAdapterTypeORM.js +83 -0
- package/infrastructure/adapters/QueryAdapterTypeORM.js.map +1 -1
- package/infrastructure/decorators/fields/RelationField.d.ts +1 -0
- package/infrastructure/decorators/fields/RelationField.js +8 -1
- package/infrastructure/decorators/fields/RelationField.js.map +1 -1
- package/infrastructure/repositories/CrudRepository.d.ts +1 -1
- package/infrastructure/repositories/CrudRepository.js +11 -6
- package/infrastructure/repositories/CrudRepository.js.map +1 -1
- package/package.json +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/usecases/base/SearchQuery.d.ts +14 -2
- package/usecases/base/SearchQuery.js +58 -19
- package/usecases/base/SearchQuery.js.map +1 -1
|
@@ -3,5 +3,9 @@ import { SelectQueryBuilder } from '@steroidsjs/typeorm/query-builder/SelectQuer
|
|
|
3
3
|
import SearchQuery from '../../usecases/base/SearchQuery';
|
|
4
4
|
export declare class QueryAdapterTypeORM {
|
|
5
5
|
static prepare(dbRepository: Repository<any>, dbQuery: SelectQueryBuilder<any>, searchQuery: SearchQuery<any>, eagerLoading?: boolean): void;
|
|
6
|
+
static loadRelationsWithoutJoin(MetaClass: any, dbRepository: Repository<any>, records: any, relations: Record<string, {
|
|
7
|
+
alias: string;
|
|
8
|
+
select: string | string[];
|
|
9
|
+
}>): Promise<any>;
|
|
6
10
|
private static prepareRelations;
|
|
7
11
|
}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.QueryAdapterTypeORM = void 0;
|
|
4
|
+
const lodash_1 = require("lodash");
|
|
4
5
|
const ConditionHelperTypeORM_1 = require("../helpers/typeORM/ConditionHelperTypeORM");
|
|
5
6
|
const BaseField_1 = require("../decorators/fields/BaseField");
|
|
6
7
|
const SearchQuery_1 = require("../../usecases/base/SearchQuery");
|
|
8
|
+
const DataMapper_1 = require("../../usecases/helpers/DataMapper");
|
|
9
|
+
const TableFromModel_1 = require("../decorators/TableFromModel");
|
|
10
|
+
const RelationField_1 = require("../decorators/fields/RelationField");
|
|
7
11
|
class QueryAdapterTypeORM {
|
|
8
12
|
static prepare(dbRepository, dbQuery, searchQuery, eagerLoading = true) {
|
|
9
13
|
var _a, _b;
|
|
@@ -36,6 +40,85 @@ class QueryAdapterTypeORM {
|
|
|
36
40
|
dbQuery.offset(searchQuery.getOffset());
|
|
37
41
|
}
|
|
38
42
|
}
|
|
43
|
+
static async loadRelationsWithoutJoin(MetaClass, dbRepository, records, relations) {
|
|
44
|
+
const rootPrimaryKey = (0, BaseField_1.getMetaPrimaryKey)(MetaClass);
|
|
45
|
+
const relationPaths = Object.keys(relations || {}).sort();
|
|
46
|
+
for (let path of relationPaths) {
|
|
47
|
+
const pathItems = path.split('.');
|
|
48
|
+
if (pathItems.length === 1) {
|
|
49
|
+
const relationName = pathItems.shift();
|
|
50
|
+
const searchQuery = new SearchQuery_1.default();
|
|
51
|
+
if (Array.isArray(relations[path].select)) {
|
|
52
|
+
searchQuery.select(relations[path].select);
|
|
53
|
+
}
|
|
54
|
+
const subRelationNames = relationPaths
|
|
55
|
+
.filter(value => value.startsWith(relationName + '.'))
|
|
56
|
+
.reduce((obj, value) => {
|
|
57
|
+
const subPath = value.substring(relationName.length + 1);
|
|
58
|
+
const subAlias = relations[value].alias;
|
|
59
|
+
const key = [subPath, subAlias].filter(Boolean).join(' ');
|
|
60
|
+
obj[key] = relations[value].select;
|
|
61
|
+
return obj;
|
|
62
|
+
}, {});
|
|
63
|
+
if (Object.keys(subRelationNames).length > 0) {
|
|
64
|
+
searchQuery.withNoJoin(subRelationNames);
|
|
65
|
+
}
|
|
66
|
+
const options = (0, BaseField_1.getFieldOptions)(MetaClass, relationName);
|
|
67
|
+
const relationClass = options.relationClass();
|
|
68
|
+
const dbQuery = dbRepository.manager
|
|
69
|
+
.getRepository((0, TableFromModel_1.getTableFromModel)(relationClass))
|
|
70
|
+
.createQueryBuilder(searchQuery.getAlias());
|
|
71
|
+
switch (options.type) {
|
|
72
|
+
case 'OneToMany':
|
|
73
|
+
const relationClassOptions = (0, BaseField_1.getMetaFields)(relationClass);
|
|
74
|
+
const inverseFieldNamesObject = relationClassOptions
|
|
75
|
+
.reduce((obj, fieldName) => (Object.assign(Object.assign({}, obj), { [fieldName]: fieldName })), {});
|
|
76
|
+
const inverseFieldName = typeof options.inverseSide === 'string'
|
|
77
|
+
? inverseFieldNamesObject[options.inverseSide]
|
|
78
|
+
: options.inverseSide(inverseFieldNamesObject);
|
|
79
|
+
if (!inverseFieldName) {
|
|
80
|
+
throw new Error('Not found inverse field name for relation: ' + relationName);
|
|
81
|
+
}
|
|
82
|
+
const inverseIdFieldName = (0, RelationField_1.getMetaRelationIdFieldKey)(relationClass, inverseFieldName);
|
|
83
|
+
if (!inverseIdFieldName) {
|
|
84
|
+
throw new Error('Not found id field for relation: ' + relationName);
|
|
85
|
+
}
|
|
86
|
+
const rootIds = records.map(record => record[rootPrimaryKey]).filter(Boolean);
|
|
87
|
+
searchQuery.where(['in', inverseIdFieldName, rootIds]);
|
|
88
|
+
QueryAdapterTypeORM.prepare(dbRepository, dbQuery, searchQuery, true);
|
|
89
|
+
const rows = await dbQuery.getMany();
|
|
90
|
+
const models = rows.map(row => DataMapper_1.DataMapper.create(relationClass, row));
|
|
91
|
+
records = records.map(record => {
|
|
92
|
+
record[relationName] = models.filter(model => model[inverseIdFieldName] === record[rootPrimaryKey]);
|
|
93
|
+
return record;
|
|
94
|
+
});
|
|
95
|
+
break;
|
|
96
|
+
case 'ManyToOne':
|
|
97
|
+
const idField = (0, RelationField_1.getMetaRelationIdFieldKey)(MetaClass, relationName);
|
|
98
|
+
if (!idField) {
|
|
99
|
+
throw new Error('Not found id field for relation: ' + relationName);
|
|
100
|
+
}
|
|
101
|
+
const relationIds = records.map(record => record[idField]).filter(Boolean);
|
|
102
|
+
if (relationIds.length > 0) {
|
|
103
|
+
const subRelationPrimaryKey = (0, BaseField_1.getMetaPrimaryKey)(relationClass);
|
|
104
|
+
searchQuery.where(['in', subRelationPrimaryKey, relationIds]);
|
|
105
|
+
QueryAdapterTypeORM.prepare(dbRepository, dbQuery, searchQuery, true);
|
|
106
|
+
const rows = await dbQuery.getMany();
|
|
107
|
+
const models = rows.map(row => DataMapper_1.DataMapper.create(relationClass, row));
|
|
108
|
+
const indexedModels = (0, lodash_1.keyBy)(models, subRelationPrimaryKey);
|
|
109
|
+
records = records.map(record => {
|
|
110
|
+
record[relationName] = indexedModels[record[idField]] || null;
|
|
111
|
+
return record;
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
break;
|
|
115
|
+
default:
|
|
116
|
+
throw new Error('This relation type is not implement for load relations without join, relation: ' + relationName);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
return records;
|
|
121
|
+
}
|
|
39
122
|
static prepareRelations(dbQuery, relationsWithAliases, rootPrefix, rootClass, useShortAliases = false, eagerLoading = true) {
|
|
40
123
|
const relationToAliasMap = {};
|
|
41
124
|
const relations = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"QueryAdapterTypeORM.js","sourceRoot":"","sources":["../../../src/infrastructure/adapters/QueryAdapterTypeORM.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"QueryAdapterTypeORM.js","sourceRoot":"","sources":["../../../src/infrastructure/adapters/QueryAdapterTypeORM.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,7 @@ export interface IRelationFieldOneToManyOptions extends IBaseFieldOptions {
|
|
|
22
22
|
inverseSide: string | ((object: any) => any);
|
|
23
23
|
}
|
|
24
24
|
export declare type IRelationFieldOptions = IRelationFieldOneToOneOptions | IRelationFieldManyToManyOptions | IRelationFieldManyToOneOptions | IRelationFieldOneToManyOptions;
|
|
25
|
+
export declare const getMetaRelationIdFieldKey: (relationClass: any, relationName: any) => string;
|
|
25
26
|
export declare const relationTransformFromDb: ({ value, object, key, options, transformType }: {
|
|
26
27
|
value: any;
|
|
27
28
|
object: any;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.RelationField = exports.relationTransform = exports.relationTransformToDb = exports.relationTransformFromDb = void 0;
|
|
3
|
+
exports.RelationField = exports.relationTransform = exports.relationTransformToDb = exports.relationTransformFromDb = exports.getMetaRelationIdFieldKey = void 0;
|
|
4
4
|
const common_1 = require("@nestjs/common");
|
|
5
5
|
const typeorm_1 = require("@steroidsjs/typeorm");
|
|
6
6
|
const class_validator_1 = require("class-validator");
|
|
@@ -24,6 +24,13 @@ const getRelationDecorator = (relation) => {
|
|
|
24
24
|
throw new Error('Wrong relation type: ' + relation);
|
|
25
25
|
}
|
|
26
26
|
};
|
|
27
|
+
const getMetaRelationIdFieldKey = (relationClass, relationName) => {
|
|
28
|
+
return (0, BaseField_1.getMetaFields)(relationClass).find(idName => {
|
|
29
|
+
const idOptions = (0, BaseField_1.getFieldOptions)(relationClass, idName);
|
|
30
|
+
return idOptions.appType === 'relationId' && idOptions.relationName === relationName;
|
|
31
|
+
});
|
|
32
|
+
};
|
|
33
|
+
exports.getMetaRelationIdFieldKey = getMetaRelationIdFieldKey;
|
|
27
34
|
const getOwningDecorator = (options) => {
|
|
28
35
|
if (options.type === 'ManyToMany' && options.isOwningSide) {
|
|
29
36
|
return typeorm_1.JoinTable;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelationField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/RelationField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,iDAAsG;AACtG,qDAA2D;AAC3D,yDAAuC;AACvC,2CAA4G;AAC5G,sDAAoD;AACpD,4CAAqF;AACrF,qEAAgE;AA+BhE,MAAM,sBAAsB,GAAG,eAAe,CAAC;AAE/C,MAAM,oBAAoB,GAAG,CAAC,QAAQ,EAAO,EAAE;IAC3C,QAAQ,QAAQ,EAAE;QACd,KAAK,UAAU;YACX,OAAO,kBAAQ,CAAC;QACpB,KAAK,YAAY;YACb,OAAO,oBAAU,CAAC;QACtB,KAAK,WAAW;YACZ,OAAO,mBAAS,CAAC;QACrB,KAAK,WAAW;YACZ,OAAO,mBAAS,CAAC;QACrB;YACI,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,QAAQ,CAAC,CAAC;KAC3D;AACL,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"RelationField.js","sourceRoot":"","sources":["../../../../src/infrastructure/decorators/fields/RelationField.ts"],"names":[],"mappings":";;;AAAA,2CAA+C;AAC/C,iDAAsG;AACtG,qDAA2D;AAC3D,yDAAuC;AACvC,2CAA4G;AAC5G,sDAAoD;AACpD,4CAAqF;AACrF,qEAAgE;AA+BhE,MAAM,sBAAsB,GAAG,eAAe,CAAC;AAE/C,MAAM,oBAAoB,GAAG,CAAC,QAAQ,EAAO,EAAE;IAC3C,QAAQ,QAAQ,EAAE;QACd,KAAK,UAAU;YACX,OAAO,kBAAQ,CAAC;QACpB,KAAK,YAAY;YACb,OAAO,oBAAU,CAAC;QACtB,KAAK,WAAW;YACZ,OAAO,mBAAS,CAAC;QACrB,KAAK,WAAW;YACZ,OAAO,mBAAS,CAAC;QACrB;YACI,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,QAAQ,CAAC,CAAC;KAC3D;AACL,CAAC,CAAA;AAEM,MAAM,yBAAyB,GAAG,CAAC,aAAa,EAAE,YAAY,EAAU,EAAE;IAC7E,OAAO,IAAA,yBAAa,EAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QAC9C,MAAM,SAAS,GAAG,IAAA,2BAAe,EAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACzD,OAAO,SAAS,CAAC,OAAO,KAAK,YAAY,IAAI,SAAS,CAAC,YAAY,KAAK,YAAY,CAAC;IACzF,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AALW,QAAA,yBAAyB,6BAKpC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAwE,EAAE,EAAE;IACpG,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,IAAI,OAAO,CAAC,YAAY,EAAE;QACvD,OAAO,mBAAS,CAAC;KACpB;IACD,IAAI,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,CAAC,YAAY,EAAE;QACrD,OAAO,oBAAU,CAAC;KACrB;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE;IACtE,IAAI,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACjC,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,kBAAkB,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;KACzF;IACD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,CAAC,KAAK,YAAY,WAAW,CAAC,EAAE;QACvE,OAAO,uBAAU,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC;KAC/D;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AACD,MAAM,YAAY,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE;IAC/D,IAAI,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACjC,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;KAClF;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC3B,MAAM,UAAU,GAAG,IAAA,6BAAiB,EAAC,UAAU,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAChC,MAAM,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC;QAC3B,OAAO,MAAM,CAAC;KACjB;IACD,OAAO,KAAK,CAAC;AACjB,CAAC,CAAA;AAEM,MAAM,uBAAuB,GAAG,CAAC,EAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,EAAC,EAAE,EAAE;IACpF,MAAM,UAAU,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAG3C,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAG,sBAAsB,CAAC,EAAE;QACjC,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,kBAAkB,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AACjF,CAAC,CAAA;AAVY,QAAA,uBAAuB,2BAUnC;AAEM,MAAM,qBAAqB,GAAG,CAAC,EAAC,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,aAAa,EAAC,EAAE,EAAE;IAChF,MAAM,UAAU,GAAG,IAAA,kCAAiB,EAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;IAE9D,MAAM,cAAc,GAAG,IAAA,yBAAa,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC/D,MAAM,eAAe,GAAG,IAAA,2BAAe,EAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAChE,OAAO,eAAe,CAAC,OAAO,KAAK,YAAY,IAAI,eAAe,CAAC,YAAY,KAAK,GAAG,CAAC;IAC5F,CAAC,CAAC,CAAC;IAEH,IAAI,cAAc,IAAI,IAAI,CAAC,cAAc,CAAC,EAAE;QACxC,MAAM,MAAM,GAAG,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAG9F,MAAM,CAAC,sBAAsB,CAAC,GAAG,IAAI,CAAC;QAEtC,OAAO,MAAM,CAAC;KACjB;IAED,OAAO,kBAAkB,CAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AACjF,CAAC,CAAA;AAlBY,QAAA,qBAAqB,yBAkBjC;AAEM,MAAM,iBAAiB,GAAG,CAAC,EAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAC,EAAE,EAAE;IACjE,MAAM,QAAQ,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IACzC,OAAO,kBAAkB,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAC/E,CAAC,CAAA;AAHY,QAAA,iBAAiB,qBAG7B;AAED,SAAgB,aAAa,CAAC,OAA8B;IACxD,MAAM,eAAe,GAAG,kBAAkB,CAAC,OAAc,CAAC,CAAC;IAE3D,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QACpB,OAAO,CAAC,SAAS,GAAG,yBAAiB,CAAC;KACzC;IAED,IAAI,sBAAsB,CAAC;IAC3B,IAAI,WAAW,IAAI,OAAO,EAAE;QACxB,sBAAsB,GAAG;YACrB,IAAI,EAAE,OAAO,CAAC,SAAS;SAC1B,CAAA;KACJ;IAED,OAAO,IAAA,wBAAe,EAClB,GAAG;QACC,IAAA,qBAAS,EAAC,OAAO,EAAE;YACf,aAAa,EAAE,eAAe;YAC9B,OAAO,EAAE,UAAU;YACnB,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;SAC9D,CAAC;QACF,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,CAC9B,GAAG,EAAE,CAAC,IAAA,kCAAiB,EAAC,OAAO,CAAC,aAAa,EAAE,CAAC,EAC/C,OAAe,CAAC,WAAW,EAC5B,EAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAC,CACvD;QACD,eAAe,IAAI,eAAe,CAAC,sBAAsB,CAAC;QAE1D,IAAA,4BAAU,EAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QACtC,IAAA,gCAAc,EAAC,EAAC,IAAI,EAAE,IAAI,EAAC,CAAC;QAC5B,IAAA,wBAAI,EAAC,OAAO,CAAC,aAAa,CAAC;QAC3B,IAAA,qBAAS,EAAC,+BAAuB,EAAE,kCAAsB,CAAC;QAC1D,IAAA,qBAAS,EAAC,6BAAqB,EAAE,gCAAoB,CAAC;KACzD,CAAC,MAAM,CAAC,OAAO,CAAC,CACpB,CAAC;AACN,CAAC;AApCD,sCAoCC"}
|
|
@@ -18,7 +18,7 @@ export declare class CrudRepository<TModel> implements ICrudRepository<TModel>,
|
|
|
18
18
|
findOne(conditionOrQuery: ICondition | SearchQuery<TModel>, eagerLoading?: boolean): Promise<TModel | null>;
|
|
19
19
|
findMany(conditionOrQuery: ICondition | SearchQuery<TModel>, eagerLoading?: boolean): Promise<TModel[]>;
|
|
20
20
|
createQuery(config?: ISearchQueryConfig<TModel>): SearchQuery<TModel>;
|
|
21
|
-
protected createQueryBuilder(conditionOrQuery: ICondition | SearchQuery<TModel>, eagerLoading?: boolean): SelectQueryBuilder<any
|
|
21
|
+
protected createQueryBuilder(conditionOrQuery: ICondition | SearchQuery<TModel>, eagerLoading?: boolean): [SelectQueryBuilder<any>, SearchQuery<TModel>];
|
|
22
22
|
create(model: TModel, transactionHandler?: (callback: any) => Promise<void>): Promise<TModel>;
|
|
23
23
|
update(id: number, model: TModel, transactionHandler?: (callback: any) => Promise<void>): Promise<TModel>;
|
|
24
24
|
save(model: TModel, transactionHandler?: (callback: any) => Promise<void>): Promise<TModel>;
|
|
@@ -31,13 +31,18 @@ class CrudRepository {
|
|
|
31
31
|
return result;
|
|
32
32
|
}
|
|
33
33
|
async findOne(conditionOrQuery, eagerLoading = true) {
|
|
34
|
-
const dbQuery = this.createQueryBuilder(conditionOrQuery, eagerLoading);
|
|
35
|
-
|
|
36
|
-
|
|
34
|
+
const [dbQuery, searchQuery] = this.createQueryBuilder(conditionOrQuery, eagerLoading);
|
|
35
|
+
let row = await dbQuery.getOne();
|
|
36
|
+
if (!row) {
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
row = await QueryAdapterTypeORM_1.QueryAdapterTypeORM.loadRelationsWithoutJoin(this.modelClass, this.dbRepository, [row], searchQuery.getWithNoJoin())[0];
|
|
40
|
+
return this.entityToModel(row);
|
|
37
41
|
}
|
|
38
42
|
async findMany(conditionOrQuery, eagerLoading = true) {
|
|
39
|
-
const dbQuery = this.createQueryBuilder(conditionOrQuery, eagerLoading);
|
|
40
|
-
|
|
43
|
+
const [dbQuery, searchQuery] = this.createQueryBuilder(conditionOrQuery, eagerLoading);
|
|
44
|
+
let rows = await dbQuery.getMany();
|
|
45
|
+
rows = await QueryAdapterTypeORM_1.QueryAdapterTypeORM.loadRelationsWithoutJoin(this.modelClass, this.dbRepository, rows, searchQuery.getWithNoJoin());
|
|
41
46
|
return rows.map(row => this.entityToModel(row));
|
|
42
47
|
}
|
|
43
48
|
createQuery(config) {
|
|
@@ -51,7 +56,7 @@ class CrudRepository {
|
|
|
51
56
|
}
|
|
52
57
|
const dbQuery = this.dbRepository.createQueryBuilder(searchQuery.getAlias());
|
|
53
58
|
QueryAdapterTypeORM_1.QueryAdapterTypeORM.prepare(this.dbRepository, dbQuery, searchQuery, eagerLoading);
|
|
54
|
-
return dbQuery;
|
|
59
|
+
return [dbQuery, searchQuery];
|
|
55
60
|
}
|
|
56
61
|
async create(model, transactionHandler) {
|
|
57
62
|
model[this.primaryKey] = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CrudRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/CrudRepository.ts"],"names":[],"mappings":";;;AACA,gFAA2E;AAI3E,iEAAgF;AAChF,kEAA6D;AAI7D,iEAAgF;AAChF,uDAAqF;AAErF,yEAAoE;AAKpE,MAAa,cAAc;IAA3B;QAIW,eAAU,GAAW,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"CrudRepository.js","sourceRoot":"","sources":["../../../src/infrastructure/repositories/CrudRepository.ts"],"names":[],"mappings":"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"}
|