From 71bf26aadc2142f06bdb4893a5616eaa3d757847 Mon Sep 17 00:00:00 2001 From: Mikhail Yarmaliuk Date: Thu, 16 Mar 2023 14:07:16 +0100 Subject: [PATCH] fix: endpoint service query options merge, update typeorm json query --- package-lock.json | 14 +++++++------- package.json | 2 +- src/services/endpoint.ts | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index bd8cc2f..c265fe8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@lomray/microservice-remote-middleware": "^1.7.6", "@lomray/microservices-client-api": "^2.9.0", "@lomray/microservices-types": "^1.9.1", - "@lomray/typeorm-json-query": "^2.3.1", + "@lomray/typeorm-json-query": "^2.4.0", "@opentelemetry/api": "^1.4.0", "@opentelemetry/exporter-metrics-otlp-http": "^0.35.1", "@opentelemetry/exporter-trace-otlp-http": "^0.35.1", @@ -1362,9 +1362,9 @@ } }, "node_modules/@lomray/typeorm-json-query": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@lomray/typeorm-json-query/-/typeorm-json-query-2.3.1.tgz", - "integrity": "sha512-tcEg0q8rU/XheirpXnmph/YbWFzvC3bDdiXdxip0V0xmSKsJ22HoEZcIQ40ShJKimRkqZMLy4KpCmQ4SNiY7Iw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@lomray/typeorm-json-query/-/typeorm-json-query-2.4.0.tgz", + "integrity": "sha512-2KxovP1qBSNyJX7f48EQlal5Z6LqbFldIVHSEmlVJv70a8aS+DN8UYDqIIjDHA8ZQVPhL3z+M9TR4jo96tP9tQ==", "bundleDependencies": [ "tslib" ], @@ -17715,9 +17715,9 @@ "requires": {} }, "@lomray/typeorm-json-query": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@lomray/typeorm-json-query/-/typeorm-json-query-2.3.1.tgz", - "integrity": "sha512-tcEg0q8rU/XheirpXnmph/YbWFzvC3bDdiXdxip0V0xmSKsJ22HoEZcIQ40ShJKimRkqZMLy4KpCmQ4SNiY7Iw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@lomray/typeorm-json-query/-/typeorm-json-query-2.4.0.tgz", + "integrity": "sha512-2KxovP1qBSNyJX7f48EQlal5Z6LqbFldIVHSEmlVJv70a8aS+DN8UYDqIIjDHA8ZQVPhL3z+M9TR4jo96tP9tQ==", "requires": { "@lomray/microservices-types": "^1.9.1", "tslib": "*" diff --git a/package.json b/package.json index 636ba64..3f6fc1f 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@lomray/microservice-remote-middleware": "^1.7.6", "@lomray/microservices-client-api": "^2.9.0", "@lomray/microservices-types": "^1.9.1", - "@lomray/typeorm-json-query": "^2.3.1", + "@lomray/typeorm-json-query": "^2.4.0", "@opentelemetry/api": "^1.4.0", "@opentelemetry/exporter-metrics-otlp-http": "^0.35.1", "@opentelemetry/exporter-trace-otlp-http": "^0.35.1", diff --git a/src/services/endpoint.ts b/src/services/endpoint.ts index 69c98af..2608c75 100644 --- a/src/services/endpoint.ts +++ b/src/services/endpoint.ts @@ -1103,10 +1103,10 @@ class Endpoint { async function (params, options) { const { repository, queryOptions, cache } = countOptions(); const typeQuery = createTypeQuery(repository.createQueryBuilder(), params, { - ...queryOptions, relationOptions: ['*'], isDisableOrderBy: true, isDisableAttributes: true, + ...queryOptions, }); const result = await handler(typeQuery, params, options); const { hasRemoved } = params; @@ -1215,9 +1215,9 @@ class Endpoint { async function (params, options) { const { repository, queryOptions, cache } = viewOptions(); const typeQuery = createTypeQuery(repository.createQueryBuilder(), params, { - ...queryOptions, isDisableOrderBy: true, isDisablePagination: true, + ...queryOptions, }); const result = await handler(typeQuery, params, options); @@ -1298,11 +1298,11 @@ class Endpoint { ...(params.payload?.authorization?.filter?.methodOptions ?? {}), }; const typeQuery = createTypeQuery(repository.createQueryBuilder(), params, { - ...queryOptions, relationOptions: ['*'], isDisableOrderBy: true, isDisablePagination: true, isDisableAttributes: true, + ...queryOptions, }); const primaryKeys = new Set( repository.metadata.primaryColumns.map(({ propertyName }) => propertyName), @@ -1400,11 +1400,11 @@ class Endpoint { shouldResetCache, } = { ...removeOptions(), ...(params.payload?.authorization?.filter?.methodOptions ?? {}) }; const typeQuery = createTypeQuery(repository.createQueryBuilder(), params, { - ...queryOptions, relationOptions: ['*'], isDisableOrderBy: true, isDisableAttributes: true, isDisablePagination: true, + ...queryOptions, }); const result = await handler(typeQuery, params, options); const defaultParams = { @@ -1457,11 +1457,11 @@ class Endpoint { ...(params.payload?.authorization?.filter?.methodOptions ?? {}), }; const typeQuery = createTypeQuery(repository.createQueryBuilder(), params, { - ...queryOptions, relationOptions: ['*'], isDisableOrderBy: true, isDisableAttributes: true, isDisablePagination: true, + ...queryOptions, }); const result = await handler(typeQuery, params, options); const defaultParams = { isAllowMultiple, shouldResetCache };