nestjs-paginate 7.1.1 → 7.1.2
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/README.md +4 -2
- package/lib/__tests__/cat.entity.d.ts +1 -0
- package/lib/__tests__/cat.entity.js +4 -0
- package/lib/__tests__/cat.entity.js.map +1 -1
- package/lib/filter.d.ts +1 -1
- package/lib/filter.js +8 -7
- package/lib/filter.js.map +1 -1
- package/lib/helper.d.ts +1 -0
- package/lib/helper.js +6 -1
- package/lib/helper.js.map +1 -1
- package/lib/paginate.spec.js +172 -2
- package/lib/paginate.spec.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -335,7 +335,7 @@ const config: PaginateConfig<CatEntity> = {
|
|
|
335
335
|
sortableColumns: ['id', 'name', 'home.pillows.color'],
|
|
336
336
|
searchableColumns: ['name', 'home.pillows.color'],
|
|
337
337
|
filterableColumns: {
|
|
338
|
-
'home.pillows.color': [FilterOperator.EQ]
|
|
338
|
+
'home.pillows.color': [FilterOperator.EQ],
|
|
339
339
|
},
|
|
340
340
|
}
|
|
341
341
|
|
|
@@ -410,6 +410,8 @@ const config: PaginateConfig<CatEntity> = {
|
|
|
410
410
|
|
|
411
411
|
`?filter.createdAt=$btw:2022-02-02,2022-02-10` where column `createdAt` is between the dates `2022-02-02` and `2022-02-10`
|
|
412
412
|
|
|
413
|
+
`?filter.createdAt=$lt:2022-12-20T10:00:00.000Z` where column `createdAt` is before iso date `2022-12-20T10:00:00.000Z`
|
|
414
|
+
|
|
413
415
|
`?filter.roles=$contains:moderator` where column `roles` is an array and contains the value `moderator`
|
|
414
416
|
|
|
415
417
|
`?filter.roles=$contains:moderator,admin` where column `roles` is an array and contains the values `moderator` and `admin`
|
|
@@ -420,7 +422,7 @@ Multi filters are filters that can be applied to a single column with a comparat
|
|
|
420
422
|
|
|
421
423
|
### Examples
|
|
422
424
|
|
|
423
|
-
`?filter.
|
|
425
|
+
`?filter.createdAt=$gt:2022-02-02&filter.createdAt=$lt:2022-02-10` where column `createdAt` is after `2022-02-02` **and** is before `2022-02-10`
|
|
424
426
|
|
|
425
427
|
`?filter.id=$contains:moderator&filter.id=$or:$contains:admin` where column `roles` is an array and contains `moderator` **or** `admin`
|
|
426
428
|
|
|
@@ -50,6 +50,10 @@ __decorate([
|
|
|
50
50
|
,
|
|
51
51
|
__metadata("design:type", String)
|
|
52
52
|
], CatEntity.prototype, "cutenessLevel", void 0);
|
|
53
|
+
__decorate([
|
|
54
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
55
|
+
__metadata("design:type", Date)
|
|
56
|
+
], CatEntity.prototype, "lastVetVisit", void 0);
|
|
53
57
|
__decorate([
|
|
54
58
|
(0, typeorm_1.Column)(() => size_embed_1.SizeEmbed),
|
|
55
59
|
__metadata("design:type", size_embed_1.SizeEmbed)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cat.entity.js","sourceRoot":"","sources":["../../src/__tests__/cat.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAYgB;AAChB,qDAA+C;AAC/C,uDAAiD;AACjD,6CAAwC;AAExC,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,4BAAW,CAAA;IACX,kCAAiB,CAAA;IACjB,8BAAa,CAAA;AACjB,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAGM,IAAM,SAAS,iBAAf,MAAM,SAAS;
|
|
1
|
+
{"version":3,"file":"cat.entity.js","sourceRoot":"","sources":["../../src/__tests__/cat.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAYgB;AAChB,qDAA+C;AAC/C,uDAAiD;AACjD,6CAAwC;AAExC,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,4BAAW,CAAA;IACX,kCAAiB,CAAA;IACjB,8BAAa,CAAA;AACjB,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAGM,IAAM,SAAS,iBAAf,MAAM,SAAS;IA4CV,SAAS;;QACb,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,EAAE,CAAA,EAAE;YAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;SACnB;IACL,CAAC;CACJ,CAAA;AAhDG;IAAC,IAAA,gCAAsB,GAAE;;qCACf;AAEV;IAAC,IAAA,gBAAM,GAAE;;uCACG;AAEZ;IAAC,IAAA,gBAAM,GAAE;;wCACI;AAEb;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCACT;AAElB;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,yFAAyF;;;gDACvF;AAE5B;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACb,IAAI;+CAAO;AAEzB;IAAC,IAAA,gBAAM,EAAC,GAAG,EAAE,CAAC,sBAAS,CAAC;8BAClB,sBAAS;uCAAA;AAEf;IAAC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,6BAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE;QACnD,KAAK,EAAE,IAAI;KACd,CAAC;;uCACkB;AAEpB;IAAC,IAAA,kBAAQ,EAAC,GAAG,EAAE,CAAC,+BAAa,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC3E,IAAA,oBAAU,GAAE;8BACP,+BAAa;uCAAA;AAEnB;IAAC,IAAA,0BAAgB,GAAE;;4CACF;AAEjB;IAAC,IAAA,0BAAgB,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACnB;AAElB;IAAC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,WAAS,CAAC;IAC3B,IAAA,mBAAS,GAAE;;0CACQ;AAEpB;IAAC,IAAA,mBAAS,GAAE;IACZ,yDAAyD;IACzD,mGAAmG;;;;;0CAKlG;AAhDQ,SAAS;IADrB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;GACX,SAAS,CAiDrB;AAjDY,8BAAS"}
|
package/lib/filter.d.ts
CHANGED
|
@@ -45,7 +45,7 @@ export declare function fixQueryParam(alias: string, column: string, filter: Fil
|
|
|
45
45
|
};
|
|
46
46
|
export declare function generatePredicateCondition(qb: SelectQueryBuilder<unknown>, column: string, filter: Filter, alias: string, isVirtualProperty?: boolean): WherePredicateOperator;
|
|
47
47
|
export declare function addWhereCondition<T>(qb: SelectQueryBuilder<T>, column: string, filter: ColumnsFilters): void;
|
|
48
|
-
export declare function
|
|
48
|
+
export declare function parseFilterToken(raw?: string): FilterToken | null;
|
|
49
49
|
export declare function parseFilter(query: PaginateQuery, filterableColumns?: {
|
|
50
50
|
[column: string]: (FilterOperator | FilterSuffix)[] | true;
|
|
51
51
|
}): ColumnsFilters;
|
package/lib/filter.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.addFilter = exports.parseFilter = exports.
|
|
3
|
+
exports.addFilter = exports.parseFilter = exports.parseFilterToken = exports.addWhereCondition = exports.generatePredicateCondition = exports.fixQueryParam = exports.OperatorSymbolToFunction = exports.isComparator = exports.FilterComparator = exports.isSuffix = exports.FilterSuffix = exports.isOperator = exports.FilterOperator = void 0;
|
|
4
4
|
const lodash_1 = require("lodash");
|
|
5
5
|
const typeorm_1 = require("typeorm");
|
|
6
6
|
const helper_1 = require("./helper");
|
|
@@ -112,7 +112,7 @@ function addWhereCondition(qb, column, filter) {
|
|
|
112
112
|
});
|
|
113
113
|
}
|
|
114
114
|
exports.addWhereCondition = addWhereCondition;
|
|
115
|
-
function
|
|
115
|
+
function parseFilterToken(raw) {
|
|
116
116
|
if (raw === undefined || raw === null) {
|
|
117
117
|
return null;
|
|
118
118
|
}
|
|
@@ -151,7 +151,7 @@ function getFilterTokens(raw) {
|
|
|
151
151
|
}
|
|
152
152
|
return token;
|
|
153
153
|
}
|
|
154
|
-
exports.
|
|
154
|
+
exports.parseFilterToken = parseFilterToken;
|
|
155
155
|
function parseFilter(query, filterableColumns) {
|
|
156
156
|
const filter = {};
|
|
157
157
|
if (!filterableColumns || !query.filter) {
|
|
@@ -165,7 +165,7 @@ function parseFilter(query, filterableColumns) {
|
|
|
165
165
|
const input = query.filter[column];
|
|
166
166
|
const statements = !Array.isArray(input) ? [input] : input;
|
|
167
167
|
for (const raw of statements) {
|
|
168
|
-
const token =
|
|
168
|
+
const token = parseFilterToken(raw);
|
|
169
169
|
if (!token) {
|
|
170
170
|
continue;
|
|
171
171
|
}
|
|
@@ -191,12 +191,13 @@ function parseFilter(query, filterableColumns) {
|
|
|
191
191
|
comparator: token.comparator,
|
|
192
192
|
findOperator: undefined,
|
|
193
193
|
};
|
|
194
|
+
const fixValue = (value) => ((0, helper_1.isISODate)(value) ? new Date(value) : value);
|
|
194
195
|
switch (token.operator) {
|
|
195
196
|
case FilterOperator.BTW:
|
|
196
|
-
params.findOperator = exports.OperatorSymbolToFunction.get(token.operator)(...token.value.split(','));
|
|
197
|
+
params.findOperator = exports.OperatorSymbolToFunction.get(token.operator)(...token.value.split(',').map(fixValue));
|
|
197
198
|
break;
|
|
198
199
|
case FilterOperator.IN:
|
|
199
|
-
case FilterOperator.CONTAINS:
|
|
200
|
+
case FilterOperator.CONTAINS:
|
|
200
201
|
params.findOperator = exports.OperatorSymbolToFunction.get(token.operator)(token.value.split(','));
|
|
201
202
|
break;
|
|
202
203
|
case FilterOperator.ILIKE:
|
|
@@ -206,7 +207,7 @@ function parseFilter(query, filterableColumns) {
|
|
|
206
207
|
params.findOperator = exports.OperatorSymbolToFunction.get(token.operator)(`${token.value}%`);
|
|
207
208
|
break;
|
|
208
209
|
default:
|
|
209
|
-
params.findOperator = exports.OperatorSymbolToFunction.get(token.operator)(token.value);
|
|
210
|
+
params.findOperator = exports.OperatorSymbolToFunction.get(token.operator)(fixValue(token.value));
|
|
210
211
|
}
|
|
211
212
|
filter[column] = [...(filter[column] || []), params];
|
|
212
213
|
if (token.suffix) {
|
package/lib/filter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../src/filter.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAC/B,qCAegB;AAGhB,
|
|
1
|
+
{"version":3,"file":"filter.js","sourceRoot":"","sources":["../src/filter.ts"],"names":[],"mappings":"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"}
|
package/lib/helper.d.ts
CHANGED
package/lib/helper.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getQueryUrlComponents = exports.fixColumnAlias = exports.checkIsEmbedded = exports.checkIsRelation = exports.hasColumnWithPropertyPath = exports.includesAllPrimaryKeyColumns = exports.extractVirtualProperty = exports.getPropertiesByColumnName = exports.positiveNumberOrDefault = exports.isEntityKey = void 0;
|
|
3
|
+
exports.isISODate = exports.getQueryUrlComponents = exports.fixColumnAlias = exports.checkIsEmbedded = exports.checkIsRelation = exports.hasColumnWithPropertyPath = exports.includesAllPrimaryKeyColumns = exports.extractVirtualProperty = exports.getPropertiesByColumnName = exports.positiveNumberOrDefault = exports.isEntityKey = void 0;
|
|
4
4
|
function isEntityKey(entityColumns, column) {
|
|
5
5
|
return !!entityColumns.find((c) => c === column);
|
|
6
6
|
}
|
|
@@ -110,4 +110,9 @@ function getQueryUrlComponents(path) {
|
|
|
110
110
|
return { queryOrigin, queryPath };
|
|
111
111
|
}
|
|
112
112
|
exports.getQueryUrlComponents = getQueryUrlComponents;
|
|
113
|
+
const isoDateRegExp = new RegExp(/(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))/);
|
|
114
|
+
function isISODate(str) {
|
|
115
|
+
return isoDateRegExp.test(str);
|
|
116
|
+
}
|
|
117
|
+
exports.isISODate = isISODate;
|
|
113
118
|
//# sourceMappingURL=helper.js.map
|
package/lib/helper.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"helper.js","sourceRoot":"","sources":["../src/helper.ts"],"names":[],"mappings":"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"}
|
package/lib/paginate.spec.js
CHANGED
|
@@ -9,6 +9,7 @@ const cat_home_entity_1 = require("./__tests__/cat-home.entity");
|
|
|
9
9
|
const cat_home_pillow_entity_1 = require("./__tests__/cat-home-pillow.entity");
|
|
10
10
|
const lodash_1 = require("lodash");
|
|
11
11
|
const filter_1 = require("./filter");
|
|
12
|
+
const isoStringToDate = (isoString) => new Date(isoString);
|
|
12
13
|
describe('paginate', () => {
|
|
13
14
|
let dataSource;
|
|
14
15
|
let catRepo;
|
|
@@ -32,7 +33,7 @@ describe('paginate', () => {
|
|
|
32
33
|
: {
|
|
33
34
|
type: 'sqlite',
|
|
34
35
|
database: ':memory:',
|
|
35
|
-
})), { synchronize: true, logging:
|
|
36
|
+
})), { synchronize: true, logging: false, entities: [cat_entity_1.CatEntity, cat_toy_entity_1.CatToyEntity, cat_home_entity_1.CatHomeEntity, cat_home_pillow_entity_1.CatHomePillowEntity] }));
|
|
36
37
|
await dataSource.initialize();
|
|
37
38
|
catRepo = dataSource.getRepository(cat_entity_1.CatEntity);
|
|
38
39
|
catToyRepo = dataSource.getRepository(cat_toy_entity_1.CatToyEntity);
|
|
@@ -44,6 +45,7 @@ describe('paginate', () => {
|
|
|
44
45
|
color: 'brown',
|
|
45
46
|
age: 6,
|
|
46
47
|
cutenessLevel: cat_entity_1.CutenessLevel.HIGH,
|
|
48
|
+
lastVetVisit: isoStringToDate('2022-12-19T10:00:00.000Z'),
|
|
47
49
|
size: { height: 25, width: 10, length: 40 },
|
|
48
50
|
}),
|
|
49
51
|
catRepo.create({
|
|
@@ -51,6 +53,7 @@ describe('paginate', () => {
|
|
|
51
53
|
color: 'ginger',
|
|
52
54
|
age: 5,
|
|
53
55
|
cutenessLevel: cat_entity_1.CutenessLevel.MEDIUM,
|
|
56
|
+
lastVetVisit: isoStringToDate('2022-12-20T10:00:00.000Z'),
|
|
54
57
|
size: { height: 30, width: 15, length: 45 },
|
|
55
58
|
}),
|
|
56
59
|
catRepo.create({
|
|
@@ -58,6 +61,7 @@ describe('paginate', () => {
|
|
|
58
61
|
color: 'black',
|
|
59
62
|
age: 4,
|
|
60
63
|
cutenessLevel: cat_entity_1.CutenessLevel.HIGH,
|
|
64
|
+
lastVetVisit: isoStringToDate('2022-12-21T10:00:00.000Z'),
|
|
61
65
|
size: { height: 25, width: 10, length: 50 },
|
|
62
66
|
}),
|
|
63
67
|
catRepo.create({
|
|
@@ -65,6 +69,7 @@ describe('paginate', () => {
|
|
|
65
69
|
color: 'white',
|
|
66
70
|
age: 3,
|
|
67
71
|
cutenessLevel: cat_entity_1.CutenessLevel.LOW,
|
|
72
|
+
lastVetVisit: null,
|
|
68
73
|
size: { height: 35, width: 12, length: 40 },
|
|
69
74
|
}),
|
|
70
75
|
catRepo.create({
|
|
@@ -72,6 +77,7 @@ describe('paginate', () => {
|
|
|
72
77
|
color: 'white',
|
|
73
78
|
age: null,
|
|
74
79
|
cutenessLevel: cat_entity_1.CutenessLevel.HIGH,
|
|
80
|
+
lastVetVisit: null,
|
|
75
81
|
size: { height: 10, width: 5, length: 15 },
|
|
76
82
|
}),
|
|
77
83
|
]);
|
|
@@ -1476,7 +1482,7 @@ describe('paginate', () => {
|
|
|
1476
1482
|
tokens: { comparator, operator: '$null', suffix: '$not', value: undefined },
|
|
1477
1483
|
},
|
|
1478
1484
|
])('should get filter tokens for "$string"', ({ string, tokens }) => {
|
|
1479
|
-
expect((0, filter_1.
|
|
1485
|
+
expect((0, filter_1.parseFilterToken)(string)).toStrictEqual(tokens);
|
|
1480
1486
|
});
|
|
1481
1487
|
}
|
|
1482
1488
|
it('should return result based on virtualcolumn filter', async () => {
|
|
@@ -1903,5 +1909,169 @@ describe('paginate', () => {
|
|
|
1903
1909
|
expect(result.data).toStrictEqual([cats[0], cats[1], cats[2], cats[3], cats[4]]);
|
|
1904
1910
|
expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&filter.id=$not:$in:1,2,5');
|
|
1905
1911
|
});
|
|
1912
|
+
describe('should return result based on date column filter', () => {
|
|
1913
|
+
it('with $not and $null operators', async () => {
|
|
1914
|
+
const config = {
|
|
1915
|
+
sortableColumns: ['id'],
|
|
1916
|
+
filterableColumns: {
|
|
1917
|
+
lastVetVisit: [filter_1.FilterSuffix.NOT, filter_1.FilterOperator.NULL],
|
|
1918
|
+
},
|
|
1919
|
+
};
|
|
1920
|
+
const query = {
|
|
1921
|
+
path: '',
|
|
1922
|
+
filter: {
|
|
1923
|
+
lastVetVisit: '$not:$null',
|
|
1924
|
+
},
|
|
1925
|
+
};
|
|
1926
|
+
const result = await (0, paginate_1.paginate)(query, catRepo, config);
|
|
1927
|
+
expect(result.meta.filter).toStrictEqual({
|
|
1928
|
+
lastVetVisit: '$not:$null',
|
|
1929
|
+
});
|
|
1930
|
+
expect(result.data).toStrictEqual([cats[0], cats[1], cats[2]]);
|
|
1931
|
+
expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&filter.lastVetVisit=$not:$null');
|
|
1932
|
+
});
|
|
1933
|
+
it('with $lt operator', async () => {
|
|
1934
|
+
const config = {
|
|
1935
|
+
sortableColumns: ['id'],
|
|
1936
|
+
filterableColumns: {
|
|
1937
|
+
lastVetVisit: [filter_1.FilterOperator.LT],
|
|
1938
|
+
},
|
|
1939
|
+
};
|
|
1940
|
+
const query = {
|
|
1941
|
+
path: '',
|
|
1942
|
+
filter: {
|
|
1943
|
+
lastVetVisit: '$lt:2022-12-20T10:00:00.000Z',
|
|
1944
|
+
},
|
|
1945
|
+
};
|
|
1946
|
+
const result = await (0, paginate_1.paginate)(query, catRepo, config);
|
|
1947
|
+
expect(result.meta.filter).toStrictEqual({
|
|
1948
|
+
lastVetVisit: '$lt:2022-12-20T10:00:00.000Z',
|
|
1949
|
+
});
|
|
1950
|
+
expect(result.data).toStrictEqual([cats[0]]);
|
|
1951
|
+
expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&filter.lastVetVisit=$lt:2022-12-20T10:00:00.000Z');
|
|
1952
|
+
});
|
|
1953
|
+
it('with $lte operator', async () => {
|
|
1954
|
+
const config = {
|
|
1955
|
+
sortableColumns: ['id'],
|
|
1956
|
+
filterableColumns: {
|
|
1957
|
+
lastVetVisit: [filter_1.FilterOperator.LTE],
|
|
1958
|
+
},
|
|
1959
|
+
};
|
|
1960
|
+
const query = {
|
|
1961
|
+
path: '',
|
|
1962
|
+
filter: {
|
|
1963
|
+
lastVetVisit: '$lte:2022-12-20T10:00:00.000Z',
|
|
1964
|
+
},
|
|
1965
|
+
};
|
|
1966
|
+
const result = await (0, paginate_1.paginate)(query, catRepo, config);
|
|
1967
|
+
expect(result.meta.filter).toStrictEqual({
|
|
1968
|
+
lastVetVisit: '$lte:2022-12-20T10:00:00.000Z',
|
|
1969
|
+
});
|
|
1970
|
+
expect(result.data).toStrictEqual([cats[0], cats[1]]);
|
|
1971
|
+
expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&filter.lastVetVisit=$lte:2022-12-20T10:00:00.000Z');
|
|
1972
|
+
});
|
|
1973
|
+
it('with $btw operator', async () => {
|
|
1974
|
+
const config = {
|
|
1975
|
+
sortableColumns: ['id'],
|
|
1976
|
+
filterableColumns: {
|
|
1977
|
+
lastVetVisit: [filter_1.FilterOperator.BTW],
|
|
1978
|
+
},
|
|
1979
|
+
};
|
|
1980
|
+
const query = {
|
|
1981
|
+
path: '',
|
|
1982
|
+
filter: {
|
|
1983
|
+
lastVetVisit: '$btw:2022-12-20T08:00:00.000Z,2022-12-20T12:00:00.000Z',
|
|
1984
|
+
},
|
|
1985
|
+
};
|
|
1986
|
+
const result = await (0, paginate_1.paginate)(query, catRepo, config);
|
|
1987
|
+
expect(result.meta.filter).toStrictEqual({
|
|
1988
|
+
lastVetVisit: '$btw:2022-12-20T08:00:00.000Z,2022-12-20T12:00:00.000Z',
|
|
1989
|
+
});
|
|
1990
|
+
expect(result.data).toStrictEqual([cats[1]]);
|
|
1991
|
+
expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&filter.lastVetVisit=$btw:2022-12-20T08:00:00.000Z,2022-12-20T12:00:00.000Z');
|
|
1992
|
+
});
|
|
1993
|
+
it('with $gte operator', async () => {
|
|
1994
|
+
const config = {
|
|
1995
|
+
sortableColumns: ['id'],
|
|
1996
|
+
filterableColumns: {
|
|
1997
|
+
lastVetVisit: [filter_1.FilterOperator.GTE],
|
|
1998
|
+
},
|
|
1999
|
+
};
|
|
2000
|
+
const query = {
|
|
2001
|
+
path: '',
|
|
2002
|
+
filter: {
|
|
2003
|
+
lastVetVisit: '$gte:2022-12-20T10:00:00.000Z',
|
|
2004
|
+
},
|
|
2005
|
+
};
|
|
2006
|
+
const result = await (0, paginate_1.paginate)(query, catRepo, config);
|
|
2007
|
+
expect(result.meta.filter).toStrictEqual({
|
|
2008
|
+
lastVetVisit: '$gte:2022-12-20T10:00:00.000Z',
|
|
2009
|
+
});
|
|
2010
|
+
expect(result.data).toStrictEqual([cats[1], cats[2]]);
|
|
2011
|
+
expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&filter.lastVetVisit=$gte:2022-12-20T10:00:00.000Z');
|
|
2012
|
+
});
|
|
2013
|
+
it('with $gt operator', async () => {
|
|
2014
|
+
const config = {
|
|
2015
|
+
sortableColumns: ['id'],
|
|
2016
|
+
filterableColumns: {
|
|
2017
|
+
lastVetVisit: [filter_1.FilterOperator.GT],
|
|
2018
|
+
},
|
|
2019
|
+
};
|
|
2020
|
+
const query = {
|
|
2021
|
+
path: '',
|
|
2022
|
+
filter: {
|
|
2023
|
+
lastVetVisit: '$gt:2022-12-20T10:00:00.000Z',
|
|
2024
|
+
},
|
|
2025
|
+
};
|
|
2026
|
+
const result = await (0, paginate_1.paginate)(query, catRepo, config);
|
|
2027
|
+
expect(result.meta.filter).toStrictEqual({
|
|
2028
|
+
lastVetVisit: '$gt:2022-12-20T10:00:00.000Z',
|
|
2029
|
+
});
|
|
2030
|
+
expect(result.data).toStrictEqual([cats[2]]);
|
|
2031
|
+
expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&filter.lastVetVisit=$gt:2022-12-20T10:00:00.000Z');
|
|
2032
|
+
});
|
|
2033
|
+
it('with $lt operator and date only', async () => {
|
|
2034
|
+
{
|
|
2035
|
+
const config = {
|
|
2036
|
+
sortableColumns: ['id'],
|
|
2037
|
+
filterableColumns: {
|
|
2038
|
+
lastVetVisit: [filter_1.FilterOperator.LT],
|
|
2039
|
+
},
|
|
2040
|
+
};
|
|
2041
|
+
const query = {
|
|
2042
|
+
path: '',
|
|
2043
|
+
filter: {
|
|
2044
|
+
lastVetVisit: '$lt:2022-12-20',
|
|
2045
|
+
},
|
|
2046
|
+
};
|
|
2047
|
+
const result = await (0, paginate_1.paginate)(query, catRepo, config);
|
|
2048
|
+
expect(result.meta.filter).toStrictEqual({
|
|
2049
|
+
lastVetVisit: '$lt:2022-12-20',
|
|
2050
|
+
});
|
|
2051
|
+
expect(result.data).toStrictEqual([cats[0]]);
|
|
2052
|
+
expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&filter.lastVetVisit=$lt:2022-12-20');
|
|
2053
|
+
}
|
|
2054
|
+
{
|
|
2055
|
+
const config = {
|
|
2056
|
+
sortableColumns: ['id'],
|
|
2057
|
+
filterableColumns: {
|
|
2058
|
+
lastVetVisit: [filter_1.FilterOperator.LT],
|
|
2059
|
+
},
|
|
2060
|
+
};
|
|
2061
|
+
const query = {
|
|
2062
|
+
path: '',
|
|
2063
|
+
filter: {
|
|
2064
|
+
lastVetVisit: '$lt:2022-12-21',
|
|
2065
|
+
},
|
|
2066
|
+
};
|
|
2067
|
+
const result = await (0, paginate_1.paginate)(query, catRepo, config);
|
|
2068
|
+
expect(result.meta.filter).toStrictEqual({
|
|
2069
|
+
lastVetVisit: '$lt:2022-12-21',
|
|
2070
|
+
});
|
|
2071
|
+
expect(result.data).toStrictEqual([cats[0], cats[1]]);
|
|
2072
|
+
expect(result.links.current).toBe('?page=1&limit=20&sortBy=id:ASC&filter.lastVetVisit=$lt:2022-12-21');
|
|
2073
|
+
}
|
|
2074
|
+
});
|
|
2075
|
+
});
|
|
1906
2076
|
});
|
|
1907
2077
|
//# sourceMappingURL=paginate.spec.js.map
|