mongodb-dynamic-api 4.23.0 → 4.24.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/CHANGELOG.md +21 -0
- package/package.json +1 -1
- package/src/builders/route-decorators/paginated-response.builder.d.ts +3 -0
- package/src/builders/route-decorators/paginated-response.builder.js +35 -0
- package/src/builders/route-decorators/paginated-response.builder.js.map +1 -0
- package/src/builders/route-decorators/route-decorators.builder.d.ts +1 -1
- package/src/builders/route-decorators/route-decorators.builder.js +9 -2
- package/src/builders/route-decorators/route-decorators.builder.js.map +1 -1
- package/src/dtos/index.d.ts +1 -0
- package/src/dtos/index.js +1 -0
- package/src/dtos/index.js.map +1 -1
- package/src/dtos/paging.query.d.ts +4 -0
- package/src/dtos/paging.query.js +35 -0
- package/src/dtos/paging.query.js.map +1 -0
- package/src/guards/base-policies.guard.d.ts +3 -1
- package/src/guards/base-policies.guard.js +11 -1
- package/src/guards/base-policies.guard.js.map +1 -1
- package/src/helpers/index.d.ts +3 -0
- package/src/helpers/index.js +3 -0
- package/src/helpers/index.js.map +1 -1
- package/src/helpers/paging-params.helper.d.ts +13 -0
- package/src/helpers/paging-params.helper.js +14 -0
- package/src/helpers/paging-params.helper.js.map +1 -0
- package/src/helpers/paging-presenter-warning.helper.d.ts +3 -0
- package/src/helpers/paging-presenter-warning.helper.js +16 -0
- package/src/helpers/paging-presenter-warning.helper.js.map +1 -0
- package/src/helpers/pipeline-paging.helper.d.ts +3 -0
- package/src/helpers/pipeline-paging.helper.js +13 -0
- package/src/helpers/pipeline-paging.helper.js.map +1 -0
- package/src/interfaces/dynamic-api-custom-route.interface.d.ts +4 -1
- package/src/mixins/policies-guard.mixin.d.ts +2 -0
- package/src/mixins/policies-guard.mixin.js +4 -2
- package/src/mixins/policies-guard.mixin.js.map +1 -1
- package/src/modules/auth/services/base-auth.service.js +1 -1
- package/src/modules/auth/services/base-auth.service.js.map +1 -1
- package/src/routes/aggregate/aggregate-controller.mixin.js +1 -0
- package/src/routes/aggregate/aggregate-controller.mixin.js.map +1 -1
- package/src/routes/aggregate/aggregate-gateway.mixin.js +3 -1
- package/src/routes/aggregate/aggregate-gateway.mixin.js.map +1 -1
- package/src/routes/aggregate/base-aggregate.service.d.ts +0 -1
- package/src/routes/aggregate/base-aggregate.service.js +3 -11
- package/src/routes/aggregate/base-aggregate.service.js.map +1 -1
- package/src/routes/custom/create-custom-route-controller.js +6 -3
- package/src/routes/custom/create-custom-route-controller.js.map +1 -1
- package/src/routes/custom/create-custom-route-gateway.js +6 -3
- package/src/routes/custom/create-custom-route-gateway.js.map +1 -1
- package/src/routes/custom/custom-route-callback.service.d.ts +7 -0
- package/src/routes/custom/custom-route-callback.service.js +11 -0
- package/src/routes/custom/custom-route-callback.service.js.map +1 -0
- package/src/services/base/base.service.d.ts +1 -0
- package/src/services/base/base.service.js +9 -0
- package/src/services/base/base.service.js.map +1 -1
- package/src/services/dynamic-api-cache/dynamic-api-cache.service.js.map +1 -1
- package/src/version.json +1 -1
- package/test/for-feature/aggregate-ability-predicate-paging.e2e-spec.d.ts +1 -0
- package/test/for-feature/aggregate-ability-predicate-paging.e2e-spec.js +157 -0
- package/test/for-feature/aggregate-ability-predicate-paging.e2e-spec.js.map +1 -0
- package/test/for-feature/aggregate-paging-without-from-aggregate.e2e-spec.d.ts +1 -0
- package/test/for-feature/aggregate-paging-without-from-aggregate.e2e-spec.js +68 -0
- package/test/for-feature/aggregate-paging-without-from-aggregate.e2e-spec.js.map +1 -0
- package/test/for-feature/aggregate-swagger-paginated-response.e2e-spec.d.ts +1 -0
- package/test/for-feature/aggregate-swagger-paginated-response.e2e-spec.js +98 -0
- package/test/for-feature/aggregate-swagger-paginated-response.e2e-spec.js.map +1 -0
- package/test/for-feature/cache-scoped-invalidation.e2e-spec.js +34 -0
- package/test/for-feature/cache-scoped-invalidation.e2e-spec.js.map +1 -1
- package/test/for-feature/custom-route-auth-ability-predicate.e2e-spec.d.ts +1 -0
- package/test/for-feature/custom-route-auth-ability-predicate.e2e-spec.js +108 -0
- package/test/for-feature/custom-route-auth-ability-predicate.e2e-spec.js.map +1 -0
- package/test/for-feature/derived-fields-raw-write-recompute.e2e-spec.js +24 -0
- package/test/for-feature/derived-fields-raw-write-recompute.e2e-spec.js.map +1 -1
- package/test/for-feature/index-sync.e2e-spec.js +42 -0
- package/test/for-feature/index-sync.e2e-spec.js.map +1 -1
- package/test/for-feature/paging-query-helper.e2e-spec.d.ts +1 -0
- package/test/for-feature/paging-query-helper.e2e-spec.js +92 -0
- package/test/for-feature/paging-query-helper.e2e-spec.js.map +1 -0
- package/test/for-root/auth-api-update-account-derived-field.e2e-spec.d.ts +1 -0
- package/test/for-root/auth-api-update-account-derived-field.e2e-spec.js +71 -0
- package/test/for-root/auth-api-update-account-derived-field.e2e-spec.js.map +1 -0
- package/tsconfig.tsbuildinfo +1 -1
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const mongoose_1 = require("@nestjs/mongoose");
|
|
13
|
+
const mongodb_pipeline_builder_1 = require("mongodb-pipeline-builder");
|
|
14
|
+
const mongoose_2 = require("mongoose");
|
|
15
|
+
const src_1 = require("../../src");
|
|
16
|
+
const e2e_setup_1 = require("../e2e.setup");
|
|
17
|
+
require("dotenv/config");
|
|
18
|
+
const utils_1 = require("../utils");
|
|
19
|
+
const shared_1 = require("../shared");
|
|
20
|
+
describe('DynamicApiModule forFeature - Aggregate .Paging() without fromAggregate (e2e)', () => {
|
|
21
|
+
beforeEach(() => {
|
|
22
|
+
src_1.DynamicApiModule.state['resetState']();
|
|
23
|
+
});
|
|
24
|
+
afterEach(async () => {
|
|
25
|
+
await (0, e2e_setup_1.closeTestingApp)(mongoose_2.default.connections);
|
|
26
|
+
});
|
|
27
|
+
let PagingNoPresenterProductEntity = class PagingNoPresenterProductEntity extends src_1.BaseEntity {
|
|
28
|
+
};
|
|
29
|
+
__decorate([
|
|
30
|
+
(0, mongoose_1.Prop)({ type: String, required: true }),
|
|
31
|
+
__metadata("design:type", String)
|
|
32
|
+
], PagingNoPresenterProductEntity.prototype, "name", void 0);
|
|
33
|
+
PagingNoPresenterProductEntity = __decorate([
|
|
34
|
+
(0, mongoose_1.Schema)({ collection: 'paging_no_presenter_products' })
|
|
35
|
+
], PagingNoPresenterProductEntity);
|
|
36
|
+
class ProductPagingQuery {
|
|
37
|
+
static toPipeline() {
|
|
38
|
+
return new mongodb_pipeline_builder_1.PipelineBuilder('paging-no-presenter-products')
|
|
39
|
+
.Sort({ name: 1 })
|
|
40
|
+
.Paging(2, 1)
|
|
41
|
+
.build();
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
beforeEach(async () => {
|
|
45
|
+
await (0, shared_1.initApp)({
|
|
46
|
+
entity: PagingNoPresenterProductEntity,
|
|
47
|
+
controllerOptions: { path: 'paging-no-presenter-products', isPublic: true },
|
|
48
|
+
routes: [
|
|
49
|
+
{
|
|
50
|
+
type: 'Aggregate',
|
|
51
|
+
subPath: 'aggregate',
|
|
52
|
+
dTOs: { query: ProductPagingQuery },
|
|
53
|
+
},
|
|
54
|
+
],
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
it('returns a plain array — count/totalPage are silently absent, unchanged from before the fix', async () => {
|
|
58
|
+
const model = await (0, utils_1.getModelFromEntity)(PagingNoPresenterProductEntity);
|
|
59
|
+
await model.insertMany([{ name: 'apple' }, { name: 'banana' }, { name: 'cherry' }]);
|
|
60
|
+
const { status, body } = await e2e_setup_1.server.get('/paging-no-presenter-products/aggregate', { query: {} });
|
|
61
|
+
expect(status).toBe(200);
|
|
62
|
+
expect(Array.isArray(body)).toBe(true);
|
|
63
|
+
expect(body).toHaveLength(2);
|
|
64
|
+
expect(body.count).toBeUndefined();
|
|
65
|
+
expect(body.totalPage).toBeUndefined();
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
//# sourceMappingURL=aggregate-paging-without-from-aggregate.e2e-spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aggregate-paging-without-from-aggregate.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/aggregate-paging-without-from-aggregate.e2e-spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+CAAgD;AAChD,uEAA0E;AAC1E,uCAAgC;AAChC,mCAAyD;AACzD,4CAAuD;AACvD,yBAAuB;AACvB,oCAA8C;AAC9C,sCAAoC;AAgBpC,QAAQ,CAAC,+EAA+E,EAAE,GAAG,EAAE;IAE7F,UAAU,CAAC,GAAG,EAAE;QACd,sBAAgB,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,IAAA,2BAAe,EAAC,kBAAQ,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAGH,IAAM,8BAA8B,GAApC,MAAM,8BAA+B,SAAQ,gBAAU;KAGtD,CAAA;IADC;QADC,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gEAC1B;IAFT,8BAA8B;QADnC,IAAA,iBAAM,EAAC,EAAE,UAAU,EAAE,8BAA8B,EAAE,CAAC;OACjD,8BAA8B,CAGnC;IAED,MAAM,kBAAkB;QACtB,MAAM,CAAC,UAAU;YACf,OAAO,IAAI,0CAAe,CAAC,8BAA8B,CAAC;iBACzD,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;iBACjB,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;iBACZ,KAAK,EAAE,CAAC;QACX,CAAC;KACF;IAED,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,IAAA,gBAAO,EAAC;YACZ,MAAM,EAAE,8BAA8B;YACtC,iBAAiB,EAAE,EAAE,IAAI,EAAE,8BAA8B,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC3E,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,WAAW;oBAEpB,IAAI,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE;iBACpC;aACF;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4FAA4F,EAAE,KAAK,IAAI,EAAE;QAC1G,MAAM,KAAK,GAAG,MAAM,IAAA,0BAAkB,EAAC,8BAA8B,CAAC,CAAC;QACvE,MAAM,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;QAEpF,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,kBAAM,CAAC,GAAG,CAAC,yCAAyC,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;QAEpG,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAI7B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;QACnC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,aAAa,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import 'dotenv/config';
|
|
@@ -0,0 +1,98 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const mongoose_1 = require("@nestjs/mongoose");
|
|
13
|
+
const swagger_1 = require("@nestjs/swagger");
|
|
14
|
+
const mongodb_pipeline_builder_1 = require("mongodb-pipeline-builder");
|
|
15
|
+
const mongoose_2 = require("mongoose");
|
|
16
|
+
const src_1 = require("../../src");
|
|
17
|
+
const e2e_setup_1 = require("../e2e.setup");
|
|
18
|
+
require("dotenv/config");
|
|
19
|
+
const shared_1 = require("../shared");
|
|
20
|
+
describe('DynamicApiModule forFeature - Aggregate paginated response in OpenAPI (e2e)', () => {
|
|
21
|
+
beforeEach(() => {
|
|
22
|
+
src_1.DynamicApiModule.state['resetState']();
|
|
23
|
+
});
|
|
24
|
+
afterEach(async () => {
|
|
25
|
+
await (0, e2e_setup_1.closeTestingApp)(mongoose_2.default.connections);
|
|
26
|
+
});
|
|
27
|
+
let OpenApiPaginatedProductEntity = class OpenApiPaginatedProductEntity extends src_1.BaseEntity {
|
|
28
|
+
};
|
|
29
|
+
__decorate([
|
|
30
|
+
(0, mongoose_1.Prop)({ type: String, required: true }),
|
|
31
|
+
__metadata("design:type", String)
|
|
32
|
+
], OpenApiPaginatedProductEntity.prototype, "name", void 0);
|
|
33
|
+
OpenApiPaginatedProductEntity = __decorate([
|
|
34
|
+
(0, mongoose_1.Schema)({ collection: 'openapi_paginated_products' })
|
|
35
|
+
], OpenApiPaginatedProductEntity);
|
|
36
|
+
class ProductPagedPresenter {
|
|
37
|
+
static fromAggregate(list, count, totalPage) {
|
|
38
|
+
return { list, count, totalPage };
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
class ProductAggregateQuery {
|
|
42
|
+
static toPipeline() {
|
|
43
|
+
return new mongodb_pipeline_builder_1.PipelineBuilder('openapi-paginated-products')
|
|
44
|
+
.Sort({ name: 1 })
|
|
45
|
+
.Paging(10, 1)
|
|
46
|
+
.build();
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
it('documents { list, count, totalPage } instead of a bare presenter when fromAggregate exists', async () => {
|
|
50
|
+
await (0, shared_1.initApp)({
|
|
51
|
+
entity: OpenApiPaginatedProductEntity,
|
|
52
|
+
controllerOptions: { path: 'openapi-paginated-products', isPublic: true },
|
|
53
|
+
routes: [
|
|
54
|
+
{
|
|
55
|
+
type: 'Aggregate',
|
|
56
|
+
subPath: 'aggregate',
|
|
57
|
+
dTOs: { query: ProductAggregateQuery, presenter: ProductPagedPresenter },
|
|
58
|
+
},
|
|
59
|
+
],
|
|
60
|
+
});
|
|
61
|
+
const document = swagger_1.SwaggerModule.createDocument(global.app, new swagger_1.DocumentBuilder().build());
|
|
62
|
+
const operation = document.paths['/openapi-paginated-products/aggregate']?.get;
|
|
63
|
+
expect(operation).toBeDefined();
|
|
64
|
+
const responseSchema = operation?.responses?.default?.content?.['application/json']?.schema;
|
|
65
|
+
expect(responseSchema).toBeDefined();
|
|
66
|
+
expect('$ref' in responseSchema).toBe(true);
|
|
67
|
+
const schemaName = (responseSchema.$ref).split('/').pop();
|
|
68
|
+
expect(schemaName).toMatch(/^Paginated/);
|
|
69
|
+
const wrapperSchema = document.components?.schemas?.[schemaName];
|
|
70
|
+
expect(wrapperSchema).toBeDefined();
|
|
71
|
+
expect(wrapperSchema.properties.list.type).toBe('array');
|
|
72
|
+
expect(wrapperSchema.properties.list.items).toHaveProperty('$ref');
|
|
73
|
+
expect(wrapperSchema.properties.count.type).toBe('number');
|
|
74
|
+
expect(wrapperSchema.properties.totalPage.type).toBe('number');
|
|
75
|
+
const itemSchemaName = wrapperSchema.properties.list.items.$ref.split('/').pop();
|
|
76
|
+
expect(document.components?.schemas?.[itemSchemaName]).toBeDefined();
|
|
77
|
+
});
|
|
78
|
+
it('keeps documenting a bare presenter for an Aggregate route with no fromAggregate', async () => {
|
|
79
|
+
await (0, shared_1.initApp)({
|
|
80
|
+
entity: OpenApiPaginatedProductEntity,
|
|
81
|
+
controllerOptions: { path: 'openapi-plain-products', isPublic: true },
|
|
82
|
+
routes: [
|
|
83
|
+
{
|
|
84
|
+
type: 'Aggregate',
|
|
85
|
+
subPath: 'aggregate',
|
|
86
|
+
dTOs: { query: ProductAggregateQuery },
|
|
87
|
+
},
|
|
88
|
+
],
|
|
89
|
+
});
|
|
90
|
+
const document = swagger_1.SwaggerModule.createDocument(global.app, new swagger_1.DocumentBuilder().build());
|
|
91
|
+
const operation = document.paths['/openapi-plain-products/aggregate']?.get;
|
|
92
|
+
const responseSchema = operation?.responses?.default?.content?.['application/json']?.schema;
|
|
93
|
+
expect(responseSchema).toBeDefined();
|
|
94
|
+
const schemaName = (responseSchema.$ref ?? '').split('/').pop() ?? '';
|
|
95
|
+
expect(schemaName).not.toMatch(/^Paginated/);
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
//# sourceMappingURL=aggregate-swagger-paginated-response.e2e-spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aggregate-swagger-paginated-response.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/aggregate-swagger-paginated-response.e2e-spec.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,+CAAgD;AAChD,6CAAgF;AAChF,uEAA0E;AAC1E,uCAAgC;AAChC,mCAAyD;AACzD,4CAA+C;AAC/C,yBAAuB;AACvB,sCAAoC;AAepC,QAAQ,CAAC,6EAA6E,EAAE,GAAG,EAAE;IAE3F,UAAU,CAAC,GAAG,EAAE;QACd,sBAAgB,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,IAAA,2BAAe,EAAC,kBAAQ,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAGH,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,gBAAU;KAGrD,CAAA;IADC;QADC,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+DAC1B;IAFT,6BAA6B;QADlC,IAAA,iBAAM,EAAC,EAAE,UAAU,EAAE,4BAA4B,EAAE,CAAC;OAC/C,6BAA6B,CAGlC;IAED,MAAM,qBAAqB;QACzB,MAAM,CAAC,aAAa,CAAC,IAAqC,EAAE,KAAa,EAAE,SAAiB;YAC1F,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;QACpC,CAAC;KACF;IAED,MAAM,qBAAqB;QACzB,MAAM,CAAC,UAAU;YACf,OAAO,IAAI,0CAAe,CAAC,4BAA4B,CAAC;iBACvD,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;iBACjB,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;iBACb,KAAK,EAAE,CAAC;QACX,CAAC;KACF;IAED,EAAE,CAAC,4FAA4F,EAAE,KAAK,IAAI,EAAE;QAC1G,MAAM,IAAA,gBAAO,EAAC;YACZ,MAAM,EAAE,6BAA6B;YACrC,iBAAiB,EAAE,EAAE,IAAI,EAAE,4BAA4B,EAAE,QAAQ,EAAE,IAAI,EAAE;YACzE,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,WAAW;oBACpB,IAAI,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE,SAAS,EAAE,qBAAqB,EAAE;iBACzE;aACF;SACF,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAkB,uBAAa,CAAC,cAAc,CAC1D,MAAM,CAAC,GAAuB,EAC9B,IAAI,yBAAe,EAAE,CAAC,KAAK,EAAE,CAC9B,CAAC;QAEF,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,uCAAuC,CAAC,EAAE,GAAG,CAAC;QAC/E,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;QAIhC,MAAM,cAAc,GAAI,SAAS,EAAE,SAAS,EAAE,OAAe,EAAE,OAAO,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;QACrG,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,CAAC;QACrC,MAAM,CAAC,MAAM,IAAK,cAAyB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAExD,MAAM,UAAU,GAAG,CAAE,cAAmC,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAY,CAAC;QAC1F,MAAM,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAEzC,MAAM,aAAa,GAAG,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,UAAU,CAAQ,CAAC;QACxE,MAAM,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;QACpC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzD,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QACnE,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3D,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAI/D,MAAM,cAAc,GAAI,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAC7F,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,cAAwB,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACjF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iFAAiF,EAAE,KAAK,IAAI,EAAE;QAC/F,MAAM,IAAA,gBAAO,EAAC;YACZ,MAAM,EAAE,6BAA6B;YACrC,iBAAiB,EAAE,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE;YACrE,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,WAAW;oBAEpB,IAAI,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE;iBACvC;aACF;SACF,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAkB,uBAAa,CAAC,cAAc,CAC1D,MAAM,CAAC,GAAuB,EAC9B,IAAI,yBAAe,EAAE,CAAC,KAAK,EAAE,CAC9B,CAAC;QAEF,MAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,mCAAmC,CAAC,EAAE,GAAG,CAAC;QAC3E,MAAM,cAAc,GAAI,SAAS,EAAE,SAAS,EAAE,OAAe,EAAE,OAAO,EAAE,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAErG,MAAM,CAAC,cAAc,CAAC,CAAC,WAAW,EAAE,CAAC;QAGrC,MAAM,UAAU,GAAG,CAAE,cAAc,CAAC,IAAe,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QAClF,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -132,5 +132,39 @@ describe('DynamicApiModule forFeature - scoped cache invalidation (e2e)', () =>
|
|
|
132
132
|
expect(fresh.body).toHaveLength(2);
|
|
133
133
|
});
|
|
134
134
|
});
|
|
135
|
+
describe('suggestion #11 — DynamicApiCacheService reachable from a custom route handler via inject', () => {
|
|
136
|
+
const invalidateProductsRoute = {
|
|
137
|
+
path: 'bulk-rename',
|
|
138
|
+
method: 'POST',
|
|
139
|
+
isPublic: true,
|
|
140
|
+
inject: [src_1.DynamicApiCacheService],
|
|
141
|
+
handler: async ({ methods, body }, [cacheService]) => {
|
|
142
|
+
const { from, to } = body;
|
|
143
|
+
await methods.updateManyDocuments(CacheScopeProductEntity, { name: from }, { $set: { name: to } });
|
|
144
|
+
await cacheService.invalidate(CacheScopeProductEntity);
|
|
145
|
+
return { renamed: true };
|
|
146
|
+
},
|
|
147
|
+
};
|
|
148
|
+
beforeEach(async () => {
|
|
149
|
+
await (0, shared_1.initApp)({
|
|
150
|
+
entity: CacheScopeProductEntity,
|
|
151
|
+
controllerOptions: { path: 'cache-scope-products', isPublic: true },
|
|
152
|
+
routes: [{ type: 'GetMany' }],
|
|
153
|
+
customRoutes: [invalidateProductsRoute],
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
it('should leave the cache stale after methods.updateManyDocuments alone, then refresh it once the injected DynamicApiCacheService invalidates', async () => {
|
|
157
|
+
const model = await (0, utils_1.getModelFromEntity)(CacheScopeProductEntity);
|
|
158
|
+
await model.insertMany([{ name: 'old-name' }]);
|
|
159
|
+
const first = await e2e_setup_1.server.get('/cache-scope-products');
|
|
160
|
+
expect(first.body).toHaveLength(1);
|
|
161
|
+
expect(first.body[0].name).toBe('old-name');
|
|
162
|
+
const renamed = await e2e_setup_1.server.post('/cache-scope-products/bulk-rename', { from: 'old-name', to: 'new-name' });
|
|
163
|
+
expect(renamed.status).toBe(201);
|
|
164
|
+
const fresh = await e2e_setup_1.server.get('/cache-scope-products');
|
|
165
|
+
expect(fresh.body).toHaveLength(1);
|
|
166
|
+
expect(fresh.body[0].name).toBe('new-name');
|
|
167
|
+
});
|
|
168
|
+
});
|
|
135
169
|
});
|
|
136
170
|
//# sourceMappingURL=cache-scoped-invalidation.e2e-spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-scoped-invalidation.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/cache-scoped-invalidation.e2e-spec.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,+CAAgD;AAChD,uCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"cache-scoped-invalidation.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/cache-scoped-invalidation.e2e-spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import 'dotenv/config';
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const mongoose_1 = require("@nestjs/mongoose");
|
|
13
|
+
const mongoose_2 = require("mongoose");
|
|
14
|
+
const src_1 = require("../../src");
|
|
15
|
+
const e2e_setup_1 = require("../e2e.setup");
|
|
16
|
+
require("dotenv/config");
|
|
17
|
+
const shared_1 = require("../shared");
|
|
18
|
+
describe('DynamicApiModule forFeature - custom route authAbilityPredicate (e2e)', () => {
|
|
19
|
+
beforeEach(() => {
|
|
20
|
+
src_1.DynamicApiModule.state['resetState']();
|
|
21
|
+
});
|
|
22
|
+
afterEach(async () => {
|
|
23
|
+
await (0, e2e_setup_1.closeTestingApp)(mongoose_2.default.connections);
|
|
24
|
+
});
|
|
25
|
+
let AuthPredicateUserEntity = class AuthPredicateUserEntity extends src_1.BaseEntity {
|
|
26
|
+
};
|
|
27
|
+
__decorate([
|
|
28
|
+
(0, mongoose_1.Prop)({ type: String, required: true }),
|
|
29
|
+
__metadata("design:type", String)
|
|
30
|
+
], AuthPredicateUserEntity.prototype, "email", void 0);
|
|
31
|
+
__decorate([
|
|
32
|
+
(0, mongoose_1.Prop)({ type: String, required: true }),
|
|
33
|
+
__metadata("design:type", String)
|
|
34
|
+
], AuthPredicateUserEntity.prototype, "password", void 0);
|
|
35
|
+
__decorate([
|
|
36
|
+
(0, mongoose_1.Prop)({ type: String, default: 'user' }),
|
|
37
|
+
__metadata("design:type", String)
|
|
38
|
+
], AuthPredicateUserEntity.prototype, "role", void 0);
|
|
39
|
+
AuthPredicateUserEntity = __decorate([
|
|
40
|
+
(0, mongoose_1.Schema)({ collection: 'auth_predicate_users' })
|
|
41
|
+
], AuthPredicateUserEntity);
|
|
42
|
+
let AuthPredicateAdminAuditLogEntity = class AuthPredicateAdminAuditLogEntity extends src_1.BaseEntity {
|
|
43
|
+
};
|
|
44
|
+
__decorate([
|
|
45
|
+
(0, mongoose_1.Prop)({ type: String }),
|
|
46
|
+
__metadata("design:type", String)
|
|
47
|
+
], AuthPredicateAdminAuditLogEntity.prototype, "action", void 0);
|
|
48
|
+
AuthPredicateAdminAuditLogEntity = __decorate([
|
|
49
|
+
(0, mongoose_1.Schema)({ collection: 'auth_predicate_admin_audit_log' })
|
|
50
|
+
], AuthPredicateAdminAuditLogEntity);
|
|
51
|
+
const registerAndLogin = async (email, role) => {
|
|
52
|
+
await e2e_setup_1.server.post('/auth/register', { email, password: 'password123', role });
|
|
53
|
+
const { body: { accessToken } } = await e2e_setup_1.server.post('/auth/login', { email, password: 'password123' });
|
|
54
|
+
const { body: account } = await e2e_setup_1.server.get('/auth/account', { authToken: accessToken });
|
|
55
|
+
return { accessToken, id: account.id };
|
|
56
|
+
};
|
|
57
|
+
const isAdminRole = (_entity, user) => user.role === 'admin';
|
|
58
|
+
const adminOverviewRoute = (useAuthAbilityPredicate) => ({
|
|
59
|
+
path: 'admin-overview',
|
|
60
|
+
method: 'GET',
|
|
61
|
+
...(useAuthAbilityPredicate
|
|
62
|
+
? { authAbilityPredicate: (user) => user.role === 'admin' }
|
|
63
|
+
: { abilityPredicate: isAdminRole }),
|
|
64
|
+
handler: async () => ({ ok: true }),
|
|
65
|
+
});
|
|
66
|
+
const setup = async (useAuthAbilityPredicate) => {
|
|
67
|
+
await (0, shared_1.initApp)({
|
|
68
|
+
entity: AuthPredicateAdminAuditLogEntity,
|
|
69
|
+
controllerOptions: { path: 'auth-predicate-admin-audit-log' },
|
|
70
|
+
customRoutes: [adminOverviewRoute(useAuthAbilityPredicate)],
|
|
71
|
+
}, {
|
|
72
|
+
useAuth: {
|
|
73
|
+
userEntity: AuthPredicateUserEntity,
|
|
74
|
+
login: { loginField: 'email', passwordField: 'password', additionalFields: ['role'] },
|
|
75
|
+
register: {
|
|
76
|
+
additionalFields: [{ name: 'role', required: false }],
|
|
77
|
+
},
|
|
78
|
+
},
|
|
79
|
+
});
|
|
80
|
+
};
|
|
81
|
+
describe('abilityPredicate on a document-less route — the bug this option exists to fix', () => {
|
|
82
|
+
beforeEach(() => setup(false));
|
|
83
|
+
it('demonstrates the fail-open bug: a non-admin gets 200 because the backing collection is empty', async () => {
|
|
84
|
+
const nonAdmin = await registerAndLogin('member@auth-predicate.co', 'user');
|
|
85
|
+
const { status } = await e2e_setup_1.server.get('/auth-predicate-admin-audit-log/admin-overview', { authToken: nonAdmin.accessToken });
|
|
86
|
+
expect(status).toBe(200);
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
describe('authAbilityPredicate on the same document-less route — the fix', () => {
|
|
90
|
+
beforeEach(() => setup(true));
|
|
91
|
+
it('denies a non-admin, regardless of the backing collection being empty', async () => {
|
|
92
|
+
const nonAdmin = await registerAndLogin('member2@auth-predicate.co', 'user');
|
|
93
|
+
const { status } = await e2e_setup_1.server.get('/auth-predicate-admin-audit-log/admin-overview', { authToken: nonAdmin.accessToken });
|
|
94
|
+
expect(status).toBe(403);
|
|
95
|
+
});
|
|
96
|
+
it('allows an admin', async () => {
|
|
97
|
+
const admin = await registerAndLogin('admin@auth-predicate.co', 'admin');
|
|
98
|
+
const { status, body } = await e2e_setup_1.server.get('/auth-predicate-admin-audit-log/admin-overview', { authToken: admin.accessToken });
|
|
99
|
+
expect(status).toBe(200);
|
|
100
|
+
expect(body).toEqual({ ok: true });
|
|
101
|
+
});
|
|
102
|
+
it('denies an unauthenticated request', async () => {
|
|
103
|
+
const { status } = await e2e_setup_1.server.get('/auth-predicate-admin-audit-log/admin-overview');
|
|
104
|
+
expect(status).toBe(401);
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
});
|
|
108
|
+
//# sourceMappingURL=custom-route-auth-ability-predicate.e2e-spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"custom-route-auth-ability-predicate.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/custom-route-auth-ability-predicate.e2e-spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -124,5 +124,29 @@ describe('DynamicApiModule forFeature - @DerivedField recompute on raw writes (e
|
|
|
124
124
|
expect(stale.body.total).toBe(20);
|
|
125
125
|
});
|
|
126
126
|
});
|
|
127
|
+
describe('a custom route handler using the newly-exposed ctx.methods — closes the gap above', () => {
|
|
128
|
+
it('recomputes the derived field via methods.updateOneDocument, unlike the raw ctx.model write', async () => {
|
|
129
|
+
const setQuantityRoute = {
|
|
130
|
+
path: ':id/quantity',
|
|
131
|
+
method: 'PATCH',
|
|
132
|
+
handler: async ({ params, body, methods }) => {
|
|
133
|
+
await methods.updateOneDocument(DerivedOrderEntity, { _id: params.id }, { $set: { quantity: body.quantity } });
|
|
134
|
+
return methods.findOneDocument(DerivedOrderEntity, { _id: params.id });
|
|
135
|
+
},
|
|
136
|
+
};
|
|
137
|
+
await (0, shared_1.initApp)({
|
|
138
|
+
entity: DerivedOrderEntity,
|
|
139
|
+
controllerOptions: { path: 'derived-orders', isPublic: true },
|
|
140
|
+
routes: [{ type: 'CreateOne' }, { type: 'GetOne' }],
|
|
141
|
+
customRoutes: [setQuantityRoute],
|
|
142
|
+
});
|
|
143
|
+
const created = await e2e_setup_1.server.post('/derived-orders', { quantity: 2, unitPrice: 10 });
|
|
144
|
+
expect(created.body.total).toBe(20);
|
|
145
|
+
await e2e_setup_1.server.patch(`/derived-orders/${created.body.id}/quantity`, { quantity: 9 });
|
|
146
|
+
const refreshed = await e2e_setup_1.server.get(`/derived-orders/${created.body.id}`);
|
|
147
|
+
expect(refreshed.body.quantity).toBe(9);
|
|
148
|
+
expect(refreshed.body.total).toBe(90);
|
|
149
|
+
});
|
|
150
|
+
});
|
|
127
151
|
});
|
|
128
152
|
//# sourceMappingURL=derived-fields-raw-write-recompute.e2e-spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"derived-fields-raw-write-recompute.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/derived-fields-raw-write-recompute.e2e-spec.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,+CAAgD;AAChD,uCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"derived-fields-raw-write-recompute.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/derived-fields-raw-write-recompute.e2e-spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,5 +84,47 @@ describe('enableDynamicAPIIndexSync (e2e)', () => {
|
|
|
84
84
|
expect(indexes.some((index) => index.unique && index.key.email === 1)).toBe(true);
|
|
85
85
|
});
|
|
86
86
|
});
|
|
87
|
+
let InvalidPartialFilterUserEntity = class InvalidPartialFilterUserEntity extends src_1.BaseEntity {
|
|
88
|
+
};
|
|
89
|
+
__decorate([
|
|
90
|
+
(0, mongoose_1.Prop)({ type: String }),
|
|
91
|
+
__metadata("design:type", String)
|
|
92
|
+
], InvalidPartialFilterUserEntity.prototype, "email", void 0);
|
|
93
|
+
InvalidPartialFilterUserEntity = __decorate([
|
|
94
|
+
(0, src_1.DynamicAPISchemaOptions)({
|
|
95
|
+
indexes: [
|
|
96
|
+
{
|
|
97
|
+
fields: { email: 1 },
|
|
98
|
+
options: { unique: true, partialFilterExpression: { email: { $ne: null } } },
|
|
99
|
+
},
|
|
100
|
+
],
|
|
101
|
+
}),
|
|
102
|
+
(0, mongoose_1.Schema)({ collection: 'index-sync-invalid-partial-filter-users' })
|
|
103
|
+
], InvalidPartialFilterUserEntity);
|
|
104
|
+
describe('when a declared index is rejected by MongoDB for a reason other than a duplicate key', () => {
|
|
105
|
+
const bootInvalidPartialFilterApp = async () => {
|
|
106
|
+
const moduleRef = await testing_1.Test.createTestingModule({
|
|
107
|
+
imports: [
|
|
108
|
+
src_1.DynamicApiModule.forRoot(uri),
|
|
109
|
+
src_1.DynamicApiModule.forFeature({
|
|
110
|
+
entity: InvalidPartialFilterUserEntity,
|
|
111
|
+
controllerOptions: { path: 'index-sync-invalid-partial-filter-users' },
|
|
112
|
+
}),
|
|
113
|
+
],
|
|
114
|
+
}).compile();
|
|
115
|
+
return (0, e2e_setup_1.createTestingApp)(moduleRef);
|
|
116
|
+
};
|
|
117
|
+
it('boots without any error and never actually creates the index when enableDynamicAPIIndexSync is not called — the silent failure suggestion #13 reports', async () => {
|
|
118
|
+
const app = await bootInvalidPartialFilterApp();
|
|
119
|
+
await new Promise((resolve) => setTimeout(resolve, 1000));
|
|
120
|
+
const model = await (0, utils_1.getModelFromEntity)(InvalidPartialFilterUserEntity);
|
|
121
|
+
const indexes = await model.collection.indexes();
|
|
122
|
+
expect(indexes.some((index) => index.unique)).toBe(false);
|
|
123
|
+
});
|
|
124
|
+
it('rejects loudly with the real MongoDB error when enableDynamicAPIIndexSync is called', async () => {
|
|
125
|
+
const app = await bootInvalidPartialFilterApp();
|
|
126
|
+
await expect((0, src_1.enableDynamicAPIIndexSync)(app)).rejects.toThrow(/partial index/i);
|
|
127
|
+
});
|
|
128
|
+
});
|
|
87
129
|
});
|
|
88
130
|
//# sourceMappingURL=index-sync.e2e-spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index-sync.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/index-sync.e2e-spec.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index-sync.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/index-sync.e2e-spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import 'dotenv/config';
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
const mongoose_1 = require("@nestjs/mongoose");
|
|
13
|
+
const mongodb_pipeline_builder_1 = require("mongodb-pipeline-builder");
|
|
14
|
+
const mongoose_2 = require("mongoose");
|
|
15
|
+
const src_1 = require("../../src");
|
|
16
|
+
const e2e_setup_1 = require("../e2e.setup");
|
|
17
|
+
require("dotenv/config");
|
|
18
|
+
const utils_1 = require("../utils");
|
|
19
|
+
const shared_1 = require("../shared");
|
|
20
|
+
describe('DynamicApiModule forFeature - PagingQuery + parsePagingParams (e2e)', () => {
|
|
21
|
+
beforeEach(() => {
|
|
22
|
+
src_1.DynamicApiModule.state['resetState']();
|
|
23
|
+
});
|
|
24
|
+
afterEach(async () => {
|
|
25
|
+
await (0, e2e_setup_1.closeTestingApp)(mongoose_2.default.connections);
|
|
26
|
+
});
|
|
27
|
+
let PagingQueryHelperProductEntity = class PagingQueryHelperProductEntity extends src_1.BaseEntity {
|
|
28
|
+
};
|
|
29
|
+
__decorate([
|
|
30
|
+
(0, mongoose_1.Prop)({ type: String, required: true }),
|
|
31
|
+
__metadata("design:type", String)
|
|
32
|
+
], PagingQueryHelperProductEntity.prototype, "name", void 0);
|
|
33
|
+
PagingQueryHelperProductEntity = __decorate([
|
|
34
|
+
(0, mongoose_1.Schema)({ collection: 'paging_query_helper_products' })
|
|
35
|
+
], PagingQueryHelperProductEntity);
|
|
36
|
+
class ProductStatsQuery extends src_1.PagingQuery {
|
|
37
|
+
static toPipeline(query) {
|
|
38
|
+
const { page, pageSize } = (0, src_1.parsePagingParams)(query, { defaultPageSize: 2, maxPageSize: 10 });
|
|
39
|
+
return new mongodb_pipeline_builder_1.PipelineBuilder('paging-query-helper-products')
|
|
40
|
+
.Sort({ name: 1 })
|
|
41
|
+
.Paging(pageSize, page)
|
|
42
|
+
.build();
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
class ProductStatsPresenter {
|
|
46
|
+
static fromAggregate(list, count, totalPage) {
|
|
47
|
+
return { list, count, totalPage };
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
beforeEach(async () => {
|
|
51
|
+
await (0, shared_1.initApp)({
|
|
52
|
+
entity: PagingQueryHelperProductEntity,
|
|
53
|
+
controllerOptions: { path: 'paging-query-helper-products', isPublic: true },
|
|
54
|
+
routes: [
|
|
55
|
+
{
|
|
56
|
+
type: 'Aggregate',
|
|
57
|
+
subPath: 'aggregate',
|
|
58
|
+
dTOs: { query: ProductStatsQuery, presenter: ProductStatsPresenter },
|
|
59
|
+
},
|
|
60
|
+
],
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
it('uses the default pageSize (2) and page (1) when the query omits both', async () => {
|
|
64
|
+
const model = await (0, utils_1.getModelFromEntity)(PagingQueryHelperProductEntity);
|
|
65
|
+
await model.insertMany([{ name: 'apple' }, { name: 'banana' }, { name: 'cherry' }]);
|
|
66
|
+
const { status, body } = await e2e_setup_1.server.get('/paging-query-helper-products/aggregate', { query: {} });
|
|
67
|
+
expect(status).toBe(200);
|
|
68
|
+
expect(body.list).toHaveLength(2);
|
|
69
|
+
expect(body.list.map((p) => p.name)).toEqual(['apple', 'banana']);
|
|
70
|
+
expect(body.count).toBe(3);
|
|
71
|
+
expect(body.totalPage).toBe(2);
|
|
72
|
+
});
|
|
73
|
+
it('honors an explicit page/pageSize from the query string', async () => {
|
|
74
|
+
const model = await (0, utils_1.getModelFromEntity)(PagingQueryHelperProductEntity);
|
|
75
|
+
await model.insertMany([{ name: 'apple' }, { name: 'banana' }, { name: 'cherry' }]);
|
|
76
|
+
const { status, body } = await e2e_setup_1.server.get('/paging-query-helper-products/aggregate', { query: { page: '2', pageSize: '2' } });
|
|
77
|
+
expect(status).toBe(200);
|
|
78
|
+
expect(body.list).toHaveLength(1);
|
|
79
|
+
expect(body.list[0].name).toBe('cherry');
|
|
80
|
+
expect(body.count).toBe(3);
|
|
81
|
+
expect(body.totalPage).toBe(2);
|
|
82
|
+
});
|
|
83
|
+
it('clamps an out-of-range pageSize to the configured maxPageSize instead of erroring', async () => {
|
|
84
|
+
const model = await (0, utils_1.getModelFromEntity)(PagingQueryHelperProductEntity);
|
|
85
|
+
await model.insertMany([{ name: 'apple' }, { name: 'banana' }, { name: 'cherry' }]);
|
|
86
|
+
const { status, body } = await e2e_setup_1.server.get('/paging-query-helper-products/aggregate', { query: { pageSize: '9999' } });
|
|
87
|
+
expect(status).toBe(200);
|
|
88
|
+
expect(body.list).toHaveLength(3);
|
|
89
|
+
expect(body.totalPage).toBe(1);
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
//# sourceMappingURL=paging-query-helper.e2e-spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paging-query-helper.e2e-spec.js","sourceRoot":"","sources":["../../../libs/dynamic-api/test/for-feature/paging-query-helper.e2e-spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
import 'dotenv/config';
|