@vendure/core 2.1.6 → 2.2.0-next.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/dist/api/common/graphql-value-transformer.js +4 -0
- package/dist/api/common/graphql-value-transformer.js.map +1 -1
- package/dist/api/config/generate-list-options.js +19 -15
- package/dist/api/config/generate-list-options.js.map +1 -1
- package/dist/api/resolvers/admin/global-settings.resolver.js +2 -0
- package/dist/api/resolvers/admin/global-settings.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/global-settings.type.graphql +1 -0
- package/dist/api/schema/admin-api/product-admin.type.graphql +0 -1
- package/dist/api/schema/admin-api/product.api.graphql +1 -0
- package/dist/api/schema/common/product.type.graphql +1 -0
- package/dist/bootstrap.d.ts +66 -3
- package/dist/bootstrap.js +49 -13
- package/dist/bootstrap.js.map +1 -1
- package/dist/common/types/common-types.d.ts +3 -0
- package/dist/config/entity/bigint-money-strategy.d.ts +1 -0
- package/dist/config/entity/bigint-money-strategy.js +1 -0
- package/dist/config/entity/bigint-money-strategy.js.map +1 -1
- package/dist/config/entity/default-money-strategy.d.ts +1 -0
- package/dist/config/entity/default-money-strategy.js +1 -0
- package/dist/config/entity/default-money-strategy.js.map +1 -1
- package/dist/config/entity/money-strategy.d.ts +35 -4
- package/dist/config/vendure-config.d.ts +21 -2
- package/dist/data-import/providers/populator/populator.js +2 -1
- package/dist/data-import/providers/populator/populator.js.map +1 -1
- package/dist/data-import/types.d.ts +1 -0
- package/dist/job-queue/in-memory-job-queue-strategy.js +3 -0
- package/dist/job-queue/in-memory-job-queue-strategy.js.map +1 -1
- package/dist/service/helpers/list-query-builder/list-query-builder.d.ts +14 -1
- package/dist/service/helpers/list-query-builder/list-query-builder.js +73 -31
- package/dist/service/helpers/list-query-builder/list-query-builder.js.map +1 -1
- package/dist/service/helpers/list-query-builder/parse-filter-params.d.ts +12 -3
- package/dist/service/helpers/list-query-builder/parse-filter-params.js +44 -28
- package/dist/service/helpers/list-query-builder/parse-filter-params.js.map +1 -1
- package/dist/service/services/customer.service.js +1 -2
- package/dist/service/services/customer.service.js.map +1 -1
- package/dist/service/services/product-variant.service.js +1 -2
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/product.service.js +6 -2
- package/dist/service/services/product.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -111,7 +111,7 @@ let Populator = class Populator {
|
|
|
111
111
|
* yet exist.
|
|
112
112
|
*/
|
|
113
113
|
async populateCollections(data, channel) {
|
|
114
|
-
var _a;
|
|
114
|
+
var _a, _b;
|
|
115
115
|
const ctx = await this.createRequestContext(data, channel);
|
|
116
116
|
const allFacetValues = await this.facetValueService.findAll(ctx, ctx.languageCode);
|
|
117
117
|
const collectionMap = new Map();
|
|
@@ -140,6 +140,7 @@ let Populator = class Populator {
|
|
|
140
140
|
assetIds: assets.map(a => a.id.toString()),
|
|
141
141
|
featuredAssetId: assets.length ? assets[0].id.toString() : undefined,
|
|
142
142
|
filters,
|
|
143
|
+
inheritFilters: (_b = collectionDef.inheritFilters) !== null && _b !== void 0 ? _b : true,
|
|
143
144
|
});
|
|
144
145
|
collectionMap.set(collectionDef.name, collection);
|
|
145
146
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populator.js","sourceRoot":"","sources":["../../../../src/data-import/providers/populator/populator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"populator.js","sourceRoot":"","sources":["../../../../src/data-import/providers/populator/populator.ts"],"names":[],"mappings":"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"}
|
|
@@ -155,6 +155,9 @@ class InMemoryJobQueueStrategy extends polling_job_queue_strategy_1.PollingJobQu
|
|
|
155
155
|
applyFilters(items, filters) {
|
|
156
156
|
for (const [prop, operator] of Object.entries(filters)) {
|
|
157
157
|
const key = prop;
|
|
158
|
+
if (Array.isArray(operator)) {
|
|
159
|
+
continue;
|
|
160
|
+
}
|
|
158
161
|
if ((operator === null || operator === void 0 ? void 0 : operator.eq) !== undefined) {
|
|
159
162
|
items = items.filter(i => i[key] === operator.eq);
|
|
160
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"in-memory-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/in-memory-job-queue-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAQ6C;AAE7C,mEAAsE;AAItE,oEAAyD;AACzD,wEAAoE;AAGpE,6EAAuE;AAGvE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAa,wBAAyB,SAAQ,oDAAuB;IAArE;;QACc,SAAI,GAAG,IAAI,GAAG,EAAW,CAAC;QAC1B,kBAAa,GAAkE,EAAE,CAAC;QAEpF,qBAAgB,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,UAAU;QAEjD,0BAAqB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"in-memory-job-queue-strategy.js","sourceRoot":"","sources":["../../src/job-queue/in-memory-job-queue-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { OnApplicationBootstrap } from '@nestjs/common';
|
|
|
2
2
|
import { ID, Type } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { FindOneOptions, FindOptionsWhere, SelectQueryBuilder } from 'typeorm';
|
|
4
4
|
import { RequestContext } from '../../../api/common/request-context';
|
|
5
|
-
import { ListQueryOptions } from '../../../common/types/common-types';
|
|
5
|
+
import { FilterParameter, ListQueryOptions, NullOptionals } from '../../../common/types/common-types';
|
|
6
6
|
import { ConfigService } from '../../../config/config.service';
|
|
7
7
|
import { TransactionalConnection } from '../../../connection/transactional-connection';
|
|
8
8
|
import { VendureEntity } from '../../../entity/base/base.entity';
|
|
@@ -179,11 +179,24 @@ export declare class ListQueryBuilder implements OnApplicationBootstrap {
|
|
|
179
179
|
constructor(connection: TransactionalConnection, configService: ConfigService);
|
|
180
180
|
/** @internal */
|
|
181
181
|
onApplicationBootstrap(): any;
|
|
182
|
+
/**
|
|
183
|
+
* @description
|
|
184
|
+
* Used to determine whether a list query `filter` object contains the
|
|
185
|
+
* given property, either at the top level or nested inside a boolean
|
|
186
|
+
* `_and` or `_or` expression.
|
|
187
|
+
*
|
|
188
|
+
* This is useful when a custom property map is used to map a filter
|
|
189
|
+
* field to a related entity, and we need to determine whether the
|
|
190
|
+
* filter object contains that property, which then means we would need
|
|
191
|
+
* to join that relation.
|
|
192
|
+
*/
|
|
193
|
+
filterObjectHasProperty<FP extends FilterParameter<VendureEntity>>(filterObject: FP | NullOptionals<FP> | null | undefined, property: keyof FP): boolean;
|
|
182
194
|
/**
|
|
183
195
|
* @description
|
|
184
196
|
* Creates and configures a SelectQueryBuilder for queries that return paginated lists of entities.
|
|
185
197
|
*/
|
|
186
198
|
build<T extends VendureEntity>(entity: Type<T>, options?: ListQueryOptions<T>, extendedOptions?: ExtendedListQueryOptions<T>): SelectQueryBuilder<T>;
|
|
199
|
+
private addNestedWhereClause;
|
|
187
200
|
private parseTakeSkipParams;
|
|
188
201
|
/**
|
|
189
202
|
* @description
|
|
@@ -104,6 +104,39 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
104
104
|
onApplicationBootstrap() {
|
|
105
105
|
this.registerSQLiteRegexpFunction();
|
|
106
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* @description
|
|
109
|
+
* Used to determine whether a list query `filter` object contains the
|
|
110
|
+
* given property, either at the top level or nested inside a boolean
|
|
111
|
+
* `_and` or `_or` expression.
|
|
112
|
+
*
|
|
113
|
+
* This is useful when a custom property map is used to map a filter
|
|
114
|
+
* field to a related entity, and we need to determine whether the
|
|
115
|
+
* filter object contains that property, which then means we would need
|
|
116
|
+
* to join that relation.
|
|
117
|
+
*/
|
|
118
|
+
filterObjectHasProperty(filterObject, property) {
|
|
119
|
+
if (!filterObject) {
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
for (const key in filterObject) {
|
|
123
|
+
if (!filterObject[key]) {
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
126
|
+
if (key === property) {
|
|
127
|
+
return true;
|
|
128
|
+
}
|
|
129
|
+
if (key === '_and' || key === '_or') {
|
|
130
|
+
const value = filterObject[key];
|
|
131
|
+
for (const condition of value) {
|
|
132
|
+
if (this.filterObjectHasProperty(condition, property)) {
|
|
133
|
+
return true;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
return false;
|
|
139
|
+
}
|
|
107
140
|
/**
|
|
108
141
|
* @description
|
|
109
142
|
* Creates and configures a SelectQueryBuilder for queries that return paginated lists of entities.
|
|
@@ -144,18 +177,21 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
144
177
|
const filter = (0, parse_filter_params_1.parseFilterParams)(rawConnection, entity, options.filter, customPropertyMap, entityAlias);
|
|
145
178
|
if (filter.length) {
|
|
146
179
|
const filterOperator = (_c = options.filterOperator) !== null && _c !== void 0 ? _c : generated_types_1.LogicalOperator.AND;
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
180
|
+
qb.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
181
|
+
for (const condition of filter) {
|
|
182
|
+
if ('conditions' in condition) {
|
|
183
|
+
this.addNestedWhereClause(qb1, condition, filterOperator);
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
if (filterOperator === generated_types_1.LogicalOperator.AND) {
|
|
187
|
+
qb1.andWhere(condition.clause, condition.parameters);
|
|
188
|
+
}
|
|
189
|
+
else {
|
|
190
|
+
qb1.orWhere(condition.clause, condition.parameters);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
}));
|
|
159
195
|
}
|
|
160
196
|
if (extendedOptions.channelId) {
|
|
161
197
|
qb.leftJoin(`${alias}.channels`, 'lqb__channel').andWhere('lqb__channel.id = :channelId', {
|
|
@@ -167,6 +203,31 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
167
203
|
this.optimizeGetManyMethod(qb, repo, extendedOptions, minimumRequiredRelations);
|
|
168
204
|
return qb;
|
|
169
205
|
}
|
|
206
|
+
addNestedWhereClause(qb, whereGroup, parentOperator) {
|
|
207
|
+
if (whereGroup.conditions.length) {
|
|
208
|
+
const subQb = new typeorm_1.Brackets(qb1 => {
|
|
209
|
+
whereGroup.conditions.forEach(condition => {
|
|
210
|
+
if ('conditions' in condition) {
|
|
211
|
+
this.addNestedWhereClause(qb1, condition, whereGroup.operator);
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
if (whereGroup.operator === generated_types_1.LogicalOperator.AND) {
|
|
215
|
+
qb1.andWhere(condition.clause, condition.parameters);
|
|
216
|
+
}
|
|
217
|
+
else {
|
|
218
|
+
qb1.orWhere(condition.clause, condition.parameters);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
});
|
|
222
|
+
});
|
|
223
|
+
if (parentOperator === generated_types_1.LogicalOperator.AND) {
|
|
224
|
+
qb.andWhere(subQb);
|
|
225
|
+
}
|
|
226
|
+
else {
|
|
227
|
+
qb.orWhere(subQb);
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
170
231
|
parseTakeSkipParams(apiType, options, ignoreQueryLimits = false) {
|
|
171
232
|
var _a;
|
|
172
233
|
const { shopListQueryLimit, adminListQueryLimit } = this.configService.apiOptions;
|
|
@@ -206,10 +267,6 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
206
267
|
// to join the associated relations.
|
|
207
268
|
continue;
|
|
208
269
|
}
|
|
209
|
-
// TODO: Delete for v2
|
|
210
|
-
// This is a work-around to allow the use of the legacy table-name-based
|
|
211
|
-
// customPropertyMap syntax
|
|
212
|
-
let relationPathYieldedMatch = false;
|
|
213
270
|
const relationPath = path.split('.').slice(0, -1);
|
|
214
271
|
let targetMetadata = metadata;
|
|
215
272
|
const recontructedPath = [];
|
|
@@ -219,21 +276,6 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
219
276
|
recontructedPath.push(relationMetadata.propertyName);
|
|
220
277
|
requiredRelations.push(recontructedPath.join('.'));
|
|
221
278
|
targetMetadata = relationMetadata.inverseEntityMetadata;
|
|
222
|
-
relationPathYieldedMatch = true;
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
if (!relationPathYieldedMatch) {
|
|
226
|
-
// TODO: Delete this in v2.
|
|
227
|
-
// Legacy behaviour that uses the table name to reference relations.
|
|
228
|
-
// This causes a bunch of issues and is also a bad, unintuitive way to
|
|
229
|
-
// reference relations. See https://github.com/vendure-ecommerce/vendure/issues/1774
|
|
230
|
-
const tableNameLower = path.split('.')[0];
|
|
231
|
-
const entityMetadata = repository.manager.connection.entityMetadatas.find(em => em.tableNameWithoutPrefix === tableNameLower);
|
|
232
|
-
if (entityMetadata) {
|
|
233
|
-
const relationMetadata = metadata.relations.find(r => r.type === entityMetadata.target);
|
|
234
|
-
if (relationMetadata) {
|
|
235
|
-
requiredRelations.push(relationMetadata.propertyName);
|
|
236
|
-
}
|
|
237
279
|
}
|
|
238
280
|
}
|
|
239
281
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/list-query-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/list-query-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,22 @@
|
|
|
1
|
+
import { LogicalOperator } from '@vendure/common/lib/generated-types';
|
|
1
2
|
import { Type } from '@vendure/common/lib/shared-types';
|
|
2
|
-
import {
|
|
3
|
+
import { DataSource } from 'typeorm';
|
|
3
4
|
import { FilterParameter, NullOptionals } from '../../../common/types/common-types';
|
|
4
5
|
import { VendureEntity } from '../../../entity/base/base.entity';
|
|
6
|
+
export interface WhereGroup {
|
|
7
|
+
operator: LogicalOperator;
|
|
8
|
+
conditions: Array<WhereCondition | WhereGroup>;
|
|
9
|
+
}
|
|
5
10
|
export interface WhereCondition {
|
|
6
11
|
clause: string;
|
|
7
12
|
parameters: {
|
|
8
13
|
[param: string]: string | number | string[];
|
|
9
14
|
};
|
|
10
15
|
}
|
|
11
|
-
export declare function parseFilterParams<T extends VendureEntity
|
|
16
|
+
export declare function parseFilterParams<T extends VendureEntity, FP extends NullOptionals<FilterParameter<T>>, R extends FP extends {
|
|
17
|
+
_and: Array<FilterParameter<T>>;
|
|
18
|
+
} ? WhereGroup[] : FP extends {
|
|
19
|
+
_or: Array<FilterParameter<T>>;
|
|
20
|
+
} ? WhereGroup[] : WhereCondition[]>(connection: DataSource, entity: Type<T>, filterParams?: FP | null, customPropertyMap?: {
|
|
12
21
|
[name: string]: string;
|
|
13
|
-
}, entityAlias?: string):
|
|
22
|
+
}, entityAlias?: string): R;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseFilterParams = void 0;
|
|
4
|
+
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
4
5
|
const shared_utils_1 = require("@vendure/common/lib/shared-utils");
|
|
5
6
|
const DateUtils_1 = require("typeorm/util/DateUtils");
|
|
6
7
|
const errors_1 = require("../../../common/error/errors");
|
|
@@ -13,39 +14,54 @@ function parseFilterParams(connection, entity, filterParams, customPropertyMap,
|
|
|
13
14
|
const { columns, translationColumns, alias: defaultAlias } = (0, connection_utils_1.getColumnMetadata)(connection, entity);
|
|
14
15
|
const alias = entityAlias !== null && entityAlias !== void 0 ? entityAlias : defaultAlias;
|
|
15
16
|
const calculatedColumns = (0, get_calculated_columns_1.getCalculatedColumns)(entity);
|
|
16
|
-
const output = [];
|
|
17
17
|
const dbType = connection.options.type;
|
|
18
18
|
let argIndex = 1;
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
19
|
+
function buildConditionsForField(key, operation) {
|
|
20
|
+
const output = [];
|
|
21
|
+
const calculatedColumnDef = calculatedColumns.find(c => c.name === key);
|
|
22
|
+
const instruction = calculatedColumnDef === null || calculatedColumnDef === void 0 ? void 0 : calculatedColumnDef.listQuery;
|
|
23
|
+
const calculatedColumnExpression = instruction === null || instruction === void 0 ? void 0 : instruction.expression;
|
|
24
|
+
for (const [operator, operand] of Object.entries(operation)) {
|
|
25
|
+
let fieldName;
|
|
26
|
+
if (columns.find(c => c.propertyName === key)) {
|
|
27
|
+
fieldName = `${alias}.${key}`;
|
|
28
|
+
}
|
|
29
|
+
else if (translationColumns.find(c => c.propertyName === key)) {
|
|
30
|
+
const translationsAlias = connection.namingStrategy.eagerJoinRelationAlias(alias, 'translations');
|
|
31
|
+
fieldName = `${translationsAlias}.${key}`;
|
|
32
|
+
}
|
|
33
|
+
else if (calculatedColumnExpression) {
|
|
34
|
+
fieldName = (0, connection_utils_1.escapeCalculatedColumnExpression)(connection, calculatedColumnExpression);
|
|
35
|
+
}
|
|
36
|
+
else if (customPropertyMap === null || customPropertyMap === void 0 ? void 0 : customPropertyMap[key]) {
|
|
37
|
+
fieldName = customPropertyMap[key];
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
throw new errors_1.UserInputError('error.invalid-filter-field');
|
|
41
|
+
}
|
|
42
|
+
const condition = buildWhereCondition(fieldName, operator, operand, argIndex, dbType);
|
|
43
|
+
output.push(condition);
|
|
44
|
+
argIndex++;
|
|
45
|
+
}
|
|
46
|
+
return output;
|
|
47
|
+
}
|
|
48
|
+
function processFilterParameter(param) {
|
|
49
|
+
const result = [];
|
|
50
|
+
for (const [key, operation] of Object.entries(param)) {
|
|
51
|
+
if (key === '_and' || key === '_or') {
|
|
52
|
+
result.push({
|
|
53
|
+
operator: key === '_and' ? generated_types_1.LogicalOperator.AND : generated_types_1.LogicalOperator.OR,
|
|
54
|
+
conditions: operation.map(o => processFilterParameter(o)).flat(),
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
else if (operation && !Array.isArray(operation)) {
|
|
58
|
+
result.push(...buildConditionsForField(key, operation));
|
|
45
59
|
}
|
|
46
60
|
}
|
|
61
|
+
return result;
|
|
47
62
|
}
|
|
48
|
-
|
|
63
|
+
const conditions = processFilterParameter(filterParams);
|
|
64
|
+
return conditions;
|
|
49
65
|
}
|
|
50
66
|
exports.parseFilterParams = parseFilterParams;
|
|
51
67
|
function buildWhereCondition(fieldName, operator, operand, argIndex, dbType) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-filter-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-filter-params.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"parse-filter-params.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/parse-filter-params.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,9 +64,8 @@ let CustomerService = class CustomerService {
|
|
|
64
64
|
this.translator = translator;
|
|
65
65
|
}
|
|
66
66
|
findAll(ctx, options, relations = []) {
|
|
67
|
-
var _a;
|
|
68
67
|
const customPropertyMap = {};
|
|
69
|
-
const hasPostalCodeFilter =
|
|
68
|
+
const hasPostalCodeFilter = this.listQueryBuilder.filterObjectHasProperty(options === null || options === void 0 ? void 0 : options.filter, 'postalCode');
|
|
70
69
|
if (hasPostalCodeFilter) {
|
|
71
70
|
relations.push('addresses');
|
|
72
71
|
customPropertyMap.postalCode = 'addresses.postalCode';
|