@qrvey/data-persistence 0.0.3 → 0.0.4-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/README.md +3 -0
- package/dist/cjs/helpers/crudHelpers.js +2 -2
- package/dist/cjs/helpers/crudHelpers.js.map +1 -1
- package/dist/cjs/interfaces/{compoundFilter.interface.js → compositeFilter.interface.js} +1 -1
- package/dist/cjs/interfaces/compositeFilter.interface.js.map +1 -0
- package/dist/cjs/interfaces/index.js +1 -1
- package/dist/cjs/interfaces/index.js.map +1 -1
- package/dist/cjs/services/crud.service.js +2 -2
- package/dist/cjs/services/crud.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js +53 -24
- package/dist/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilder.service.js +9 -3
- package/dist/cjs/services/cruds/dynamodb/queryBuilder.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilderCondition.service.js +109 -16
- package/dist/cjs/services/cruds/dynamodb/queryBuilderCondition.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/connection.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js +20 -15
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/postgreSqlCrud.service.js +1 -7
- package/dist/cjs/services/cruds/postgresql/postgreSqlCrud.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/query.service.js.map +1 -1
- package/dist/cjs/utils/constants.js +5 -0
- package/dist/cjs/utils/constants.js.map +1 -1
- package/dist/types/index.d.ts +31 -43
- package/package.json +10 -13
- package/dist/cjs/interfaces/compoundFilter.interface.js.map +0 -1
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,12 +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
|
-
|
|
5
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
6
|
+
function buildFilter(attribute, value, operator = 'EQUAL') {
|
|
6
7
|
return {
|
|
7
8
|
attribute,
|
|
8
9
|
operator,
|
|
9
10
|
value,
|
|
10
|
-
omitPrimary,
|
|
11
11
|
};
|
|
12
12
|
}
|
|
13
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,
|
|
1
|
+
{"version":3,"file":"crudHelpers.js","sourceRoot":"","sources":["../../../src/helpers/crudHelpers.ts"],"names":[],"mappings":";;;AAEA,kDAAqD;AAErD,8DAA8D;AAC9D,SAAgB,WAAW,CAAC,SAAiB,EAAE,KAAU,EAAE,QAAQ,GAAG,OAAO;IACzE,OAAO;QACH,SAAS;QACT,QAAQ;QACR,KAAK;KACR,CAAC;AACN,CAAC;AAND,kCAMC;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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compositeFilter.interface.js","sourceRoot":"","sources":["../../../src/interfaces/compositeFilter.interface.ts"],"names":[],"mappings":""}
|
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./
|
|
17
|
+
__exportStar(require("./compositeFilter.interface"), exports);
|
|
18
18
|
__exportStar(require("./crudService.interface"), exports);
|
|
19
19
|
__exportStar(require("./filter.interface"), exports);
|
|
20
20
|
__exportStar(require("./findOptions.interface"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/interfaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA4C;AAC5C,0DAAwC;AACxC,qDAAmC;AACnC,0DAAwC;AACxC,6DAA2C;AAC3C,2DAAyC;AACzC,yDAAuC;AACvC,wDAAsC;AACtC,sDAAoC;AACpC,wDAAsC;AACtC,2DAAyC;AACzC,4DAA0C"}
|
|
@@ -42,8 +42,8 @@ class CrudService {
|
|
|
42
42
|
const { pagination } = options, findAllOptions = __rest(options, ["pagination"]);
|
|
43
43
|
return this.crudService.findCount(findAllOptions);
|
|
44
44
|
}
|
|
45
|
-
buildFilter(attribute, value, operator = 'EQUAL'
|
|
46
|
-
return (0, crudHelpers_1.buildFilter)(attribute, value, operator
|
|
45
|
+
buildFilter(attribute, value, operator = 'EQUAL') {
|
|
46
|
+
return (0, crudHelpers_1.buildFilter)(attribute, value, operator);
|
|
47
47
|
}
|
|
48
48
|
buildQueryIndex(indexName, columns) {
|
|
49
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,
|
|
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,OAAqC,EACrC,IAAgB;QAEhB,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,CAAC,OAAqC;QACxC,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,CAAC,SAAiB,EAAE,KAAa,EAAE,QAAQ,GAAG,OAAO;QAC5D,OAAO,IAAA,yBAAW,EAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACnD,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,14 +24,8 @@ 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) {
|
|
@@ -76,7 +69,7 @@ class DynamoDbCrudService {
|
|
|
76
69
|
: this.dynamoDbClientService.query(command));
|
|
77
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);
|
|
78
71
|
const rows = (_d = result.Items) !== null && _d !== void 0 ? _d : [];
|
|
79
|
-
results =
|
|
72
|
+
results = results.concat(rows);
|
|
80
73
|
LastEvaluatedKey = (_e = result.LastEvaluatedKey) !== null && _e !== void 0 ? _e : {};
|
|
81
74
|
} while (results.length < limit &&
|
|
82
75
|
this.isNotEmptyObject(LastEvaluatedKey));
|
|
@@ -129,25 +122,61 @@ class DynamoDbCrudService {
|
|
|
129
122
|
const operator = constants_1.FILTER_OPERATOR_MAP[(_b = (_a = filter.operator) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : constants_1.DYNAMODB_OPERATORS.EQUAL];
|
|
130
123
|
query.where(filter.attribute)[operator](filter.value);
|
|
131
124
|
}
|
|
132
|
-
applyFilterFilter(query, filter) {
|
|
125
|
+
applyFilterFilter(query, filter, logicOperator = 'AND') {
|
|
133
126
|
var _a, _b;
|
|
134
127
|
const operator = constants_1.FILTER_OPERATOR_MAP[(_b = (_a = filter.operator) === null || _a === void 0 ? void 0 : _a.toUpperCase()) !== null && _b !== void 0 ? _b : constants_1.DYNAMODB_OPERATORS.EQUAL];
|
|
135
|
-
query.filter(filter.attribute)[operator](filter.value);
|
|
128
|
+
query.filter(filter.attribute, logicOperator)[operator](filter.value);
|
|
136
129
|
}
|
|
137
130
|
applyFilters(query, options) {
|
|
138
|
-
var _a;
|
|
139
131
|
if (Array.isArray(options.filters)) {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
132
|
+
this.applySimpleFilters(query, options);
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
this.applyCompoundFilters(query, options);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
applySimpleFilters(query, options) {
|
|
139
|
+
var _a;
|
|
140
|
+
const queryIndexColumns = ((_a = options.index) === null || _a === void 0 ? void 0 : _a.columns) || [];
|
|
141
|
+
const defaultWhereProperties = this.defaultPrimaryKeys;
|
|
142
|
+
const whereProperties = (queryIndexColumns === null || queryIndexColumns === void 0 ? void 0 : queryIndexColumns.length)
|
|
143
|
+
? queryIndexColumns
|
|
144
|
+
: defaultWhereProperties;
|
|
145
|
+
const filters = options.filters;
|
|
146
|
+
filters.forEach((filter) => {
|
|
147
|
+
const isWhereProperty = whereProperties.includes(filter.attribute);
|
|
148
|
+
isWhereProperty && !options.useScan
|
|
149
|
+
? this.applyWhereFilter(query, filter)
|
|
150
|
+
: this.applyFilterFilter(query, filter);
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
applyCompoundFilters(query, options) {
|
|
154
|
+
if (!options.filters)
|
|
155
|
+
return;
|
|
156
|
+
this.buildFilterExpression(query, options);
|
|
157
|
+
}
|
|
158
|
+
buildFilterExpression(query, options) {
|
|
159
|
+
var _a;
|
|
160
|
+
const compositeFilters = options.filters;
|
|
161
|
+
const queryIndexColumns = ((_a = options.index) === null || _a === void 0 ? void 0 : _a.columns) || [];
|
|
162
|
+
const defaultWhereProperties = this.defaultPrimaryKeys;
|
|
163
|
+
const whereProperties = (queryIndexColumns === null || queryIndexColumns === void 0 ? void 0 : queryIndexColumns.length)
|
|
164
|
+
? queryIndexColumns
|
|
165
|
+
: defaultWhereProperties;
|
|
166
|
+
for (const [key, value] of Object.entries(compositeFilters)) {
|
|
167
|
+
value.forEach((filter) => {
|
|
168
|
+
const isCompositeFilter = 'OR' in filter || 'AND' in filter;
|
|
169
|
+
if (isCompositeFilter) {
|
|
170
|
+
const newOptions = Object.assign(Object.assign({}, options), { filters: filter });
|
|
171
|
+
this.buildFilterExpression(query, newOptions);
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
const simpleFilter = filter;
|
|
175
|
+
const isWhereProperty = whereProperties.includes(simpleFilter.attribute);
|
|
176
|
+
isWhereProperty && !options.useScan
|
|
177
|
+
? this.applyWhereFilter(query, simpleFilter)
|
|
178
|
+
: this.applyFilterFilter(query, simpleFilter, key);
|
|
179
|
+
}
|
|
151
180
|
});
|
|
152
181
|
}
|
|
153
182
|
}
|
|
@@ -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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"}
|
|
@@ -48,11 +48,17 @@ class QueryBuilderService {
|
|
|
48
48
|
return this;
|
|
49
49
|
}
|
|
50
50
|
where(keyName) {
|
|
51
|
-
this.condition
|
|
51
|
+
this.condition
|
|
52
|
+
.setKey(keyName)
|
|
53
|
+
.setTmpLogicOp(null)
|
|
54
|
+
.from(queryHelpers_1.METHOD_TO_QUERY.where);
|
|
52
55
|
return this.condition;
|
|
53
56
|
}
|
|
54
|
-
filter(keyName) {
|
|
55
|
-
this.condition
|
|
57
|
+
filter(keyName, logicOperator = 'AND') {
|
|
58
|
+
this.condition
|
|
59
|
+
.setKey(keyName)
|
|
60
|
+
.setTmpLogicOp(logicOperator)
|
|
61
|
+
.from(queryHelpers_1.METHOD_TO_QUERY.filter);
|
|
56
62
|
return this.condition;
|
|
57
63
|
}
|
|
58
64
|
update(attribute) {
|
|
@@ -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,
|
|
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;aACT,MAAM,CAAC,OAAO,CAAC;aACf,aAAa,CAAC,IAAI,CAAC;aACnB,IAAI,CAAC,8BAAe,CAAC,KAAK,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,MAAM,CACF,OAAe,EACf,gBAAwB,KAAK;QAE7B,IAAI,CAAC,SAAS;aACT,MAAM,CAAC,OAAO,CAAC;aACf,aAAa,CAAC,aAAa,CAAC;aAC5B,IAAI,CAAC,8BAAe,CAAC,MAAM,CAAC,CAAC;QAClC,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;AAlFD,sCAkFC"}
|
|
@@ -4,6 +4,7 @@ const queryHelpers_1 = require("../../../helpers/queryHelpers");
|
|
|
4
4
|
class QueryBuilderConditionService {
|
|
5
5
|
constructor(query) {
|
|
6
6
|
this.tempKey = '';
|
|
7
|
+
this.tempLogicOperator = null;
|
|
7
8
|
this.wheres = [];
|
|
8
9
|
this.filters = [];
|
|
9
10
|
this.updates = [];
|
|
@@ -21,44 +22,60 @@ class QueryBuilderConditionService {
|
|
|
21
22
|
this.tempKey = key;
|
|
22
23
|
return this;
|
|
23
24
|
}
|
|
25
|
+
setTmpLogicOp(logicOp) {
|
|
26
|
+
this.tempLogicOperator = logicOp;
|
|
27
|
+
return this;
|
|
28
|
+
}
|
|
24
29
|
from(methodName) {
|
|
25
30
|
this.queryFrom = methodName;
|
|
26
31
|
return this;
|
|
27
32
|
}
|
|
28
33
|
eq(keyValue) {
|
|
29
34
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
30
|
-
|
|
35
|
+
let expression = `${key} = ${value}`;
|
|
36
|
+
if (this.tempLogicOperator)
|
|
37
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
31
38
|
this.setExpression(expression);
|
|
32
39
|
return this.query;
|
|
33
40
|
}
|
|
34
41
|
notEq(keyValue) {
|
|
35
42
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
36
|
-
|
|
43
|
+
let expression = `${key} <> ${value}`;
|
|
44
|
+
if (this.tempLogicOperator)
|
|
45
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
37
46
|
this.setExpression(expression);
|
|
38
47
|
return this.query;
|
|
39
48
|
}
|
|
40
49
|
contains(keyValue) {
|
|
41
50
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
42
|
-
|
|
51
|
+
let expression = `contains(${key}, ${value})`;
|
|
52
|
+
if (this.tempLogicOperator)
|
|
53
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
43
54
|
this.setExpression(expression);
|
|
44
55
|
return this.query;
|
|
45
56
|
}
|
|
46
57
|
notContains(keyValue) {
|
|
47
58
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
48
|
-
|
|
59
|
+
let expression = `NOT contains(${key}, ${value})`;
|
|
60
|
+
if (this.tempLogicOperator)
|
|
61
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
49
62
|
this.setExpression(expression);
|
|
50
63
|
return this.query;
|
|
51
64
|
}
|
|
52
65
|
in(keyValue) {
|
|
53
66
|
const keyValues = Array.isArray(keyValue) ? keyValue : [keyValue];
|
|
54
67
|
const { key, value } = this.generateKeyValue(keyValues);
|
|
55
|
-
|
|
68
|
+
let expression = `${key} IN (${value})`;
|
|
69
|
+
if (this.tempLogicOperator)
|
|
70
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
56
71
|
this.setExpression(expression);
|
|
57
72
|
return this.query;
|
|
58
73
|
}
|
|
59
74
|
beginsWith(keyValue) {
|
|
60
75
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
61
|
-
|
|
76
|
+
let expression = `begins_with(${key}, ${value})`;
|
|
77
|
+
if (this.tempLogicOperator)
|
|
78
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
62
79
|
this.setExpression(expression);
|
|
63
80
|
return this.query;
|
|
64
81
|
}
|
|
@@ -69,25 +86,60 @@ class QueryBuilderConditionService {
|
|
|
69
86
|
}
|
|
70
87
|
gt(keyValue) {
|
|
71
88
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
72
|
-
|
|
89
|
+
let expression = `${key} > ${value}`;
|
|
90
|
+
if (this.tempLogicOperator)
|
|
91
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
73
92
|
this.setExpression(expression);
|
|
74
93
|
return this.query;
|
|
75
94
|
}
|
|
76
95
|
gte(keyValue) {
|
|
77
96
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
78
|
-
|
|
97
|
+
let expression = `${key} >= ${value}`;
|
|
98
|
+
if (this.tempLogicOperator)
|
|
99
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
79
100
|
this.setExpression(expression);
|
|
80
101
|
return this.query;
|
|
81
102
|
}
|
|
82
103
|
lte(keyValue) {
|
|
83
104
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
84
|
-
|
|
105
|
+
let expression = `${key} <= ${value}`;
|
|
106
|
+
if (this.tempLogicOperator)
|
|
107
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
85
108
|
this.setExpression(expression);
|
|
86
109
|
return this.query;
|
|
87
110
|
}
|
|
88
111
|
lt(keyValue) {
|
|
89
112
|
const { key, value } = this.generateKeyValue(keyValue);
|
|
90
|
-
|
|
113
|
+
let expression = `${key} < ${value}`;
|
|
114
|
+
if (this.tempLogicOperator)
|
|
115
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
116
|
+
this.setExpression(expression);
|
|
117
|
+
return this.query;
|
|
118
|
+
}
|
|
119
|
+
attribute_exists(keyValue) {
|
|
120
|
+
const { key } = this.generateKeyValue(keyValue, null, true);
|
|
121
|
+
let expression = `attribute_exists(${key})`;
|
|
122
|
+
if (this.tempLogicOperator)
|
|
123
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
124
|
+
this.setExpression(expression);
|
|
125
|
+
return this.query;
|
|
126
|
+
}
|
|
127
|
+
attribute_not_exists(keyValue) {
|
|
128
|
+
const { key } = this.generateKeyValue(keyValue, null, true);
|
|
129
|
+
let expression = `attribute_not_exists(${key})`;
|
|
130
|
+
if (this.tempLogicOperator)
|
|
131
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
132
|
+
this.setExpression(expression);
|
|
133
|
+
return this.query;
|
|
134
|
+
}
|
|
135
|
+
between(keyValues) {
|
|
136
|
+
const isValidValues = Array.isArray(keyValues) && (keyValues === null || keyValues === void 0 ? void 0 : keyValues.length) === 2;
|
|
137
|
+
if (!isValidValues)
|
|
138
|
+
throw new Error('The value for between filter operator should be an Array with 2 values.');
|
|
139
|
+
const { key, value } = this.generateKeyValue(keyValues, ' AND');
|
|
140
|
+
let expression = `${key} between ${value}`;
|
|
141
|
+
if (this.tempLogicOperator)
|
|
142
|
+
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
91
143
|
this.setExpression(expression);
|
|
92
144
|
return this.query;
|
|
93
145
|
}
|
|
@@ -104,30 +156,71 @@ class QueryBuilderConditionService {
|
|
|
104
156
|
break;
|
|
105
157
|
}
|
|
106
158
|
}
|
|
107
|
-
generateKeyValue(value) {
|
|
159
|
+
generateKeyValue(value, separatorCharacter = ',', omitAttributeValues = false) {
|
|
108
160
|
const keyExpression = `#${this.tempKey}1`;
|
|
109
161
|
this.attributeNames[keyExpression] = this.tempKey;
|
|
110
162
|
if (Array.isArray(value)) {
|
|
111
163
|
const valueExpressions = value.map((val, index) => {
|
|
112
|
-
|
|
164
|
+
let valueExpression = `:${this.tempKey}${index + 1}1`;
|
|
165
|
+
for (const [i] of Object.entries(this.attributeValues)) {
|
|
166
|
+
if (i === valueExpression)
|
|
167
|
+
valueExpression += '1';
|
|
168
|
+
}
|
|
113
169
|
this.attributeValues[valueExpression] = val;
|
|
114
170
|
return valueExpression;
|
|
115
171
|
});
|
|
116
|
-
return {
|
|
172
|
+
return {
|
|
173
|
+
key: keyExpression,
|
|
174
|
+
value: valueExpressions.join(`${separatorCharacter} `),
|
|
175
|
+
};
|
|
117
176
|
}
|
|
118
177
|
else {
|
|
119
|
-
|
|
120
|
-
this.attributeValues
|
|
178
|
+
let valueExpression = `:${this.tempKey}1`;
|
|
179
|
+
if (valueExpression in this.attributeValues) {
|
|
180
|
+
for (const [index] of Object.entries(this.attributeValues)) {
|
|
181
|
+
if (index === valueExpression)
|
|
182
|
+
valueExpression += '1';
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
if (!omitAttributeValues)
|
|
186
|
+
this.attributeValues[valueExpression] = value;
|
|
121
187
|
return { key: keyExpression, value: valueExpression };
|
|
122
188
|
}
|
|
123
189
|
}
|
|
124
190
|
build() {
|
|
191
|
+
var _a;
|
|
125
192
|
if (this.wheres.length > 0) {
|
|
126
193
|
const keyConditionExpression = this.wheres.join(' AND ');
|
|
127
194
|
this.command['KeyConditionExpression'] = keyConditionExpression;
|
|
128
195
|
}
|
|
129
196
|
if (this.filters.length > 0) {
|
|
130
|
-
|
|
197
|
+
let filterExpression = '';
|
|
198
|
+
let previousOperator;
|
|
199
|
+
const lengthFilters = this.filters.length;
|
|
200
|
+
let flagOpen = false;
|
|
201
|
+
(_a = this.filters) === null || _a === void 0 ? void 0 : _a.forEach((filter, index) => {
|
|
202
|
+
if (filter === null || filter === void 0 ? void 0 : filter.logicOperator) {
|
|
203
|
+
if (previousOperator &&
|
|
204
|
+
previousOperator !== (filter === null || filter === void 0 ? void 0 : filter.logicOperator)) {
|
|
205
|
+
filterExpression += `(${filter.expression} `;
|
|
206
|
+
flagOpen = true;
|
|
207
|
+
}
|
|
208
|
+
else {
|
|
209
|
+
filterExpression += `${filter.expression} `;
|
|
210
|
+
if (flagOpen) {
|
|
211
|
+
filterExpression += `)`;
|
|
212
|
+
flagOpen = false;
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
if (index < lengthFilters - 1) {
|
|
216
|
+
filterExpression += `${filter.logicOperator} `;
|
|
217
|
+
}
|
|
218
|
+
else if (index === lengthFilters - 1 && flagOpen) {
|
|
219
|
+
filterExpression += `)`;
|
|
220
|
+
}
|
|
221
|
+
previousOperator = filter === null || filter === void 0 ? void 0 : filter.logicOperator;
|
|
222
|
+
}
|
|
223
|
+
});
|
|
131
224
|
this.command['FilterExpression'] = filterExpression;
|
|
132
225
|
}
|
|
133
226
|
if (this.updates.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryBuilderCondition.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilderCondition.service.ts"],"names":[],"mappings":";;AAIA,gEAAgE;AAGhE,MAAqB,4BAA4B;
|
|
1
|
+
{"version":3,"file":"queryBuilderCondition.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilderCondition.service.ts"],"names":[],"mappings":";;AAIA,gEAAgE;AAGhE,MAAqB,4BAA4B;IAsB7C,YAAY,KAAoB;QATxB,YAAO,GAAW,EAAE,CAAC;QACrB,sBAAiB,GAAkB,IAAI,CAAC;QACxC,WAAM,GAAa,EAAE,CAAC;QACtB,YAAO,GAAa,EAAE,CAAC;QACvB,YAAO,GAAa,EAAE,CAAC;QACvB,mBAAc,GAA2B,EAAE,CAAC;QACpD,8DAA8D;QACtD,oBAAe,GAAwB,EAAE,CAAC;QAG9C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;IACtB,CAAC;IAEM,GAAG;QACN,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAEM,MAAM,CAAC,GAAW;QACrB,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;QACnB,OAAO,IAAI,CAAC;IAChB,CAAC;IACD,aAAa,CAAC,OAAe;QACzB,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,IAAI,CAAC,UAA2B;QACnC,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC;QAC5B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,EAAE,CAAC,QAAgB;QACf,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,UAAU,GAAQ,GAAG,GAAG,MAAM,KAAK,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAgB;QAClB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,UAAU,GAAQ,GAAG,GAAG,OAAO,KAAK,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,QAAQ,CAAC,QAAgB;QACrB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,UAAU,GAAQ,YAAY,GAAG,KAAK,KAAK,GAAG,CAAC;QACnD,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,WAAW,CAAC,QAAgB;QACxB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,UAAU,GAAQ,gBAAgB,GAAG,KAAK,KAAK,GAAG,CAAC;QACvD,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,EAAE,CAAC,QAAa;QACZ,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACxD,IAAI,UAAU,GAAQ,GAAG,GAAG,QAAQ,KAAK,GAAG,CAAC;QAC7C,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,UAAU,CAAC,QAAgB;QACvB,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,UAAU,GAAQ,eAAe,GAAG,KAAK,KAAK,GAAG,CAAC;QACtD,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,QAAgB;QACpB,MAAM,GAAG,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC;QACpC,OAAO,GAAG,CAAC;IACf,CAAC;IAED,EAAE,CAAC,QAAa;QACZ,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,UAAU,GAAQ,GAAG,GAAG,MAAM,KAAK,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,QAAa;QACb,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,UAAU,GAAQ,GAAG,GAAG,OAAO,KAAK,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,GAAG,CAAC,QAAa;QACb,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,UAAU,GAAQ,GAAG,GAAG,OAAO,KAAK,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,EAAE,CAAC,QAAa;QACZ,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,UAAU,GAAQ,GAAG,GAAG,MAAM,KAAK,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,gBAAgB,CAAC,QAAgB;QAC7B,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5D,IAAI,UAAU,GAAQ,oBAAoB,GAAG,GAAG,CAAC;QACjD,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,oBAAoB,CAAC,QAAgB;QACjC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAC5D,IAAI,UAAU,GAAQ,wBAAwB,GAAG,GAAG,CAAC;QACrD,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,OAAO,CAAC,SAAc;QAClB,MAAM,aAAa,GACf,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,MAAK,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa;YACd,MAAM,IAAI,KAAK,CACX,yEAAyE,CAC5E,CAAC;QAEN,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAChE,IAAI,UAAU,GAAQ,GAAG,GAAG,YAAY,KAAK,EAAE,CAAC;QAChD,IAAI,IAAI,CAAC,iBAAiB;YACtB,UAAU,GAAG,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC/B,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAEO,aAAa,CAAC,UAAkB;QACpC,QAAQ,IAAI,CAAC,SAAS,EAAE;YACpB,KAAK,8BAAe,CAAC,MAAM;gBACvB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC9B,MAAM;YACV,KAAK,8BAAe,CAAC,MAAM;gBACvB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC9B,MAAM;YACV;gBACI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC7B,MAAM;SACb;IACL,CAAC;IAEO,gBAAgB,CACpB,KAAwB,EACxB,qBAAoC,GAAG,EACvC,sBAA+B,KAAK;QAKpC,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC;QAE1C,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QAElD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACtB,MAAM,gBAAgB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;gBAC9C,IAAI,eAAe,GAAG,IAAI,IAAI,CAAC,OAAO,GAAG,KAAK,GAAG,CAAC,GAAG,CAAC;gBACtD,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;oBACpD,IAAI,CAAC,KAAK,eAAe;wBAAE,eAAe,IAAI,GAAG,CAAC;iBACrD;gBACD,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,GAAG,GAAG,CAAC;gBAC5C,OAAO,eAAe,CAAC;YAC3B,CAAC,CAAC,CAAC;YACH,OAAO;gBACH,GAAG,EAAE,aAAa;gBAClB,KAAK,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,kBAAkB,GAAG,CAAC;aACzD,CAAC;SACL;aAAM;YACH,IAAI,eAAe,GAAG,IAAI,IAAI,CAAC,OAAO,GAAG,CAAC;YAC1C,IAAI,eAAe,IAAI,IAAI,CAAC,eAAe,EAAE;gBACzC,KAAK,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE;oBACxD,IAAI,KAAK,KAAK,eAAe;wBAAE,eAAe,IAAI,GAAG,CAAC;iBACzD;aACJ;YACD,IAAI,CAAC,mBAAmB;gBACpB,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC;YAClD,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;SACzD;IACL,CAAC;IAEO,KAAK;;QACT,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,MAAM,sBAAsB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzD,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,sBAAsB,CAAC;SACnE;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,IAAI,gBAAgB,GAAG,EAAE,CAAC;YAC1B,IAAI,gBAAwB,CAAC;YAE7B,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;YAC1C,IAAI,QAAQ,GAAG,KAAK,CAAC;YACrB,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,CAAC,CAAC,MAAW,EAAE,KAAK,EAAE,EAAE;gBACzC,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,EAAE;oBACvB,IACI,gBAAgB;wBAChB,gBAAgB,MAAK,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAA,EAC5C;wBACE,gBAAgB,IAAI,IAAI,MAAM,CAAC,UAAU,GAAG,CAAC;wBAC7C,QAAQ,GAAG,IAAI,CAAC;qBACnB;yBAAM;wBACH,gBAAgB,IAAI,GAAG,MAAM,CAAC,UAAU,GAAG,CAAC;wBAC5C,IAAI,QAAQ,EAAE;4BACV,gBAAgB,IAAI,GAAG,CAAC;4BACxB,QAAQ,GAAG,KAAK,CAAC;yBACpB;qBACJ;oBACD,IAAI,KAAK,GAAG,aAAa,GAAG,CAAC,EAAE;wBAC3B,gBAAgB,IAAI,GAAG,MAAM,CAAC,aAAa,GAAG,CAAC;qBAClD;yBAAM,IAAI,KAAK,KAAK,aAAa,GAAG,CAAC,IAAI,QAAQ,EAAE;wBAChD,gBAAgB,IAAI,GAAG,CAAC;qBAC3B;oBACD,gBAAgB,GAAG,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC;iBAC5C;YACL,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,gBAAgB,CAAC;SACvD;QACD,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,gBAAgB,EAAE,CAAC;SAChE;QACD,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,GAAG,CAAC;YAC7C,IAAI,CAAC,OAAO,CAAC,0BAA0B,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC;QAEnE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC;YAC9C,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC;IACzE,CAAC;CACJ;AAnRD,+CAmRC"}
|
|
@@ -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,kCAAkC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,SAAS;QACX,IAAI,IAAI,CAAC,IAAI,EAAE
|
|
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"}
|
|
@@ -49,23 +49,29 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
49
49
|
: [formattedValue];
|
|
50
50
|
return `${pg_format_1.default.ident(attribute)} ${postgresOperator} (${formattedValues.join(', ')})`;
|
|
51
51
|
}
|
|
52
|
+
if (operator === constants_1.FilterOperator.BETWEEN) {
|
|
53
|
+
return `${pg_format_1.default.ident(attribute)} ${postgresOperator} ${value[0]} AND ${value[1]}`;
|
|
54
|
+
}
|
|
52
55
|
const wildcardValue = this.getWildcardValue(operator, value);
|
|
53
56
|
return `${pg_format_1.default.ident(attribute)} ${postgresOperator} ${pg_format_1.default.literal(wildcardValue)}`;
|
|
54
57
|
}
|
|
55
58
|
buildFilterClause(filters, logicOperator) {
|
|
56
|
-
var _a;
|
|
57
59
|
if (Array.isArray(filters)) {
|
|
58
60
|
const filterClauses = filters.map((filter) => {
|
|
59
61
|
return this.buildClause(filter.operator, filter.attribute, filter.value);
|
|
60
62
|
});
|
|
61
63
|
return filterClauses.join(` ${logicOperator !== null && logicOperator !== void 0 ? logicOperator : constants_1.FILTER_LOGIC_OPERATORS.AND} `);
|
|
62
64
|
}
|
|
63
|
-
else if (filters
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
65
|
+
// else if (filters) {
|
|
66
|
+
// const operator: FilterLogicOperator =
|
|
67
|
+
// filters.logicOperator ?? FILTER_LOGIC_OPERATORS.AND;
|
|
68
|
+
// const simpleFilters = filters.filters as IFilter[];
|
|
69
|
+
// const filterClauses = this.buildFilterClause(
|
|
70
|
+
// simpleFilters,
|
|
71
|
+
// operator,
|
|
72
|
+
// );
|
|
73
|
+
// return filterClauses;
|
|
74
|
+
// }
|
|
69
75
|
return '';
|
|
70
76
|
}
|
|
71
77
|
formatOrderByItem(sort) {
|
|
@@ -115,8 +121,10 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
115
121
|
async findCommand(options = {}) {
|
|
116
122
|
let query = `SELECT ${this.getSelectClause(options.aggregateFunction, options.fields)} FROM ${pg_format_1.default.ident(this.dbSchema)}.${pg_format_1.default.ident(this.tableName)}`;
|
|
117
123
|
query = this.addFiltersToQuery(query, options.filters);
|
|
118
|
-
|
|
119
|
-
|
|
124
|
+
if (!options.aggregateFunction) {
|
|
125
|
+
query = this.addOrderByToQuery(query, options.sorting);
|
|
126
|
+
query = this.addPaginationToQuery(query, options.pagination);
|
|
127
|
+
}
|
|
120
128
|
return (await this.runQuery(query)).rows;
|
|
121
129
|
}
|
|
122
130
|
sanitizeValue(value) {
|
|
@@ -134,10 +142,7 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
134
142
|
}
|
|
135
143
|
})
|
|
136
144
|
.join(',');
|
|
137
|
-
|
|
138
|
-
return isArrayWithObjects
|
|
139
|
-
? `ARRAY[${formattedArray}]::jsonb[]`
|
|
140
|
-
: `ARRAY[${formattedArray}]`;
|
|
145
|
+
return JSON.stringify(formattedArray);
|
|
141
146
|
}
|
|
142
147
|
else {
|
|
143
148
|
return pg_format_1.default.literal(value);
|
|
@@ -151,14 +156,14 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
151
156
|
});
|
|
152
157
|
query += ` ${updateClauses.join(', ')}`;
|
|
153
158
|
query += ' WHERE ';
|
|
154
|
-
query += this.buildFilterClause(
|
|
159
|
+
query += this.buildFilterClause(filters);
|
|
155
160
|
return this.runQuery(query);
|
|
156
161
|
}
|
|
157
162
|
async deleteCommand(filters) {
|
|
158
163
|
let query = `DELETE FROM ${pg_format_1.default.ident(this.dbSchema)}.${pg_format_1.default.ident(this.tableName)}`;
|
|
159
164
|
if (filters) {
|
|
160
165
|
query += ' WHERE ';
|
|
161
|
-
query += this.buildFilterClause(
|
|
166
|
+
query += this.buildFilterClause(filters);
|
|
162
167
|
}
|
|
163
168
|
return this.runQuery(query);
|
|
164
169
|
}
|
|
@@ -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;AAC5D,gEAAsE;AAEtE,MAAqB,uBAA2B,SAAQ,uBAAY;IAEhE,YAAY,WAA8B;QACtC,MAAM,iBAAiB,GAAG,WAAW,CAAC,OAAO,IAAI,KAAK,CAAC;QACvD,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,WAAW,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,6BAAiB,CAAC;IACvD,CAAC;IAED,IAAI,SAAS;QACT,OAAO,CACH,IAAA,0BAAY,EAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC;YAC5C,IAAA,0BAAY,EAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CACtC,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,QAAwB,EAAE,KAAa;QACpD,IACI,QAAQ,KAAK,0BAAc,CAAC,QAAQ;YACpC,QAAQ,KAAK,0BAAc,CAAC,YAAY,EAC1C
|
|
1
|
+
{"version":3,"file":"postgreSqlClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlClient.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ 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");
|
|
11
10
|
const constants_1 = require("../../../utils/constants");
|
|
@@ -33,12 +32,7 @@ class PostgreSqlCrudService extends postgreSqlClient_service_1.default {
|
|
|
33
32
|
return resultItem;
|
|
34
33
|
}
|
|
35
34
|
create(entity) {
|
|
36
|
-
|
|
37
|
-
let inputData = Object.assign({}, entity);
|
|
38
|
-
if (this.idColumnName) {
|
|
39
|
-
const idValue = ((_a = entity[this.idColumnName]) === null || _a === void 0 ? void 0 : _a.toString()) || (0, q_id_generator_1.getId)();
|
|
40
|
-
inputData = Object.assign(Object.assign({}, entity), { [this.idColumnName]: idValue });
|
|
41
|
-
}
|
|
35
|
+
const inputData = Object.assign({}, entity);
|
|
42
36
|
this.moveUndefinedColumnsToQvAttributes(inputData);
|
|
43
37
|
return this.createCommand(inputData).then((data) => data.rows[0]);
|
|
44
38
|
}
|
|
@@ -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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"}
|
|
@@ -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,GAClB,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,EAAE,CAAC;QACzD,IAAI,CAAC,gBAAgB,EAAE
|
|
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"}
|
|
@@ -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,7 @@ 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';
|
|
68
73
|
var AGGREGATE_FUNCTIONS;
|
|
@@ -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/types/index.d.ts
CHANGED
|
@@ -2,14 +2,27 @@ interface IFilter {
|
|
|
2
2
|
attribute: string;
|
|
3
3
|
operator?: string;
|
|
4
4
|
value: unknown;
|
|
5
|
-
omitPrimary?: boolean;
|
|
6
5
|
}
|
|
7
6
|
|
|
8
|
-
interface
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
interface ICompositeFilter {
|
|
8
|
+
AND?: (IFilter | ICompositeFilter)[];
|
|
9
|
+
OR?: (IFilter | ICompositeFilter)[];
|
|
11
10
|
}
|
|
12
11
|
|
|
12
|
+
type FilterInput = string | IFilter[] | ICompositeFilter[] | ICompositeFilter;
|
|
13
|
+
|
|
14
|
+
declare enum SORT_DIRECTIONS {
|
|
15
|
+
ASC = "ASC",
|
|
16
|
+
DESC = "DESC"
|
|
17
|
+
}
|
|
18
|
+
declare enum AGGREGATE_FUNCTIONS {
|
|
19
|
+
COUNT = "COUNT"
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
type SortDirection = keyof typeof SORT_DIRECTIONS;
|
|
23
|
+
|
|
24
|
+
type AggregateFunction = keyof typeof AGGREGATE_FUNCTIONS;
|
|
25
|
+
|
|
13
26
|
interface IFindIndex {
|
|
14
27
|
indexName: string;
|
|
15
28
|
columns: string[];
|
|
@@ -20,9 +33,14 @@ interface IFindPagination {
|
|
|
20
33
|
from?: any;
|
|
21
34
|
}
|
|
22
35
|
|
|
36
|
+
interface ISorting {
|
|
37
|
+
column: string;
|
|
38
|
+
direction?: SortDirection;
|
|
39
|
+
}
|
|
40
|
+
|
|
23
41
|
interface IFindOptions {
|
|
24
42
|
fields?: string[];
|
|
25
|
-
filters?: IFilter[] |
|
|
43
|
+
filters?: IFilter[] | ICompositeFilter;
|
|
26
44
|
aggregateFunction?: AggregateFunction;
|
|
27
45
|
sorting?: ISorting[];
|
|
28
46
|
pagination?: IFindPagination;
|
|
@@ -48,25 +66,11 @@ interface ICrudService<T> {
|
|
|
48
66
|
find(options?: IFindOptions): Promise<IFindResult<T>>;
|
|
49
67
|
findAll(options?: IFindOptions): Promise<IFindResult<T>>;
|
|
50
68
|
findCount(options?: IFindOptions): Promise<number>;
|
|
51
|
-
update(filters: IFilter[] |
|
|
52
|
-
remove(filters: IFilter[] |
|
|
69
|
+
update(filters: IFilter[] | ICompositeFilter, data: Partial<T>, options?: IUpdateOptions): Promise<any | null>;
|
|
70
|
+
remove(filters: IFilter[] | ICompositeFilter): Promise<void>;
|
|
53
71
|
runQuery(queryCommand: any): Promise<any>;
|
|
54
72
|
}
|
|
55
73
|
|
|
56
|
-
declare enum SORT_DIRECTIONS {
|
|
57
|
-
ASC = "ASC",
|
|
58
|
-
DESC = "DESC"
|
|
59
|
-
}
|
|
60
|
-
declare enum FILTER_LOGIC_OPERATORS {
|
|
61
|
-
AND = "AND",
|
|
62
|
-
OR = "OR"
|
|
63
|
-
}
|
|
64
|
-
declare enum AGGREGATE_FUNCTIONS {
|
|
65
|
-
COUNT = "COUNT"
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
type SortDirection = keyof typeof SORT_DIRECTIONS;
|
|
69
|
-
|
|
70
74
|
interface ITableName {
|
|
71
75
|
name: string;
|
|
72
76
|
alias?: string;
|
|
@@ -80,18 +84,6 @@ interface ITableColumns {
|
|
|
80
84
|
};
|
|
81
85
|
}
|
|
82
86
|
|
|
83
|
-
type FilterInput = string | IFilter[] | ICompoundFilter[] | ICompoundFilter;
|
|
84
|
-
|
|
85
|
-
declare const VALID_FILTER_LOGIC_OPERATORS: FILTER_LOGIC_OPERATORS[];
|
|
86
|
-
type FilterLogicOperator = (typeof VALID_FILTER_LOGIC_OPERATORS)[number];
|
|
87
|
-
|
|
88
|
-
type AggregateFunction = keyof typeof AGGREGATE_FUNCTIONS;
|
|
89
|
-
|
|
90
|
-
interface ISorting {
|
|
91
|
-
column: string;
|
|
92
|
-
direction?: SortDirection;
|
|
93
|
-
}
|
|
94
|
-
|
|
95
87
|
declare class CrudSchema {
|
|
96
88
|
static table: string | ITableName;
|
|
97
89
|
static columns: ITableColumns;
|
|
@@ -105,15 +97,14 @@ declare class CrudService<T> {
|
|
|
105
97
|
create(entity: T): Promise<T>;
|
|
106
98
|
find(options: IFindOptions): Promise<IFindResult<T>>;
|
|
107
99
|
findItem(options: IFindOptions): Promise<T | null>;
|
|
108
|
-
update(filters: IFilter[] |
|
|
109
|
-
remove(filters: IFilter[] |
|
|
100
|
+
update(filters: IFilter[] | ICompositeFilter, data: Partial<T>): Promise<T | null>;
|
|
101
|
+
remove(filters: IFilter[] | ICompositeFilter): Promise<void>;
|
|
110
102
|
findAll(options: IFindOptions): Promise<IFindResult<T>>;
|
|
111
103
|
findCount(options: IFindOptions): Promise<number>;
|
|
112
|
-
buildFilter(attribute: string, value: string, operator?: string
|
|
104
|
+
buildFilter(attribute: string, value: string, operator?: string): {
|
|
113
105
|
attribute: string;
|
|
114
106
|
operator: string;
|
|
115
|
-
value:
|
|
116
|
-
omitPrimary: boolean;
|
|
107
|
+
value: any;
|
|
117
108
|
};
|
|
118
109
|
buildQueryIndex(indexName: string, columns: string[]): {
|
|
119
110
|
indexName: string;
|
|
@@ -122,13 +113,10 @@ declare class CrudService<T> {
|
|
|
122
113
|
buildSort(column: string, direction: SortDirection): ISorting;
|
|
123
114
|
}
|
|
124
115
|
|
|
125
|
-
declare function buildFilter(attribute: string, value:
|
|
126
|
-
omitPrimary?: boolean | undefined;
|
|
127
|
-
}): {
|
|
116
|
+
declare function buildFilter(attribute: string, value: any, operator?: string): {
|
|
128
117
|
attribute: string;
|
|
129
118
|
operator: string;
|
|
130
|
-
value:
|
|
131
|
-
omitPrimary: boolean;
|
|
119
|
+
value: any;
|
|
132
120
|
};
|
|
133
121
|
declare function buildQueryIndex(indexName: string, columns: string[]): {
|
|
134
122
|
indexName: string;
|
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.4-1",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"exports": {
|
|
8
8
|
".": {
|
|
@@ -50,24 +50,21 @@
|
|
|
50
50
|
}
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@types/jest": "
|
|
54
|
-
"@types/pg": "
|
|
55
|
-
"@types/pg-format": "
|
|
56
|
-
"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",
|
|
57
57
|
"eslint-config-custom": "*",
|
|
58
|
-
"jest": "
|
|
59
|
-
"ts-jest": "
|
|
58
|
+
"jest": "29.7.0",
|
|
59
|
+
"ts-jest": "29.1.1",
|
|
60
60
|
"tsconfig": "*",
|
|
61
|
-
"tsup": "
|
|
62
|
-
"typescript": "
|
|
61
|
+
"tsup": "7.2.0",
|
|
62
|
+
"typescript": "5.2.2"
|
|
63
63
|
},
|
|
64
64
|
"publishConfig": {
|
|
65
65
|
"access": "public"
|
|
66
66
|
},
|
|
67
67
|
"files": [
|
|
68
68
|
"dist/*"
|
|
69
|
-
]
|
|
70
|
-
"dependencies": {
|
|
71
|
-
"q-id-generator": "1.4.0"
|
|
72
|
-
}
|
|
69
|
+
]
|
|
73
70
|
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"compoundFilter.interface.js","sourceRoot":"","sources":["../../../src/interfaces/compoundFilter.interface.ts"],"names":[],"mappings":""}
|