@qrvey/data-persistence 0.0.2 → 0.0.3-6
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 +3 -0
- package/dist/cjs/helpers/crudHelpers.js +2 -1
- package/dist/cjs/helpers/crudHelpers.js.map +1 -1
- package/dist/cjs/helpers/queryHelpers.js +5 -1
- package/dist/cjs/helpers/queryHelpers.js.map +1 -1
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/services/crud.service.js +7 -2
- package/dist/cjs/services/crud.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js +78 -76
- package/dist/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilder.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilderCondition.service.js +26 -2
- package/dist/cjs/services/cruds/dynamodb/queryBuilderCondition.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/connection.service.js +1 -1
- package/dist/cjs/services/cruds/postgresql/connection.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js +15 -10
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/postgreSqlCrud.service.js +23 -16
- package/dist/cjs/services/cruds/postgresql/postgreSqlCrud.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/query.service.js +2 -2
- package/dist/cjs/services/cruds/postgresql/query.service.js.map +1 -1
- package/dist/cjs/types/aggregateFunction.type.js +3 -0
- package/dist/cjs/types/aggregateFunction.type.js.map +1 -0
- package/dist/cjs/types/index.js +1 -0
- package/dist/cjs/types/index.js.map +1 -1
- package/dist/cjs/types/sortDirection.type.js +0 -2
- package/dist/cjs/types/sortDirection.type.js.map +1 -1
- package/dist/cjs/utils/constants.js +10 -1
- package/dist/cjs/utils/constants.js.map +1 -1
- package/dist/esm/index.mjs +15 -1
- package/dist/esm/index.mjs.map +1 -1
- package/dist/types/index.d.ts +50 -21
- package/package.json +28 -17
package/README.md
CHANGED
|
@@ -75,3 +75,6 @@ The FilterOperator enum defines the following operators:
|
|
|
75
75
|
- LESS_THAN_EQUAL.
|
|
76
76
|
- IN: This operator checks if the attribute value is present within a specified list of values.
|
|
77
77
|
- STARTS_WITH: This operator checks if the attribute value starts with the provided string. It uses parameterized query syntax for security.
|
|
78
|
+
- EXIST: This operator verifies whether the attribute value exists. In PostgreSQL, it validates whether the attribute value is NOT null when the attribute is defined in the table columns.
|
|
79
|
+
- NOT_EXIST: This operator checks if the attribute value does not exist in the document. In PostgreSQL, it validates whether the attribute value is null when the attribute is defined in the table columns.
|
|
80
|
+
- BETWEEN: This operator checks if the attribute value is within a specified range.
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildSort = exports.buildQueryIndex = exports.buildFilter = void 0;
|
|
4
4
|
const constants_1 = require("../utils/constants");
|
|
5
|
-
function buildFilter(attribute, value, operator = 'EQUAL') {
|
|
5
|
+
function buildFilter(attribute, value, operator = 'EQUAL', { omitPrimary = false } = {}) {
|
|
6
6
|
return {
|
|
7
7
|
attribute,
|
|
8
8
|
operator,
|
|
9
9
|
value,
|
|
10
|
+
omitPrimary,
|
|
10
11
|
};
|
|
11
12
|
}
|
|
12
13
|
exports.buildFilter = buildFilter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crudHelpers.js","sourceRoot":"","sources":["../../../src/helpers/crudHelpers.ts"],"names":[],"mappings":";;;AAEA,kDAAqD;AAErD,SAAgB,WAAW,CACvB,SAAiB,EACjB,KAAa,EACb,QAAQ,GAAG,OAAO;
|
|
1
|
+
{"version":3,"file":"crudHelpers.js","sourceRoot":"","sources":["../../../src/helpers/crudHelpers.ts"],"names":[],"mappings":";;;AAEA,kDAAqD;AAErD,SAAgB,WAAW,CACvB,SAAiB,EACjB,KAAa,EACb,QAAQ,GAAG,OAAO,EAClB,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,EAAE;IAE5B,OAAO;QACH,SAAS;QACT,QAAQ;QACR,KAAK;QACL,WAAW;KACd,CAAC;AACN,CAAC;AAZD,kCAYC;AAED,SAAgB,eAAe,CAAC,SAAiB,EAAE,OAAiB;IAChE,OAAO;QACH,SAAS;QACT,OAAO;KACV,CAAC;AACN,CAAC;AALD,0CAKC;AAED,SAAgB,SAAS,CACrB,MAAc,EACd,YAA2B,2BAAe,CAAC,GAAG;IAE9C,OAAO;QACH,MAAM;QACN,SAAS;KACZ,CAAC;AACN,CAAC;AARD,8BAQC"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.METHOD_TO_QUERY = void 0;
|
|
3
|
+
exports.buildAggFunctionAlias = exports.METHOD_TO_QUERY = void 0;
|
|
4
4
|
var METHOD_TO_QUERY;
|
|
5
5
|
(function (METHOD_TO_QUERY) {
|
|
6
6
|
METHOD_TO_QUERY["where"] = "where";
|
|
7
7
|
METHOD_TO_QUERY["filter"] = "filter";
|
|
8
8
|
METHOD_TO_QUERY["update"] = "update";
|
|
9
9
|
})(METHOD_TO_QUERY || (exports.METHOD_TO_QUERY = METHOD_TO_QUERY = {}));
|
|
10
|
+
function buildAggFunctionAlias(aggregateFunction) {
|
|
11
|
+
return `AGG_FN_${aggregateFunction}`;
|
|
12
|
+
}
|
|
13
|
+
exports.buildAggFunctionAlias = buildAggFunctionAlias;
|
|
10
14
|
//# sourceMappingURL=queryHelpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryHelpers.js","sourceRoot":"","sources":["../../../src/helpers/queryHelpers.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"queryHelpers.js","sourceRoot":"","sources":["../../../src/helpers/queryHelpers.ts"],"names":[],"mappings":";;;AAEA,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,kCAAe,CAAA;IACf,oCAAiB,CAAA;IACjB,oCAAiB,CAAA;AACrB,CAAC,EAJW,eAAe,+BAAf,eAAe,QAI1B;AAED,SAAgB,qBAAqB,CACjC,iBAAoC;IAEpC,OAAO,UAAU,iBAAiB,EAAE,CAAC;AACzC,CAAC;AAJD,sDAIC"}
|
package/dist/cjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiE;AAAxD,4HAAA,OAAO,OAAe;AAC/B,mDAAkD;AAAzC,wGAAA,UAAU,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,wDAAiE;AAAxD,4HAAA,OAAO,OAAe;AAC/B,mDAAkD;AAAzC,wGAAA,UAAU,OAAA;AAWnB,qDAAgF;AAAvE,0GAAA,WAAW,OAAA;AAAE,8GAAA,eAAe,OAAA;AAAE,wGAAA,SAAS,OAAA"}
|
|
@@ -37,8 +37,13 @@ class CrudService {
|
|
|
37
37
|
const { pagination } = options, findAllOptions = __rest(options, ["pagination"]);
|
|
38
38
|
return this.crudService.findAll(findAllOptions);
|
|
39
39
|
}
|
|
40
|
-
|
|
41
|
-
|
|
40
|
+
findCount(options) {
|
|
41
|
+
// eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
|
|
42
|
+
const { pagination } = options, findAllOptions = __rest(options, ["pagination"]);
|
|
43
|
+
return this.crudService.findCount(findAllOptions);
|
|
44
|
+
}
|
|
45
|
+
buildFilter(attribute, value, operator = 'EQUAL', options = {}) {
|
|
46
|
+
return (0, crudHelpers_1.buildFilter)(attribute, value, operator, options);
|
|
42
47
|
}
|
|
43
48
|
buildQueryIndex(indexName, columns) {
|
|
44
49
|
return (0, crudHelpers_1.buildQueryIndex)(indexName, columns);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../src/services/crud.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wDAIgC;AAUhC,+DAAoD;AAEpD,MAAM,WAAW;IAGb,YAAY,UAA6B;QACrC,IAAI,CAAC,WAAW,GAAG,iCAAW,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,MAAS;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC,OAAqB;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,QAAQ,CAAC,OAAqB;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CACF,OAAoC,EACpC,IAAgB;QAEhB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,OAAoC;QACvC,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,OAAqB;QACzB,6EAA6E;QAC7E,MAAM,EAAE,UAAU,KAAwB,OAAO,EAA1B,cAAc,UAAK,OAAO,EAA3C,cAAiC,CAAU,CAAC;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC;IAED,WAAW,CAAC,SAAiB,
|
|
1
|
+
{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../src/services/crud.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wDAIgC;AAUhC,+DAAoD;AAEpD,MAAM,WAAW;IAGb,YAAY,UAA6B;QACrC,IAAI,CAAC,WAAW,GAAG,iCAAW,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,CAAC,MAAS;QACZ,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,CAAC,OAAqB;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,QAAQ,CAAC,OAAqB;QAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CACF,OAAoC,EACpC,IAAgB;QAEhB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,OAAoC;QACvC,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,CAAC,OAAqB;QACzB,6EAA6E;QAC7E,MAAM,EAAE,UAAU,KAAwB,OAAO,EAA1B,cAAc,UAAK,OAAO,EAA3C,cAAiC,CAAU,CAAC;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC;IAED,SAAS,CAAC,OAAqB;QAC3B,6EAA6E;QAC7E,MAAM,EAAE,UAAU,KAAwB,OAAO,EAA1B,cAAc,UAAK,OAAO,EAA3C,cAAiC,CAAU,CAAC;QAClD,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IACtD,CAAC;IAED,WAAW,CACP,SAAiB,EACjB,KAAa,EACb,QAAQ,GAAG,OAAO,EAClB,OAAO,GAAG,EAAE;QAEZ,OAAO,IAAA,yBAAW,EAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,eAAe,CAAC,SAAiB,EAAE,OAAiB;QAChD,OAAO,IAAA,6BAAe,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,SAAS,CAAC,MAAc,EAAE,SAAwB;QAC9C,OAAO,IAAA,uBAAS,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACxC,CAAC;CACJ;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.DynamoDbCrudService = void 0;
|
|
7
7
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
8
|
-
const q_id_generator_1 = require("q-id-generator");
|
|
9
8
|
const dynamoDbClient_service_1 = __importDefault(require("./dynamoDbClient.service"));
|
|
10
9
|
const queryBuilder_service_1 = __importDefault(require("./queryBuilder.service"));
|
|
11
10
|
const constants_1 = require("../../../utils/constants");
|
|
@@ -25,27 +24,93 @@ class DynamoDbCrudService {
|
|
|
25
24
|
return (0, tableHelper_1.getPrimaryKeyColumns)(this.tableSchema.columns);
|
|
26
25
|
}
|
|
27
26
|
async create(entity) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
if (this.idColumnName) {
|
|
31
|
-
const idValue = ((_a = entity[this.idColumnName]) === null || _a === void 0 ? void 0 : _a.toString()) || (0, q_id_generator_1.getId)();
|
|
32
|
-
inputData = Object.assign(Object.assign({}, entity), { [this.idColumnName]: idValue });
|
|
33
|
-
}
|
|
34
|
-
await this.dynamoDbClientService.put(inputData);
|
|
35
|
-
return inputData;
|
|
27
|
+
await this.dynamoDbClientService.put(entity);
|
|
28
|
+
return entity;
|
|
36
29
|
}
|
|
37
30
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars, no-unused-vars
|
|
38
31
|
runQuery(queryCommand) {
|
|
39
32
|
throw new Error('Method not implemented.');
|
|
40
33
|
}
|
|
34
|
+
find(options = {}) {
|
|
35
|
+
var _a, _b, _c, _d;
|
|
36
|
+
const query = new queryBuilder_service_1.default(options.useScan);
|
|
37
|
+
if ((_a = options.index) === null || _a === void 0 ? void 0 : _a.indexName)
|
|
38
|
+
query.usingIndex((_b = options.index) === null || _b === void 0 ? void 0 : _b.indexName);
|
|
39
|
+
this.applySorting(query, options.sorting, (_c = options.index) === null || _c === void 0 ? void 0 : _c.indexName);
|
|
40
|
+
this.applyPagination(query, options.pagination);
|
|
41
|
+
if (options.consistentRead)
|
|
42
|
+
query.consistentRead(options.consistentRead);
|
|
43
|
+
if (options.fields)
|
|
44
|
+
query.projection(options.fields);
|
|
45
|
+
this.applyFilters(query, options);
|
|
46
|
+
return this.fetchResults(query.get(), (_d = options.pagination) === null || _d === void 0 ? void 0 : _d.limit, options.useScan).then((res) => {
|
|
47
|
+
var _a, _b;
|
|
48
|
+
const pagination = {};
|
|
49
|
+
if (res.lastEvaluatedKey)
|
|
50
|
+
pagination.from = res.lastEvaluatedKey;
|
|
51
|
+
if ((_a = options.pagination) === null || _a === void 0 ? void 0 : _a.limit)
|
|
52
|
+
pagination.limit = (_b = options.pagination) === null || _b === void 0 ? void 0 : _b.limit;
|
|
53
|
+
return {
|
|
54
|
+
items: res.items,
|
|
55
|
+
pagination,
|
|
56
|
+
count: res.items.length,
|
|
57
|
+
};
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
async fetchResults(command, limit = 100, useScan = false) {
|
|
61
|
+
var _a, _b, _c, _d, _e;
|
|
62
|
+
let results = [];
|
|
63
|
+
let LastEvaluatedKey = {};
|
|
64
|
+
do {
|
|
65
|
+
if (this.isNotEmptyObject(LastEvaluatedKey))
|
|
66
|
+
command.ExclusiveStartKey = LastEvaluatedKey;
|
|
67
|
+
const result = await (useScan
|
|
68
|
+
? this.dynamoDbClientService.scan(command)
|
|
69
|
+
: this.dynamoDbClientService.query(command));
|
|
70
|
+
command.Limit = ((_a = command.Limit) !== null && _a !== void 0 ? _a : 0) - ((_c = (_b = result.Items) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0);
|
|
71
|
+
const rows = (_d = result.Items) !== null && _d !== void 0 ? _d : [];
|
|
72
|
+
results = results.concat(rows);
|
|
73
|
+
LastEvaluatedKey = (_e = result.LastEvaluatedKey) !== null && _e !== void 0 ? _e : {};
|
|
74
|
+
} while (results.length < limit &&
|
|
75
|
+
this.isNotEmptyObject(LastEvaluatedKey));
|
|
76
|
+
const lastEvaluatedKey = this.isNotEmptyObject(LastEvaluatedKey)
|
|
77
|
+
? this.encryptPaginationKey(LastEvaluatedKey)
|
|
78
|
+
: null;
|
|
79
|
+
return { items: results, lastEvaluatedKey };
|
|
80
|
+
}
|
|
81
|
+
applyPagination(query, pagination) {
|
|
82
|
+
if (pagination === null || pagination === void 0 ? void 0 : pagination.limit)
|
|
83
|
+
query.limit(pagination.limit);
|
|
84
|
+
if (pagination === null || pagination === void 0 ? void 0 : pagination.from)
|
|
85
|
+
query.startKey(this.decryptPaginationKey(pagination.from));
|
|
86
|
+
}
|
|
87
|
+
async findAll(options = {}, allResults = []) {
|
|
88
|
+
const { items, pagination } = await this.find(options);
|
|
89
|
+
allResults.push(...items);
|
|
90
|
+
if (pagination === null || pagination === void 0 ? void 0 : pagination.from)
|
|
91
|
+
await this.findAll(Object.assign(Object.assign({}, options), { pagination }), allResults);
|
|
92
|
+
return {
|
|
93
|
+
items: allResults,
|
|
94
|
+
pagination: null,
|
|
95
|
+
count: allResults.length,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
async findCount(options = {}) {
|
|
99
|
+
const { items } = await this.find(options);
|
|
100
|
+
return items.length;
|
|
101
|
+
}
|
|
41
102
|
async findItem(options) {
|
|
42
|
-
var _a;
|
|
103
|
+
var _a, _b, _c;
|
|
43
104
|
const query = new queryBuilder_service_1.default();
|
|
105
|
+
if ((_a = options.index) === null || _a === void 0 ? void 0 : _a.indexName)
|
|
106
|
+
query.usingIndex((_b = options.index) === null || _b === void 0 ? void 0 : _b.indexName);
|
|
44
107
|
this.applyFilters(query, options);
|
|
108
|
+
if (options.fields)
|
|
109
|
+
query.projection(options.fields);
|
|
45
110
|
query.limit(1);
|
|
46
111
|
const command = query.get();
|
|
47
112
|
const result = await this.dynamoDbClientService.query(command);
|
|
48
|
-
if ((result === null || result === void 0 ? void 0 : result.Items) && ((
|
|
113
|
+
if ((result === null || result === void 0 ? void 0 : result.Items) && ((_c = result.Items) === null || _c === void 0 ? void 0 : _c.length) > 0) {
|
|
49
114
|
return result.Items[0];
|
|
50
115
|
}
|
|
51
116
|
if (options.throwErrorIfNull)
|
|
@@ -71,7 +136,8 @@ class DynamoDbCrudService {
|
|
|
71
136
|
? queryIndexColumns
|
|
72
137
|
: defaultWhereProperties;
|
|
73
138
|
options.filters.forEach((filter) => {
|
|
74
|
-
const isWhereProperty = whereProperties.includes(filter.attribute)
|
|
139
|
+
const isWhereProperty = whereProperties.includes(filter.attribute) &&
|
|
140
|
+
!filter.omitPrimary;
|
|
75
141
|
isWhereProperty && !options.useScan
|
|
76
142
|
? this.applyWhereFilter(query, filter)
|
|
77
143
|
: this.applyFilterFilter(query, filter);
|
|
@@ -103,70 +169,6 @@ class DynamoDbCrudService {
|
|
|
103
169
|
const decodedKey = Buffer.from(encodedKey, 'base64').toString('utf-8');
|
|
104
170
|
return JSON.parse(decodedKey);
|
|
105
171
|
}
|
|
106
|
-
async fetchResults(command, limit = 100, useScan = false) {
|
|
107
|
-
var _a, _b, _c, _d, _e;
|
|
108
|
-
let results = [];
|
|
109
|
-
let LastEvaluatedKey = {};
|
|
110
|
-
do {
|
|
111
|
-
if (this.isNotEmptyObject(LastEvaluatedKey))
|
|
112
|
-
command.ExclusiveStartKey = LastEvaluatedKey;
|
|
113
|
-
const result = await (useScan
|
|
114
|
-
? this.dynamoDbClientService.scan(command)
|
|
115
|
-
: this.dynamoDbClientService.query(command));
|
|
116
|
-
command.Limit = ((_a = command.Limit) !== null && _a !== void 0 ? _a : 0) - ((_c = (_b = result.Items) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0);
|
|
117
|
-
results = (_d = result.Items) !== null && _d !== void 0 ? _d : [];
|
|
118
|
-
LastEvaluatedKey = (_e = result.LastEvaluatedKey) !== null && _e !== void 0 ? _e : {};
|
|
119
|
-
} while (results.length < limit &&
|
|
120
|
-
this.isNotEmptyObject(LastEvaluatedKey));
|
|
121
|
-
const lastEvaluatedKey = this.isNotEmptyObject(LastEvaluatedKey)
|
|
122
|
-
? this.encryptPaginationKey(LastEvaluatedKey)
|
|
123
|
-
: null;
|
|
124
|
-
return { items: results, lastEvaluatedKey };
|
|
125
|
-
}
|
|
126
|
-
applyPagination(query, pagination) {
|
|
127
|
-
if (pagination === null || pagination === void 0 ? void 0 : pagination.limit)
|
|
128
|
-
query.limit(pagination.limit);
|
|
129
|
-
if (pagination === null || pagination === void 0 ? void 0 : pagination.from)
|
|
130
|
-
query.startKey(this.decryptPaginationKey(pagination.from));
|
|
131
|
-
}
|
|
132
|
-
find(options = {}) {
|
|
133
|
-
var _a, _b, _c, _d;
|
|
134
|
-
const query = new queryBuilder_service_1.default(options.useScan);
|
|
135
|
-
if ((_a = options.index) === null || _a === void 0 ? void 0 : _a.indexName) {
|
|
136
|
-
query.usingIndex((_b = options.index) === null || _b === void 0 ? void 0 : _b.indexName);
|
|
137
|
-
}
|
|
138
|
-
this.applySorting(query, options.sorting, (_c = options.index) === null || _c === void 0 ? void 0 : _c.indexName);
|
|
139
|
-
this.applyPagination(query, options.pagination);
|
|
140
|
-
if (options.consistentRead)
|
|
141
|
-
query.consistentRead(options.consistentRead);
|
|
142
|
-
if (options.fields)
|
|
143
|
-
query.projection(options.fields);
|
|
144
|
-
this.applyFilters(query, options);
|
|
145
|
-
return this.fetchResults(query.get(), (_d = options.pagination) === null || _d === void 0 ? void 0 : _d.limit, options.useScan).then((res) => {
|
|
146
|
-
var _a, _b;
|
|
147
|
-
const pagination = {};
|
|
148
|
-
if (res.lastEvaluatedKey)
|
|
149
|
-
pagination.from = res.lastEvaluatedKey;
|
|
150
|
-
if ((_a = options.pagination) === null || _a === void 0 ? void 0 : _a.limit)
|
|
151
|
-
pagination.limit = (_b = options.pagination) === null || _b === void 0 ? void 0 : _b.limit;
|
|
152
|
-
return {
|
|
153
|
-
items: res.items,
|
|
154
|
-
pagination,
|
|
155
|
-
count: res.items.length,
|
|
156
|
-
};
|
|
157
|
-
});
|
|
158
|
-
}
|
|
159
|
-
async findAll(options = {}, allResults = []) {
|
|
160
|
-
const { items, pagination } = await this.find(options);
|
|
161
|
-
allResults.push(...items);
|
|
162
|
-
if (pagination === null || pagination === void 0 ? void 0 : pagination.from)
|
|
163
|
-
await this.findAll(Object.assign(Object.assign({}, options), { pagination }), allResults);
|
|
164
|
-
return {
|
|
165
|
-
items: allResults,
|
|
166
|
-
pagination: null,
|
|
167
|
-
count: allResults.length,
|
|
168
|
-
};
|
|
169
|
-
}
|
|
170
172
|
async update(filters, data, { replace = false }) {
|
|
171
173
|
const savedRecord = await this.findItem({
|
|
172
174
|
filters: filters,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamoDbCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/dynamoDbCrud.service.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"dynamoDbCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/dynamoDbCrud.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryBuilder.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilder.service.ts"],"names":[],"mappings":";;;;;AAEA,oGAA2E;AAC3E,gEAAgE;AAGhE,MAAqB,mBAAmB;IAIpC,YAAoB,UAAU,KAAK;QAAf,YAAO,GAAP,OAAO,CAAQ;QAC/B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAElB,IAAI,CAAC,SAAS,GAAG,IAAI,uCAA4B,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,GAAG;QACC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QACvC,uCAAY,IAAI,CAAC,OAAO,GAAK,SAAS,EAAG;IAC7C,CAAC;IAED,KAAK,CAAC,GAAW;QACb,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,SAAiB;QACxB,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS;QACL,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU;QACN,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,KAAK,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,8DAA8D;IAC9D,QAAQ,CAAC,gBAAqC;QAC1C,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAClD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,MAAgB;QACvB,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACrB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1C,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,OAAe;QACjB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,8BAAe,CAAC,KAAK,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,OAAe;QAClB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,8BAAe,CAAC,MAAM,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,SAAiC;QACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"queryBuilder.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilder.service.ts"],"names":[],"mappings":";;;;;AAEA,oGAA2E;AAC3E,gEAAgE;AAGhE,MAAqB,mBAAmB;IAIpC,YAAoB,UAAU,KAAK;QAAf,YAAO,GAAP,OAAO,CAAQ;QAC/B,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAElB,IAAI,CAAC,SAAS,GAAG,IAAI,uCAA4B,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAED,GAAG;QACC,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;QACvC,uCAAY,IAAI,CAAC,OAAO,GAAK,SAAS,EAAG;IAC7C,CAAC;IAED,KAAK,CAAC,GAAW;QACb,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,SAAiB;QACxB,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS;QACL,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC;QACxD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU;QACN,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,CAAC,gBAAgB,GAAG,KAAK,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,8DAA8D;IAC9D,QAAQ,CAAC,gBAAqC;QAC1C,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;QAClD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,MAAgB;QACvB,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACrB,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC1C,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,oBAAoB,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,OAAe;QACjB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,8BAAe,CAAC,KAAK,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,OAAe;QAClB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,8BAAe,CAAC,MAAM,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,SAAiC;QACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;YAClD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,8BAAe,CAAC,MAAM,CAAC,CAAC;YACxD,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;SAC5B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,cAAc,CAAC,cAAuB;QAClC,IAAI,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;QAC7C,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAzED,sCAyEC"}
|
|
@@ -91,6 +91,27 @@ class QueryBuilderConditionService {
|
|
|
91
91
|
this.setExpression(expression);
|
|
92
92
|
return this.query;
|
|
93
93
|
}
|
|
94
|
+
attribute_exists(keyValue) {
|
|
95
|
+
const { key } = this.generateKeyValue(keyValue);
|
|
96
|
+
const expression = `attribute_exists(${key})`;
|
|
97
|
+
this.setExpression(expression);
|
|
98
|
+
return this.query;
|
|
99
|
+
}
|
|
100
|
+
attribute_not_exists(keyValue) {
|
|
101
|
+
const { key } = this.generateKeyValue(keyValue);
|
|
102
|
+
const expression = `attribute_not_exists(${key})`;
|
|
103
|
+
this.setExpression(expression);
|
|
104
|
+
return this.query;
|
|
105
|
+
}
|
|
106
|
+
between(keyValues) {
|
|
107
|
+
const isValidValues = Array.isArray(keyValues) && (keyValues === null || keyValues === void 0 ? void 0 : keyValues.length) === 2;
|
|
108
|
+
if (!isValidValues)
|
|
109
|
+
throw new Error('The value for between filter operator should be an Array with 2 values.');
|
|
110
|
+
const { key, value } = this.generateKeyValue(keyValues, ' AND');
|
|
111
|
+
const expression = `${key} between ${value}`;
|
|
112
|
+
this.setExpression(expression);
|
|
113
|
+
return this.query;
|
|
114
|
+
}
|
|
94
115
|
setExpression(expression) {
|
|
95
116
|
switch (this.queryFrom) {
|
|
96
117
|
case queryHelpers_1.METHOD_TO_QUERY.filter:
|
|
@@ -104,7 +125,7 @@ class QueryBuilderConditionService {
|
|
|
104
125
|
break;
|
|
105
126
|
}
|
|
106
127
|
}
|
|
107
|
-
generateKeyValue(value) {
|
|
128
|
+
generateKeyValue(value, separatorCharacter = ',') {
|
|
108
129
|
const keyExpression = `#${this.tempKey}1`;
|
|
109
130
|
this.attributeNames[keyExpression] = this.tempKey;
|
|
110
131
|
if (Array.isArray(value)) {
|
|
@@ -113,7 +134,10 @@ class QueryBuilderConditionService {
|
|
|
113
134
|
this.attributeValues[valueExpression] = val;
|
|
114
135
|
return valueExpression;
|
|
115
136
|
});
|
|
116
|
-
return {
|
|
137
|
+
return {
|
|
138
|
+
key: keyExpression,
|
|
139
|
+
value: valueExpressions.join(`${separatorCharacter} `),
|
|
140
|
+
};
|
|
117
141
|
}
|
|
118
142
|
else {
|
|
119
143
|
const valueExpression = `:${this.tempKey}1`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryBuilderCondition.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilderCondition.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"queryBuilderCondition.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilderCondition.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ class ConnectionService {
|
|
|
8
8
|
this.pool = new pg_1.Pool({ connectionString: this.connectionString });
|
|
9
9
|
}
|
|
10
10
|
get connectionString() {
|
|
11
|
-
return process.env.
|
|
11
|
+
return process.env.MULTIPLATFORM_PG_CONNECTION_STRING;
|
|
12
12
|
}
|
|
13
13
|
async getClient() {
|
|
14
14
|
if (this.pool) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/connection.service.ts"],"names":[],"mappings":";;AAAA,2BAA8C;AAE9C,MAAqB,iBAAiB;IAGlC,YAAY,OAAgB;QAFpB,SAAI,GAAgB,IAAI,CAAC;QAG7B,IAAI,OAAO;YACP,IAAI,CAAC,IAAI,GAAG,IAAI,SAAI,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,gBAAgB;QAChB,OAAO,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/connection.service.ts"],"names":[],"mappings":";;AAAA,2BAA8C;AAE9C,MAAqB,iBAAiB;IAGlC,YAAY,OAAgB;QAFpB,SAAI,GAAgB,IAAI,CAAC;QAG7B,IAAI,OAAO;YACP,IAAI,CAAC,IAAI,GAAG,IAAI,SAAI,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC1E,CAAC;IAED,IAAI,gBAAgB;QAChB,OAAO,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,SAAS;QACX,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;SAC9B;aAAM;YACH,MAAM,MAAM,GAAW,IAAI,WAAM,CAAC;gBAC9B,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;aAC1C,CAAC,CAAC;YACH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;YACvB,OAAO,MAAM,CAAC;SACjB;IACL,CAAC;IAED,aAAa,CAAC,MAA2B;QACrC,IAAI;YACA,IAAI,SAAS,IAAI,MAAM,EAAE;gBACrB,MAAM,CAAC,OAAO,EAAE,CAAC;aACpB;iBAAM,IAAI,KAAK,IAAI,MAAM,EAAE;gBACxB,MAAM,CAAC,GAAG,EAAE,CAAC;aAChB;SACJ;QAAC,WAAM;YACJ,uBAAuB;SAC1B;IACL,CAAC;CACJ;AAnCD,oCAmCC"}
|
|
@@ -9,6 +9,7 @@ const pg_format_1 = __importDefault(require("pg-format"));
|
|
|
9
9
|
const query_service_1 = __importDefault(require("./query.service"));
|
|
10
10
|
const constants_1 = require("../../../utils/constants");
|
|
11
11
|
const tableHelper_1 = require("../../../helpers/tableHelper");
|
|
12
|
+
const queryHelpers_1 = require("../../../helpers/queryHelpers");
|
|
12
13
|
class PostgresqlClientService extends query_service_1.default {
|
|
13
14
|
constructor(tableSchema) {
|
|
14
15
|
const useConnectionPool = tableSchema.usePool || false;
|
|
@@ -48,6 +49,9 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
48
49
|
: [formattedValue];
|
|
49
50
|
return `${pg_format_1.default.ident(attribute)} ${postgresOperator} (${formattedValues.join(', ')})`;
|
|
50
51
|
}
|
|
52
|
+
if (operator === constants_1.FilterOperator.BETWEEN) {
|
|
53
|
+
return `${pg_format_1.default.ident(attribute)} ${postgresOperator} ${value[0]} AND ${value[1]}`;
|
|
54
|
+
}
|
|
51
55
|
const wildcardValue = this.getWildcardValue(operator, value);
|
|
52
56
|
return `${pg_format_1.default.ident(attribute)} ${postgresOperator} ${pg_format_1.default.literal(wildcardValue)}`;
|
|
53
57
|
}
|
|
@@ -104,16 +108,20 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
104
108
|
}
|
|
105
109
|
return query;
|
|
106
110
|
}
|
|
107
|
-
getSelectClause(fields) {
|
|
111
|
+
getSelectClause(aggregateFunction, fields = []) {
|
|
112
|
+
if (aggregateFunction)
|
|
113
|
+
return `CAST(${aggregateFunction}(1) AS INTEGER) AS "${(0, queryHelpers_1.buildAggFunctionAlias)(aggregateFunction)}"`;
|
|
108
114
|
if (!(fields === null || fields === void 0 ? void 0 : fields.length))
|
|
109
115
|
return '*';
|
|
110
116
|
return fields.join(', ');
|
|
111
117
|
}
|
|
112
|
-
async findCommand(options) {
|
|
113
|
-
let query = `SELECT ${this.getSelectClause(options
|
|
114
|
-
query = this.addFiltersToQuery(query, options
|
|
115
|
-
|
|
116
|
-
|
|
118
|
+
async findCommand(options = {}) {
|
|
119
|
+
let query = `SELECT ${this.getSelectClause(options.aggregateFunction, options.fields)} FROM ${pg_format_1.default.ident(this.dbSchema)}.${pg_format_1.default.ident(this.tableName)}`;
|
|
120
|
+
query = this.addFiltersToQuery(query, options.filters);
|
|
121
|
+
if (!options.aggregateFunction) {
|
|
122
|
+
query = this.addOrderByToQuery(query, options.sorting);
|
|
123
|
+
query = this.addPaginationToQuery(query, options.pagination);
|
|
124
|
+
}
|
|
117
125
|
return (await this.runQuery(query)).rows;
|
|
118
126
|
}
|
|
119
127
|
sanitizeValue(value) {
|
|
@@ -131,10 +139,7 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
131
139
|
}
|
|
132
140
|
})
|
|
133
141
|
.join(',');
|
|
134
|
-
|
|
135
|
-
return isArrayWithObjects
|
|
136
|
-
? `ARRAY[${formattedArray}]::jsonb[]`
|
|
137
|
-
: `ARRAY[${formattedArray}]`;
|
|
142
|
+
return JSON.stringify(formattedArray);
|
|
138
143
|
}
|
|
139
144
|
else {
|
|
140
145
|
return pg_format_1.default.literal(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgreSqlClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlClient.service.ts"],"names":[],"mappings":";AAAA,uDAAuD;AACvD,+BAA+B;;;;;AAE/B,0DAA+B;AAU/B,oEAA2C;AAC3C,wDAMkC;AAElC,8DAA4D;
|
|
1
|
+
{"version":3,"file":"postgreSqlClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlClient.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.PostgreSqlCrudService = void 0;
|
|
7
7
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
8
|
-
const q_id_generator_1 = require("q-id-generator");
|
|
9
8
|
const postgreSqlClient_service_1 = __importDefault(require("./postgreSqlClient.service"));
|
|
10
9
|
const tableHelper_1 = require("../../../helpers/tableHelper");
|
|
10
|
+
const constants_1 = require("../../../utils/constants");
|
|
11
|
+
const queryHelpers_1 = require("../../../helpers/queryHelpers");
|
|
11
12
|
class PostgreSqlCrudService extends postgreSqlClient_service_1.default {
|
|
12
13
|
constructor(tableSchema) {
|
|
13
14
|
super(tableSchema);
|
|
@@ -31,12 +32,7 @@ class PostgreSqlCrudService extends postgreSqlClient_service_1.default {
|
|
|
31
32
|
return resultItem;
|
|
32
33
|
}
|
|
33
34
|
create(entity) {
|
|
34
|
-
|
|
35
|
-
let inputData = Object.assign({}, entity);
|
|
36
|
-
if (this.idColumnName) {
|
|
37
|
-
const idValue = ((_a = entity[this.idColumnName]) === null || _a === void 0 ? void 0 : _a.toString()) || (0, q_id_generator_1.getId)();
|
|
38
|
-
inputData = Object.assign(Object.assign({}, entity), { [this.idColumnName]: idValue });
|
|
39
|
-
}
|
|
35
|
+
const inputData = Object.assign({}, entity);
|
|
40
36
|
this.moveUndefinedColumnsToQvAttributes(inputData);
|
|
41
37
|
return this.createCommand(inputData).then((data) => data.rows[0]);
|
|
42
38
|
}
|
|
@@ -47,17 +43,28 @@ class PostgreSqlCrudService extends postgreSqlClient_service_1.default {
|
|
|
47
43
|
: null;
|
|
48
44
|
});
|
|
49
45
|
}
|
|
50
|
-
|
|
46
|
+
async processQueryResult(findOptions, omitPagination = false) {
|
|
51
47
|
const { pagination } = findOptions;
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
48
|
+
const rows = await this.findCommand(findOptions);
|
|
49
|
+
const items = rows.map((row) => this.getItem(row));
|
|
50
|
+
const result = {
|
|
51
|
+
items,
|
|
52
|
+
pagination: omitPagination ? null : pagination,
|
|
53
|
+
count: items.length,
|
|
54
|
+
};
|
|
55
|
+
return result;
|
|
55
56
|
}
|
|
56
|
-
|
|
57
|
-
return this.
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
57
|
+
async find(findOptions) {
|
|
58
|
+
return this.processQueryResult(findOptions);
|
|
59
|
+
}
|
|
60
|
+
async findAll(findOptions) {
|
|
61
|
+
return this.processQueryResult(findOptions, true);
|
|
62
|
+
}
|
|
63
|
+
async findCount(findOptions) {
|
|
64
|
+
const items = await this.findCommand(Object.assign(Object.assign({}, findOptions), { aggregateFunction: constants_1.AGGREGATE_FUNCTIONS.COUNT }));
|
|
65
|
+
const aggFunctionProperty = (0, queryHelpers_1.buildAggFunctionAlias)(constants_1.AGGREGATE_FUNCTIONS.COUNT);
|
|
66
|
+
const item = items.length ? items[0] : {};
|
|
67
|
+
return item[aggFunctionProperty] || 0;
|
|
61
68
|
}
|
|
62
69
|
async update(filters, data) {
|
|
63
70
|
const savedRecord = await this.findItem({ filters });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgreSqlCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlCrud.service.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,
|
|
1
|
+
{"version":3,"file":"postgreSqlCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlCrud.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const connection_service_1 = __importDefault(require("./connection.service"));
|
|
7
7
|
class QueryService {
|
|
8
8
|
constructor(usePool) {
|
|
9
|
-
const connectionString = process.env.
|
|
9
|
+
const connectionString = process.env.MULTIPLATFORM_PG_CONNECTION_STRING || '';
|
|
10
10
|
if (!connectionString) {
|
|
11
|
-
throw new Error('
|
|
11
|
+
throw new Error('MULTIPLATFORM_PG_CONNECTION_STRING environment variable must be configured');
|
|
12
12
|
}
|
|
13
13
|
this.connectionService = new connection_service_1.default(usePool);
|
|
14
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/query.service.ts"],"names":[],"mappings":";;;;;AAGA,8EAAqD;AAErD,MAAqB,YAAY;IAG7B,YAAY,OAAgB;QACxB,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"query.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/query.service.ts"],"names":[],"mappings":";;;;;AAGA,8EAAqD;AAErD,MAAqB,YAAY;IAG7B,YAAY,OAAgB;QACxB,MAAM,gBAAgB,GAClB,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,EAAE,CAAC;QACzD,IAAI,CAAC,gBAAgB,EAAE;YACnB,MAAM,IAAI,KAAK,CACX,4EAA4E,CAC/E,CAAC;SACL;QAED,IAAI,CAAC,iBAAiB,GAAG,IAAI,4BAAiB,CAAC,OAAO,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,QAAQ,CACV,SAAiB,EACjB,MAAc;QAEd,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC;QACxD,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACrD,OAAO,MAAM,CAAC;SACjB;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,CAAC,GAAG,CAAC,6CAA6C,EAAE,KAAK,CAAC,CAAC;YAClE,MAAM,KAAK,CAAC;SACf;gBAAS;YACN,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SAChD;IACL,CAAC;CACJ;AA9BD,+BA8BC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"aggregateFunction.type.js","sourceRoot":"","sources":["../../../src/types/aggregateFunction.type.ts"],"names":[],"mappings":""}
|
package/dist/cjs/types/index.js
CHANGED
|
@@ -18,4 +18,5 @@ __exportStar(require("./filterInput.type"), exports);
|
|
|
18
18
|
__exportStar(require("./sortDirection.type"), exports);
|
|
19
19
|
__exportStar(require("./filterLogicOperator.type"), exports);
|
|
20
20
|
__exportStar(require("./connectionClosingMode.type"), exports);
|
|
21
|
+
__exportStar(require("./aggregateFunction.type"), exports);
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,uDAAqC;AACrC,6DAA2C;AAC3C,+DAA6C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qDAAmC;AACnC,uDAAqC;AACrC,6DAA2C;AAC3C,+DAA6C;AAC7C,2DAAyC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortDirection.type.js","sourceRoot":"","sources":["../../../src/types/sortDirection.type.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sortDirection.type.js","sourceRoot":"","sources":["../../../src/types/sortDirection.type.ts"],"names":[],"mappings":""}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DEFAULT_PG_SCHEMA = exports.POSTGRES_FILTER_OPERATOR_MAP = exports.FilterOperator = exports.FILTER_LOGIC_OPERATORS = exports.CONNECTION_CLOSING_MODES = exports.SORT_DIRECTIONS = exports.DYNAMODB_OPERATORS = exports.FILTER_OPERATOR_MAP = void 0;
|
|
3
|
+
exports.AGGREGATE_FUNCTIONS = exports.DEFAULT_PG_SCHEMA = exports.POSTGRES_FILTER_OPERATOR_MAP = exports.FilterOperator = exports.FILTER_LOGIC_OPERATORS = exports.CONNECTION_CLOSING_MODES = exports.SORT_DIRECTIONS = exports.DYNAMODB_OPERATORS = exports.FILTER_OPERATOR_MAP = void 0;
|
|
4
4
|
exports.FILTER_OPERATOR_MAP = {
|
|
5
5
|
CONTAINS: 'contains',
|
|
6
6
|
NOT_CONTAINS: 'notContains',
|
|
@@ -16,6 +16,9 @@ exports.FILTER_OPERATOR_MAP = {
|
|
|
16
16
|
LT: 'lt',
|
|
17
17
|
LESS_THAN_EQUAL: 'lte',
|
|
18
18
|
LTE: 'lte',
|
|
19
|
+
EXIST: 'attribute_exists',
|
|
20
|
+
NOT_EXIST: 'attribute_not_exists',
|
|
21
|
+
BETWEEN: 'between',
|
|
19
22
|
};
|
|
20
23
|
exports.DYNAMODB_OPERATORS = {
|
|
21
24
|
EQUAL: 'EQUAL',
|
|
@@ -47,6 +50,7 @@ var FilterOperator;
|
|
|
47
50
|
FilterOperator["IN"] = "IN";
|
|
48
51
|
FilterOperator["STARTS_WITH"] = "STARTS_WITH";
|
|
49
52
|
FilterOperator["NOT_CONTAINS"] = "NOT_CONTAINS";
|
|
53
|
+
FilterOperator["BETWEEN"] = "BETWEEN";
|
|
50
54
|
})(FilterOperator || (exports.FilterOperator = FilterOperator = {}));
|
|
51
55
|
exports.POSTGRES_FILTER_OPERATOR_MAP = {
|
|
52
56
|
EQUAL: '=',
|
|
@@ -63,6 +67,11 @@ exports.POSTGRES_FILTER_OPERATOR_MAP = {
|
|
|
63
67
|
STARTS_WITH: 'LIKE',
|
|
64
68
|
CONTAINS: 'LIKE',
|
|
65
69
|
NOT_CONTAINS: 'NOT LIKE',
|
|
70
|
+
BETWEEN: 'BETWEEN',
|
|
66
71
|
};
|
|
67
72
|
exports.DEFAULT_PG_SCHEMA = 'public';
|
|
73
|
+
var AGGREGATE_FUNCTIONS;
|
|
74
|
+
(function (AGGREGATE_FUNCTIONS) {
|
|
75
|
+
AGGREGATE_FUNCTIONS["COUNT"] = "COUNT";
|
|
76
|
+
})(AGGREGATE_FUNCTIONS || (exports.AGGREGATE_FUNCTIONS = AGGREGATE_FUNCTIONS = {}));
|
|
68
77
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAA8B;IAC1D,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,aAAa;IAC3B,KAAK,EAAE,IAAI;IACX,WAAW,EAAE,YAAY;IACzB,SAAS,EAAE,OAAO;IAClB,EAAE,EAAE,IAAI;IACR,YAAY,EAAE,IAAI;IAClB,EAAE,EAAE,IAAI;IACR,kBAAkB,EAAE,KAAK;IACzB,GAAG,EAAE,KAAK;IACV,SAAS,EAAE,IAAI;IACf,EAAE,EAAE,IAAI;IACR,eAAe,EAAE,KAAK;IACtB,GAAG,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,mBAAmB,GAA8B;IAC1D,QAAQ,EAAE,UAAU;IACpB,YAAY,EAAE,aAAa;IAC3B,KAAK,EAAE,IAAI;IACX,WAAW,EAAE,YAAY;IACzB,SAAS,EAAE,OAAO;IAClB,EAAE,EAAE,IAAI;IACR,YAAY,EAAE,IAAI;IAClB,EAAE,EAAE,IAAI;IACR,kBAAkB,EAAE,KAAK;IACzB,GAAG,EAAE,KAAK;IACV,SAAS,EAAE,IAAI;IACf,EAAE,EAAE,IAAI;IACR,eAAe,EAAE,KAAK;IACtB,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,kBAAkB;IACzB,SAAS,EAAE,sBAAsB;IACjC,OAAO,EAAE,SAAS;CACrB,CAAC;AAEW,QAAA,kBAAkB,GAA8B;IACzD,KAAK,EAAE,OAAO;CACjB,CAAC;AAEF,IAAY,eAGX;AAHD,WAAY,eAAe;IACvB,8BAAW,CAAA;IACX,gCAAa,CAAA;AACjB,CAAC,EAHW,eAAe,+BAAf,eAAe,QAG1B;AAED,IAAY,wBAGX;AAHD,WAAY,wBAAwB;IAChC,yCAAa,CAAA;IACb,6CAAiB,CAAA;AACrB,CAAC,EAHW,wBAAwB,wCAAxB,wBAAwB,QAGnC;AAED,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAC9B,qCAAW,CAAA;IACX,mCAAS,CAAA;AACb,CAAC,EAHW,sBAAsB,sCAAtB,sBAAsB,QAGjC;AAED,IAAY,cAYX;AAZD,WAAY,cAAc;IACtB,iCAAe,CAAA;IACf,yCAAuB,CAAA;IACvB,uCAAqB,CAAA;IACrB,+CAA6B,CAAA;IAC7B,2DAAyC,CAAA;IACzC,yCAAuB,CAAA;IACvB,qDAAmC,CAAA;IACnC,2BAAS,CAAA;IACT,6CAA2B,CAAA;IAC3B,+CAA6B,CAAA;IAC7B,qCAAmB,CAAA;AACvB,CAAC,EAZW,cAAc,8BAAd,cAAc,QAYzB;AAEY,QAAA,4BAA4B,GAAG;IACxC,KAAK,EAAE,GAAG;IACV,SAAS,EAAE,IAAI;IACf,YAAY,EAAE,GAAG;IACjB,EAAE,EAAE,GAAG;IACP,GAAG,EAAE,IAAI;IACT,kBAAkB,EAAE,IAAI;IACxB,GAAG,EAAE,IAAI;IACT,eAAe,EAAE,IAAI;IACrB,SAAS,EAAE,GAAG;IACd,EAAE,EAAE,GAAG;IACP,EAAE,EAAE,IAAI;IACR,WAAW,EAAE,MAAM;IACnB,QAAQ,EAAE,MAAM;IAChB,YAAY,EAAE,UAAU;IACxB,OAAO,EAAE,SAAS;CACrB,CAAC;AAEW,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAE1C,IAAY,mBAEX;AAFD,WAAY,mBAAmB;IAC3B,sCAAe,CAAA;AACnB,CAAC,EAFW,mBAAmB,mCAAnB,mBAAmB,QAE9B"}
|
package/dist/esm/index.mjs
CHANGED
|
@@ -1,11 +1,25 @@
|
|
|
1
1
|
import { default as default2 } from "./services/crud.service";
|
|
2
2
|
import { CrudSchema } from "./schemas/crudSchema";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
IFindOptions,
|
|
5
|
+
ISorting,
|
|
6
|
+
ICrudService,
|
|
7
|
+
IFilter,
|
|
8
|
+
IFindPagination
|
|
9
|
+
} from "./interfaces";
|
|
10
|
+
import { SortDirection, AggregateFunction, FilterInput } from "./types";
|
|
4
11
|
import { buildFilter, buildQueryIndex, buildSort } from "./helpers/crudHelpers";
|
|
5
12
|
export {
|
|
13
|
+
AggregateFunction,
|
|
6
14
|
CrudSchema,
|
|
7
15
|
default2 as CrudService,
|
|
16
|
+
FilterInput,
|
|
17
|
+
ICrudService,
|
|
18
|
+
IFilter,
|
|
8
19
|
IFindOptions,
|
|
20
|
+
IFindPagination,
|
|
21
|
+
ISorting,
|
|
22
|
+
SortDirection,
|
|
9
23
|
buildFilter,
|
|
10
24
|
buildQueryIndex,
|
|
11
25
|
buildSort
|
package/dist/esm/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["export { default as CrudService } from './services/crud.service';\nexport { CrudSchema } from './schemas/crudSchema';\nexport {
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["export { default as CrudService } from './services/crud.service';\nexport { CrudSchema } from './schemas/crudSchema';\nexport {\n IFindOptions,\n ISorting,\n ICrudService,\n IFilter,\n IFindPagination,\n} from './interfaces';\n\nexport { SortDirection, AggregateFunction, FilterInput } from './types';\n\nexport { buildFilter, buildQueryIndex, buildSort } from './helpers/crudHelpers';\n"],"mappings":"AAAA,SAAoB,WAAXA,gBAA8B;AACvC,SAAS,kBAAkB;AAC3B;AAAA,EACI;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACG;AAEP,SAAS,eAAe,mBAAmB,mBAAmB;AAE9D,SAAS,aAAa,iBAAiB,iBAAiB;","names":["default"]}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1,7 +1,29 @@
|
|
|
1
|
+
type FilterInput = string | IFilter[] | ICompoundFilter[] | ICompoundFilter;
|
|
2
|
+
|
|
3
|
+
declare enum SORT_DIRECTIONS {
|
|
4
|
+
ASC = "ASC",
|
|
5
|
+
DESC = "DESC"
|
|
6
|
+
}
|
|
7
|
+
declare enum FILTER_LOGIC_OPERATORS {
|
|
8
|
+
AND = "AND",
|
|
9
|
+
OR = "OR"
|
|
10
|
+
}
|
|
11
|
+
declare enum AGGREGATE_FUNCTIONS {
|
|
12
|
+
COUNT = "COUNT"
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
type SortDirection = keyof typeof SORT_DIRECTIONS;
|
|
16
|
+
|
|
17
|
+
declare const VALID_FILTER_LOGIC_OPERATORS: FILTER_LOGIC_OPERATORS[];
|
|
18
|
+
type FilterLogicOperator = (typeof VALID_FILTER_LOGIC_OPERATORS)[number];
|
|
19
|
+
|
|
20
|
+
type AggregateFunction = keyof typeof AGGREGATE_FUNCTIONS;
|
|
21
|
+
|
|
1
22
|
interface IFilter {
|
|
2
23
|
attribute: string;
|
|
3
24
|
operator?: string;
|
|
4
|
-
value:
|
|
25
|
+
value: unknown;
|
|
26
|
+
omitPrimary?: boolean;
|
|
5
27
|
}
|
|
6
28
|
|
|
7
29
|
interface ICompoundFilter {
|
|
@@ -19,9 +41,15 @@ interface IFindPagination {
|
|
|
19
41
|
from?: any;
|
|
20
42
|
}
|
|
21
43
|
|
|
44
|
+
interface ISorting {
|
|
45
|
+
column: string;
|
|
46
|
+
direction?: SortDirection;
|
|
47
|
+
}
|
|
48
|
+
|
|
22
49
|
interface IFindOptions {
|
|
23
50
|
fields?: string[];
|
|
24
51
|
filters?: IFilter[] | ICompoundFilter;
|
|
52
|
+
aggregateFunction?: AggregateFunction;
|
|
25
53
|
sorting?: ISorting[];
|
|
26
54
|
pagination?: IFindPagination;
|
|
27
55
|
throwErrorIfNull?: boolean;
|
|
@@ -33,19 +61,23 @@ interface IFindOptions {
|
|
|
33
61
|
interface IFindResult<T> {
|
|
34
62
|
items: T[];
|
|
35
63
|
pagination?: IFindPagination | null;
|
|
64
|
+
count: number;
|
|
36
65
|
}
|
|
37
66
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
DESC = "DESC"
|
|
41
|
-
}
|
|
42
|
-
declare enum FILTER_LOGIC_OPERATORS {
|
|
43
|
-
AND = "AND",
|
|
44
|
-
OR = "OR"
|
|
67
|
+
interface IUpdateOptions {
|
|
68
|
+
replace?: boolean;
|
|
45
69
|
}
|
|
46
70
|
|
|
47
|
-
|
|
48
|
-
|
|
71
|
+
interface ICrudService<T> {
|
|
72
|
+
create(entity: T): Promise<T>;
|
|
73
|
+
findItem(options?: IFindOptions): Promise<T | null>;
|
|
74
|
+
find(options?: IFindOptions): Promise<IFindResult<T>>;
|
|
75
|
+
findAll(options?: IFindOptions): Promise<IFindResult<T>>;
|
|
76
|
+
findCount(options?: IFindOptions): Promise<number>;
|
|
77
|
+
update(filters: IFilter[] | ICompoundFilter, data: Partial<T>, options?: IUpdateOptions): Promise<any | null>;
|
|
78
|
+
remove(filters: IFilter[] | ICompoundFilter): Promise<void>;
|
|
79
|
+
runQuery(queryCommand: any): Promise<any>;
|
|
80
|
+
}
|
|
49
81
|
|
|
50
82
|
interface ITableName {
|
|
51
83
|
name: string;
|
|
@@ -60,14 +92,6 @@ interface ITableColumns {
|
|
|
60
92
|
};
|
|
61
93
|
}
|
|
62
94
|
|
|
63
|
-
declare const VALID_FILTER_LOGIC_OPERATORS: FILTER_LOGIC_OPERATORS[];
|
|
64
|
-
type FilterLogicOperator = (typeof VALID_FILTER_LOGIC_OPERATORS)[number];
|
|
65
|
-
|
|
66
|
-
interface ISorting {
|
|
67
|
-
column: string;
|
|
68
|
-
direction?: SortDirection;
|
|
69
|
-
}
|
|
70
|
-
|
|
71
95
|
declare class CrudSchema {
|
|
72
96
|
static table: string | ITableName;
|
|
73
97
|
static columns: ITableColumns;
|
|
@@ -84,10 +108,12 @@ declare class CrudService<T> {
|
|
|
84
108
|
update(filters: IFilter[] | ICompoundFilter, data: Partial<T>): Promise<T | null>;
|
|
85
109
|
remove(filters: IFilter[] | ICompoundFilter): Promise<void>;
|
|
86
110
|
findAll(options: IFindOptions): Promise<IFindResult<T>>;
|
|
87
|
-
|
|
111
|
+
findCount(options: IFindOptions): Promise<number>;
|
|
112
|
+
buildFilter(attribute: string, value: string, operator?: string, options?: {}): {
|
|
88
113
|
attribute: string;
|
|
89
114
|
operator: string;
|
|
90
115
|
value: string;
|
|
116
|
+
omitPrimary: boolean;
|
|
91
117
|
};
|
|
92
118
|
buildQueryIndex(indexName: string, columns: string[]): {
|
|
93
119
|
indexName: string;
|
|
@@ -96,10 +122,13 @@ declare class CrudService<T> {
|
|
|
96
122
|
buildSort(column: string, direction: SortDirection): ISorting;
|
|
97
123
|
}
|
|
98
124
|
|
|
99
|
-
declare function buildFilter(attribute: string, value: string, operator?: string
|
|
125
|
+
declare function buildFilter(attribute: string, value: string, operator?: string, { omitPrimary }?: {
|
|
126
|
+
omitPrimary?: boolean | undefined;
|
|
127
|
+
}): {
|
|
100
128
|
attribute: string;
|
|
101
129
|
operator: string;
|
|
102
130
|
value: string;
|
|
131
|
+
omitPrimary: boolean;
|
|
103
132
|
};
|
|
104
133
|
declare function buildQueryIndex(indexName: string, columns: string[]): {
|
|
105
134
|
indexName: string;
|
|
@@ -107,4 +136,4 @@ declare function buildQueryIndex(indexName: string, columns: string[]): {
|
|
|
107
136
|
};
|
|
108
137
|
declare function buildSort(column: string, direction?: SortDirection): ISorting;
|
|
109
138
|
|
|
110
|
-
export { CrudSchema, CrudService, IFindOptions, buildFilter, buildQueryIndex, buildSort };
|
|
139
|
+
export { AggregateFunction, CrudSchema, CrudService, FilterInput, ICrudService, IFilter, IFindOptions, IFindPagination, ISorting, SortDirection, buildFilter, buildQueryIndex, buildSort };
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"name": "@qrvey/data-persistence",
|
|
3
3
|
"types": "dist/types/index.d.ts",
|
|
4
4
|
"main": "dist/cjs/index.js",
|
|
5
|
-
"version": "0.0.
|
|
5
|
+
"version": "0.0.3-6",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"exports": {
|
|
8
8
|
".": {
|
|
@@ -30,30 +30,41 @@
|
|
|
30
30
|
"publish-package": "yarn prepare-publish && npm publish"
|
|
31
31
|
},
|
|
32
32
|
"peerDependencies": {
|
|
33
|
-
"@aws-sdk/client-dynamodb": "
|
|
34
|
-
"@aws-sdk/lib-dynamodb": "
|
|
35
|
-
"pg": "
|
|
36
|
-
"pg-format": "
|
|
33
|
+
"@aws-sdk/client-dynamodb": "3.x",
|
|
34
|
+
"@aws-sdk/lib-dynamodb": "3.x",
|
|
35
|
+
"pg": "8.11.4",
|
|
36
|
+
"pg-format": "1.0.4"
|
|
37
|
+
},
|
|
38
|
+
"peerDependenciesMeta": {
|
|
39
|
+
"@aws-sdk/client-dynamodb": {
|
|
40
|
+
"optional": true
|
|
41
|
+
},
|
|
42
|
+
"@aws-sdk/lib-dynamodb": {
|
|
43
|
+
"optional": true
|
|
44
|
+
},
|
|
45
|
+
"pg": {
|
|
46
|
+
"optional": true
|
|
47
|
+
},
|
|
48
|
+
"pg-format": {
|
|
49
|
+
"optional": true
|
|
50
|
+
}
|
|
37
51
|
},
|
|
38
52
|
"devDependencies": {
|
|
39
|
-
"@types/jest": "
|
|
40
|
-
"@types/pg": "
|
|
41
|
-
"@types/pg-format": "
|
|
42
|
-
"auto-version-js": "
|
|
53
|
+
"@types/jest": "29.5.5",
|
|
54
|
+
"@types/pg": "8.11.4",
|
|
55
|
+
"@types/pg-format": "1.0.5",
|
|
56
|
+
"auto-version-js": "0.3.10",
|
|
43
57
|
"eslint-config-custom": "*",
|
|
44
|
-
"jest": "
|
|
45
|
-
"ts-jest": "
|
|
58
|
+
"jest": "29.7.0",
|
|
59
|
+
"ts-jest": "29.1.1",
|
|
46
60
|
"tsconfig": "*",
|
|
47
|
-
"tsup": "
|
|
48
|
-
"typescript": "
|
|
61
|
+
"tsup": "7.2.0",
|
|
62
|
+
"typescript": "5.2.2"
|
|
49
63
|
},
|
|
50
64
|
"publishConfig": {
|
|
51
65
|
"access": "public"
|
|
52
66
|
},
|
|
53
67
|
"files": [
|
|
54
68
|
"dist/*"
|
|
55
|
-
]
|
|
56
|
-
"dependencies": {
|
|
57
|
-
"q-id-generator": "1.4.0"
|
|
58
|
-
}
|
|
69
|
+
]
|
|
59
70
|
}
|