@qrvey/data-persistence 0.0.4 → 0.0.6-2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/helpers/crudHelpers.js +2 -1
- package/dist/cjs/helpers/crudHelpers.js.map +1 -1
- package/dist/cjs/interfaces/createMultipleResponse.interface.js +3 -0
- package/dist/cjs/interfaces/createMultipleResponse.interface.js.map +1 -0
- package/dist/cjs/interfaces/index.js +1 -0
- package/dist/cjs/interfaces/index.js.map +1 -1
- package/dist/cjs/services/crud.service.js +24 -5
- package/dist/cjs/services/crud.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/dynamoDbClient.service.js +15 -0
- package/dist/cjs/services/cruds/dynamodb/dynamoDbClient.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js +72 -39
- package/dist/cjs/services/cruds/dynamodb/dynamoDbCrud.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilder.service.js +8 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilder.service.js.map +1 -1
- package/dist/cjs/services/cruds/dynamodb/queryBuilderCondition.service.js +6 -5
- package/dist/cjs/services/cruds/dynamodb/queryBuilderCondition.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js +43 -15
- package/dist/cjs/services/cruds/postgresql/postgreSqlClient.service.js.map +1 -1
- package/dist/cjs/services/cruds/postgresql/postgreSqlCrud.service.js +23 -6
- package/dist/cjs/services/cruds/postgresql/postgreSqlCrud.service.js.map +1 -1
- package/dist/types/index.d.ts +15 -7
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@
|
|
|
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
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
5
6
|
function buildFilter(attribute, value, operator = 'EQUAL') {
|
|
6
7
|
return {
|
|
7
8
|
attribute,
|
|
@@ -20,7 +21,7 @@ exports.buildQueryIndex = buildQueryIndex;
|
|
|
20
21
|
function buildSort(column, direction = constants_1.SORT_DIRECTIONS.ASC) {
|
|
21
22
|
return {
|
|
22
23
|
column,
|
|
23
|
-
direction,
|
|
24
|
+
direction: direction,
|
|
24
25
|
};
|
|
25
26
|
}
|
|
26
27
|
exports.buildSort = buildSort;
|
|
@@ -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,YAAoB,2BAAe,CAAC,GAAG;IAEvC,OAAO;QACH,MAAM;QACN,SAAS,EAAE,SAA0B;KACxC,CAAC;AACN,CAAC;AARD,8BAQC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createMultipleResponse.interface.js","sourceRoot":"","sources":["../../../src/interfaces/createMultipleResponse.interface.ts"],"names":[],"mappings":""}
|
|
@@ -26,4 +26,5 @@ __exportStar(require("./sorting.interface"), exports);
|
|
|
26
26
|
__exportStar(require("./tableName.interface"), exports);
|
|
27
27
|
__exportStar(require("./tableColumns.interface"), exports);
|
|
28
28
|
__exportStar(require("./updateOptions.interface"), exports);
|
|
29
|
+
__exportStar(require("./createMultipleResponse.interface"), exports);
|
|
29
30
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
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"}
|
|
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;AAC1C,qEAAmD"}
|
|
@@ -11,14 +11,35 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
11
11
|
return t;
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
14
15
|
const crudHelpers_1 = require("../helpers/crudHelpers");
|
|
15
16
|
const crudFactory_service_1 = require("./crudFactory.service");
|
|
16
17
|
class CrudService {
|
|
17
18
|
constructor(crudSchema) {
|
|
18
19
|
this.crudService = crudFactory_service_1.CrudFactory.databaseClientService(crudSchema);
|
|
20
|
+
this.crudSchema = crudSchema;
|
|
19
21
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
getDefaultValue(columnName) {
|
|
23
|
+
const column = this.crudSchema.columns[columnName];
|
|
24
|
+
return column ? column.default : undefined;
|
|
25
|
+
}
|
|
26
|
+
setDefaultValues(data) {
|
|
27
|
+
const defaultValues = {};
|
|
28
|
+
const columns = this.crudSchema.columns;
|
|
29
|
+
for (const columnName in columns) {
|
|
30
|
+
const missingColumnValue = !(columnName in data);
|
|
31
|
+
const columnDefaultValue = this.getDefaultValue(columnName);
|
|
32
|
+
if (missingColumnValue && columnDefaultValue) {
|
|
33
|
+
defaultValues[columnName] = columnDefaultValue;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return Object.assign(Object.assign({}, defaultValues), data);
|
|
37
|
+
}
|
|
38
|
+
create(data) {
|
|
39
|
+
const processedData = Array.isArray(data)
|
|
40
|
+
? data.map(this.setDefaultValues.bind(this))
|
|
41
|
+
: this.setDefaultValues(data);
|
|
42
|
+
return this.crudService.create(processedData);
|
|
22
43
|
}
|
|
23
44
|
find(options) {
|
|
24
45
|
return this.crudService.find(options);
|
|
@@ -38,9 +59,7 @@ class CrudService {
|
|
|
38
59
|
return this.crudService.findAll(findAllOptions);
|
|
39
60
|
}
|
|
40
61
|
findCount(options) {
|
|
41
|
-
|
|
42
|
-
const { pagination } = options, findAllOptions = __rest(options, ["pagination"]);
|
|
43
|
-
return this.crudService.findCount(findAllOptions);
|
|
62
|
+
return this.crudService.findCount(options);
|
|
44
63
|
}
|
|
45
64
|
buildFilter(attribute, value, operator = 'EQUAL') {
|
|
46
65
|
return (0, crudHelpers_1.buildFilter)(attribute, value, operator);
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"crud.service.js","sourceRoot":"","sources":["../../../src/services/crud.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
3
4
|
const client_dynamodb_1 = require("@aws-sdk/client-dynamodb");
|
|
4
5
|
const lib_dynamodb_1 = require("@aws-sdk/lib-dynamodb");
|
|
5
6
|
const AWS_REGION = process.env.AWS_DEFAULT_REGION;
|
|
@@ -95,6 +96,20 @@ class DynamoDbClientService {
|
|
|
95
96
|
};
|
|
96
97
|
return await this.dynamoDBClient.send(new lib_dynamodb_1.DeleteCommand(params));
|
|
97
98
|
}
|
|
99
|
+
batchWrittenPut(data) {
|
|
100
|
+
const putRequests = data.map((item) => ({
|
|
101
|
+
PutRequest: {
|
|
102
|
+
Item: item,
|
|
103
|
+
},
|
|
104
|
+
}));
|
|
105
|
+
const params = {
|
|
106
|
+
RequestItems: {
|
|
107
|
+
[this.tableName]: putRequests,
|
|
108
|
+
},
|
|
109
|
+
};
|
|
110
|
+
const insertCommand = new lib_dynamodb_1.BatchWriteCommand(params);
|
|
111
|
+
return this.dynamoDBClient.send(insertCommand);
|
|
112
|
+
}
|
|
98
113
|
}
|
|
99
114
|
exports.default = DynamoDbClientService;
|
|
100
115
|
//# sourceMappingURL=dynamoDbClient.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamoDbClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/dynamoDbClient.service.ts"],"names":[],"mappings":";;AAAA,8DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"dynamoDbClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/dynamoDbClient.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,9 +23,18 @@ class DynamoDbCrudService {
|
|
|
23
23
|
get defaultPrimaryKeys() {
|
|
24
24
|
return (0, tableHelper_1.getPrimaryKeyColumns)(this.tableSchema.columns);
|
|
25
25
|
}
|
|
26
|
-
async create(
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
async create(data) {
|
|
27
|
+
var _a;
|
|
28
|
+
if (Array.isArray(data)) {
|
|
29
|
+
const response = await this.dynamoDbClientService.batchWrittenPut(data);
|
|
30
|
+
return {
|
|
31
|
+
unprocessedItems: (_a = response.UnprocessedItems) !== null && _a !== void 0 ? _a : [],
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
await this.dynamoDbClientService.put(data);
|
|
36
|
+
return data;
|
|
37
|
+
}
|
|
29
38
|
}
|
|
30
39
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars, no-unused-vars
|
|
31
40
|
runQuery(queryCommand) {
|
|
@@ -43,6 +52,8 @@ class DynamoDbCrudService {
|
|
|
43
52
|
if (options.fields)
|
|
44
53
|
query.projection(options.fields);
|
|
45
54
|
this.applyFilters(query, options);
|
|
55
|
+
if (options.aggregateFunction === constants_1.AGGREGATE_FUNCTIONS.COUNT)
|
|
56
|
+
query.count();
|
|
46
57
|
return this.fetchResults(query.get(), (_d = options.pagination) === null || _d === void 0 ? void 0 : _d.limit, options.useScan).then((res) => {
|
|
47
58
|
var _a, _b;
|
|
48
59
|
const pagination = {};
|
|
@@ -53,30 +64,42 @@ class DynamoDbCrudService {
|
|
|
53
64
|
return {
|
|
54
65
|
items: res.items,
|
|
55
66
|
pagination,
|
|
56
|
-
count: res.
|
|
67
|
+
count: res.count,
|
|
57
68
|
};
|
|
58
69
|
});
|
|
59
70
|
}
|
|
60
71
|
async fetchResults(command, limit = 100, useScan = false) {
|
|
61
|
-
var _a, _b
|
|
72
|
+
var _a, _b;
|
|
62
73
|
let results = [];
|
|
63
|
-
let
|
|
74
|
+
let lastEvaluatedKey = {};
|
|
75
|
+
let rowsCount = 0;
|
|
64
76
|
do {
|
|
65
|
-
|
|
66
|
-
|
|
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 : [];
|
|
77
|
+
const result = await this.fetchBatch(command, useScan, lastEvaluatedKey);
|
|
78
|
+
const rows = (_a = result.Items) !== null && _a !== void 0 ? _a : [];
|
|
72
79
|
results = results.concat(rows);
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
? this.encryptPaginationKey(
|
|
80
|
+
lastEvaluatedKey = (_b = result.LastEvaluatedKey) !== null && _b !== void 0 ? _b : {};
|
|
81
|
+
rowsCount += result.Count || rows.length;
|
|
82
|
+
} while (rowsCount < limit && this.isNotEmptyObject(lastEvaluatedKey));
|
|
83
|
+
const encryptedLastEvaluatedKey = this.isNotEmptyObject(lastEvaluatedKey)
|
|
84
|
+
? this.encryptPaginationKey(lastEvaluatedKey)
|
|
78
85
|
: null;
|
|
79
|
-
return {
|
|
86
|
+
return {
|
|
87
|
+
items: results,
|
|
88
|
+
lastEvaluatedKey: encryptedLastEvaluatedKey,
|
|
89
|
+
count: rowsCount,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
async fetchBatch(command, useScan, lastEvaluatedKey) {
|
|
93
|
+
var _a, _b, _c;
|
|
94
|
+
if (this.isNotEmptyObject(lastEvaluatedKey))
|
|
95
|
+
command.ExclusiveStartKey = lastEvaluatedKey;
|
|
96
|
+
const result = await (useScan
|
|
97
|
+
? this.dynamoDbClientService.scan(command)
|
|
98
|
+
: this.dynamoDbClientService.query(command));
|
|
99
|
+
if (command.Select !== constants_1.AGGREGATE_FUNCTIONS.COUNT) {
|
|
100
|
+
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);
|
|
101
|
+
}
|
|
102
|
+
return result;
|
|
80
103
|
}
|
|
81
104
|
applyPagination(query, pagination) {
|
|
82
105
|
if (pagination === null || pagination === void 0 ? void 0 : pagination.limit)
|
|
@@ -84,38 +107,48 @@ class DynamoDbCrudService {
|
|
|
84
107
|
if (pagination === null || pagination === void 0 ? void 0 : pagination.from)
|
|
85
108
|
query.startKey(this.decryptPaginationKey(pagination.from));
|
|
86
109
|
}
|
|
87
|
-
async findAll(options = {}, allResults = []) {
|
|
88
|
-
const { items, pagination } = await this.find(options);
|
|
110
|
+
async findAll(options = {}, allResults = [], rowsCount = 0) {
|
|
111
|
+
const { items, pagination, count } = await this.find(options);
|
|
89
112
|
allResults.push(...items);
|
|
113
|
+
rowsCount += count;
|
|
90
114
|
if (pagination === null || pagination === void 0 ? void 0 : pagination.from)
|
|
91
115
|
await this.findAll(Object.assign(Object.assign({}, options), { pagination }), allResults);
|
|
92
116
|
return {
|
|
93
117
|
items: allResults,
|
|
94
118
|
pagination: null,
|
|
95
|
-
count:
|
|
119
|
+
count: rowsCount,
|
|
96
120
|
};
|
|
97
121
|
}
|
|
98
122
|
async findCount(options = {}) {
|
|
99
|
-
|
|
100
|
-
|
|
123
|
+
var _a;
|
|
124
|
+
const findOptions = Object.assign(Object.assign({}, options), { aggregateFunction: constants_1.AGGREGATE_FUNCTIONS.COUNT });
|
|
125
|
+
if ((_a = options.pagination) === null || _a === void 0 ? void 0 : _a.from) {
|
|
126
|
+
return this.find(findOptions).then((res) => res.count);
|
|
127
|
+
}
|
|
128
|
+
else {
|
|
129
|
+
return this.findAll(findOptions).then((res) => res.count);
|
|
130
|
+
}
|
|
101
131
|
}
|
|
102
|
-
|
|
103
|
-
var _a
|
|
132
|
+
buildFindItemQuery(options) {
|
|
133
|
+
var _a;
|
|
104
134
|
const query = new queryBuilder_service_1.default();
|
|
105
135
|
if ((_a = options.index) === null || _a === void 0 ? void 0 : _a.indexName)
|
|
106
|
-
query.usingIndex(
|
|
136
|
+
query.usingIndex(options.index.indexName);
|
|
107
137
|
this.applyFilters(query, options);
|
|
108
|
-
|
|
109
|
-
query.projection(options.fields);
|
|
138
|
+
query.projection(options.fields);
|
|
110
139
|
query.limit(1);
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
140
|
+
return query;
|
|
141
|
+
}
|
|
142
|
+
findItem(options) {
|
|
143
|
+
const query = this.buildFindItemQuery(options);
|
|
144
|
+
return this.dynamoDbClientService.query(query.get()).then((result) => {
|
|
145
|
+
var _a;
|
|
146
|
+
if ((_a = result.Items) === null || _a === void 0 ? void 0 : _a.length)
|
|
147
|
+
return result.Items[0];
|
|
148
|
+
if (options.throwErrorIfNull)
|
|
149
|
+
throw new Error('NOT_FOUND');
|
|
150
|
+
return null;
|
|
151
|
+
});
|
|
119
152
|
}
|
|
120
153
|
applyWhereFilter(query, filter) {
|
|
121
154
|
var _a, _b;
|
|
@@ -136,8 +169,8 @@ class DynamoDbCrudService {
|
|
|
136
169
|
}
|
|
137
170
|
}
|
|
138
171
|
applySimpleFilters(query, options) {
|
|
139
|
-
var _a;
|
|
140
|
-
const queryIndexColumns = ((_a = options.index) === null || _a === void 0 ? void 0 : _a.columns)
|
|
172
|
+
var _a, _b;
|
|
173
|
+
const queryIndexColumns = (_b = (_a = options.index) === null || _a === void 0 ? void 0 : _a.columns) !== null && _b !== void 0 ? _b : [];
|
|
141
174
|
const defaultWhereProperties = this.defaultPrimaryKeys;
|
|
142
175
|
const whereProperties = (queryIndexColumns === null || queryIndexColumns === void 0 ? void 0 : queryIndexColumns.length)
|
|
143
176
|
? queryIndexColumns
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamoDbCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/dynamoDbCrud.service.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,sFAA6D;AAC7D,kFAAyD;AAEzD,
|
|
1
|
+
{"version":3,"file":"dynamoDbCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/dynamoDbCrud.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const queryBuilderCondition_service_1 = __importDefault(require("./queryBuilderCondition.service"));
|
|
7
7
|
const queryHelpers_1 = require("../../../helpers/queryHelpers");
|
|
8
|
+
const constants_1 = require("../../../utils/constants");
|
|
8
9
|
class QueryBuilderService {
|
|
9
10
|
constructor(useScan = false) {
|
|
10
11
|
this.useScan = useScan;
|
|
@@ -38,7 +39,9 @@ class QueryBuilderService {
|
|
|
38
39
|
this.command.ExclusiveStartKey = lastEvaluatedKey;
|
|
39
40
|
return this;
|
|
40
41
|
}
|
|
41
|
-
projection(fields) {
|
|
42
|
+
projection(fields = []) {
|
|
43
|
+
if (!fields.length)
|
|
44
|
+
return this;
|
|
42
45
|
const expression = [];
|
|
43
46
|
fields.forEach((field) => {
|
|
44
47
|
const key = this.condition.project(field);
|
|
@@ -72,6 +75,10 @@ class QueryBuilderService {
|
|
|
72
75
|
this.command.ConsistentRead = consistentRead;
|
|
73
76
|
return this;
|
|
74
77
|
}
|
|
78
|
+
count() {
|
|
79
|
+
this.command.Select = constants_1.AGGREGATE_FUNCTIONS.COUNT;
|
|
80
|
+
return this;
|
|
81
|
+
}
|
|
75
82
|
}
|
|
76
83
|
exports.default = QueryBuilderService;
|
|
77
84
|
//# sourceMappingURL=queryBuilder.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryBuilder.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilder.service.ts"],"names":[],"mappings":";;;;;AAEA,oGAA2E;AAC3E,gEAAgE;
|
|
1
|
+
{"version":3,"file":"queryBuilder.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/dynamodb/queryBuilder.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -117,7 +117,7 @@ class QueryBuilderConditionService {
|
|
|
117
117
|
return this.query;
|
|
118
118
|
}
|
|
119
119
|
attribute_exists(keyValue) {
|
|
120
|
-
const { key } = this.generateKeyValue(keyValue);
|
|
120
|
+
const { key } = this.generateKeyValue(keyValue, null, true);
|
|
121
121
|
let expression = `attribute_exists(${key})`;
|
|
122
122
|
if (this.tempLogicOperator)
|
|
123
123
|
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
@@ -125,7 +125,7 @@ class QueryBuilderConditionService {
|
|
|
125
125
|
return this.query;
|
|
126
126
|
}
|
|
127
127
|
attribute_not_exists(keyValue) {
|
|
128
|
-
const { key } = this.generateKeyValue(keyValue);
|
|
128
|
+
const { key } = this.generateKeyValue(keyValue, null, true);
|
|
129
129
|
let expression = `attribute_not_exists(${key})`;
|
|
130
130
|
if (this.tempLogicOperator)
|
|
131
131
|
expression = { expression, logicOperator: this.tempLogicOperator };
|
|
@@ -156,7 +156,7 @@ class QueryBuilderConditionService {
|
|
|
156
156
|
break;
|
|
157
157
|
}
|
|
158
158
|
}
|
|
159
|
-
generateKeyValue(value, separatorCharacter = ',') {
|
|
159
|
+
generateKeyValue(value, separatorCharacter = ',', omitAttributeValues = false) {
|
|
160
160
|
const keyExpression = `#${this.tempKey}1`;
|
|
161
161
|
this.attributeNames[keyExpression] = this.tempKey;
|
|
162
162
|
if (Array.isArray(value)) {
|
|
@@ -176,13 +176,14 @@ class QueryBuilderConditionService {
|
|
|
176
176
|
}
|
|
177
177
|
else {
|
|
178
178
|
let valueExpression = `:${this.tempKey}1`;
|
|
179
|
-
if (this.attributeValues
|
|
179
|
+
if (valueExpression in this.attributeValues) {
|
|
180
180
|
for (const [index] of Object.entries(this.attributeValues)) {
|
|
181
181
|
if (index === valueExpression)
|
|
182
182
|
valueExpression += '1';
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
|
-
|
|
185
|
+
if (!omitAttributeValues)
|
|
186
|
+
this.attributeValues[valueExpression] = value;
|
|
186
187
|
return { key: keyExpression, value: valueExpression };
|
|
187
188
|
}
|
|
188
189
|
}
|
|
@@ -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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"}
|
|
@@ -62,17 +62,33 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
62
62
|
});
|
|
63
63
|
return filterClauses.join(` ${logicOperator !== null && logicOperator !== void 0 ? logicOperator : constants_1.FILTER_LOGIC_OPERATORS.AND} `);
|
|
64
64
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
65
|
+
else {
|
|
66
|
+
return this.buildQueryByClause(filters);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
buildQueryByClause(filters) {
|
|
70
|
+
let filterClauses = '';
|
|
71
|
+
let isFirstFilter = true;
|
|
72
|
+
for (const [key, value] of Object.entries(filters)) {
|
|
73
|
+
if (!isFirstFilter) {
|
|
74
|
+
filterClauses += key === 'AND' ? ' AND ' : ' OR ';
|
|
75
|
+
}
|
|
76
|
+
const isCompositeFilter = 'OR' in value || 'AND' in value;
|
|
77
|
+
if (isCompositeFilter) {
|
|
78
|
+
filterClauses += '(';
|
|
79
|
+
filterClauses += this.buildQueryByClause(value);
|
|
80
|
+
filterClauses += ')';
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
value.forEach((filter) => {
|
|
84
|
+
const clause = this.buildClause(filter.operator, filter.attribute, filter.value);
|
|
85
|
+
filterClauses += `${clause} ${key} `;
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
isFirstFilter = false;
|
|
89
|
+
}
|
|
90
|
+
filterClauses = filterClauses.replace(/\s+(AND|OR)\s*$/, '');
|
|
91
|
+
return filterClauses;
|
|
76
92
|
}
|
|
77
93
|
formatOrderByItem(sort) {
|
|
78
94
|
return `${pg_format_1.default.ident(sort.column)} ${sort.direction || constants_1.SORT_DIRECTIONS.ASC}`;
|
|
@@ -86,9 +102,9 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
86
102
|
}
|
|
87
103
|
}
|
|
88
104
|
async createCommand(data) {
|
|
89
|
-
const keys = Object.keys(data);
|
|
90
|
-
const values = Object.values(
|
|
91
|
-
const query = (0, pg_format_1.default)(`INSERT INTO ${pg_format_1.default.ident(this.dbSchema)}.${pg_format_1.default.ident(this.tableName)} (%I) VALUES
|
|
105
|
+
const keys = Object.keys(data[0]); // Assuming all objects have the same keys
|
|
106
|
+
const values = data.map((item) => Object.values(item));
|
|
107
|
+
const query = (0, pg_format_1.default)(`INSERT INTO ${pg_format_1.default.ident(this.dbSchema)}.${pg_format_1.default.ident(this.tableName)} (%I) VALUES %L RETURNING *;`, keys, values);
|
|
92
108
|
return this.runQuery(query);
|
|
93
109
|
}
|
|
94
110
|
addFiltersToQuery(query, filters) {
|
|
@@ -116,7 +132,19 @@ class PostgresqlClientService extends query_service_1.default {
|
|
|
116
132
|
return `CAST(${aggregateFunction}(1) AS INTEGER) AS "${(0, queryHelpers_1.buildAggFunctionAlias)(aggregateFunction)}"`;
|
|
117
133
|
if (!(fields === null || fields === void 0 ? void 0 : fields.length))
|
|
118
134
|
return '*';
|
|
119
|
-
return fields.join(', ');
|
|
135
|
+
return this.parseFields(fields).join(', ');
|
|
136
|
+
}
|
|
137
|
+
parseFields(fields) {
|
|
138
|
+
const columnsFromSchema = Object.keys(this.crudSchema.columns);
|
|
139
|
+
const attributes = fields
|
|
140
|
+
.filter((field) => columnsFromSchema.indexOf(field) !== -1)
|
|
141
|
+
.map((field) => `"${field}"`);
|
|
142
|
+
fields
|
|
143
|
+
.filter((field) => columnsFromSchema.indexOf(field) === -1)
|
|
144
|
+
.forEach((field) => {
|
|
145
|
+
attributes.push(`"qvAttributes" ->> '${field}' as "${field}"`);
|
|
146
|
+
});
|
|
147
|
+
return attributes;
|
|
120
148
|
}
|
|
121
149
|
async findCommand(options = {}) {
|
|
122
150
|
let query = `SELECT ${this.getSelectClause(options.aggregateFunction, options.fields)} FROM ${pg_format_1.default.ident(this.dbSchema)}.${pg_format_1.default.ident(this.tableName)}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgreSqlClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlClient.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"postgreSqlClient.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlClient.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,13 +17,16 @@ class PostgreSqlCrudService extends postgreSqlClient_service_1.default {
|
|
|
17
17
|
get idColumnName() {
|
|
18
18
|
return (0, tableHelper_1.findIdColumnName)(this.tableSchema.columns);
|
|
19
19
|
}
|
|
20
|
-
|
|
20
|
+
normalizeInputData(inputData) {
|
|
21
21
|
inputData.qvAttributes = {};
|
|
22
22
|
for (const key in inputData) {
|
|
23
23
|
if (!this.tableSchema.columns[key] && key !== 'qvAttributes') {
|
|
24
24
|
inputData.qvAttributes[key] = inputData[key];
|
|
25
25
|
delete inputData[key];
|
|
26
26
|
}
|
|
27
|
+
else if (Array.isArray(inputData[key])) {
|
|
28
|
+
inputData[key] = JSON.stringify(inputData[key]);
|
|
29
|
+
}
|
|
27
30
|
}
|
|
28
31
|
}
|
|
29
32
|
getItem(data) {
|
|
@@ -31,10 +34,24 @@ class PostgreSqlCrudService extends postgreSqlClient_service_1.default {
|
|
|
31
34
|
delete resultItem['qvAttributes'];
|
|
32
35
|
return resultItem;
|
|
33
36
|
}
|
|
34
|
-
|
|
35
|
-
const inputData = Object.assign({},
|
|
36
|
-
this.
|
|
37
|
-
return
|
|
37
|
+
prepareData(data) {
|
|
38
|
+
const inputData = Object.assign({}, data);
|
|
39
|
+
this.normalizeInputData(inputData);
|
|
40
|
+
return inputData;
|
|
41
|
+
}
|
|
42
|
+
create(data) {
|
|
43
|
+
if (Array.isArray(data)) {
|
|
44
|
+
const inputDataArray = data.map((item) => this.prepareData(item));
|
|
45
|
+
return this.createCommand(inputDataArray).then((result) => ({
|
|
46
|
+
unprocessedItems: result
|
|
47
|
+
.filter((r) => !r.success)
|
|
48
|
+
.map((r) => r.inputData),
|
|
49
|
+
}));
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
const inputData = this.prepareData(data);
|
|
53
|
+
return this.createCommand([inputData]).then((result) => result.rowCount ? this.getItem(result.rows[0]) : null);
|
|
54
|
+
}
|
|
38
55
|
}
|
|
39
56
|
findItem(findOptions) {
|
|
40
57
|
return this.findCommand(findOptions).then((data) => {
|
|
@@ -69,7 +86,7 @@ class PostgreSqlCrudService extends postgreSqlClient_service_1.default {
|
|
|
69
86
|
async update(filters, data) {
|
|
70
87
|
const savedRecord = await this.findItem({ filters });
|
|
71
88
|
const inputData = Object.assign(Object.assign({}, savedRecord), data);
|
|
72
|
-
this.
|
|
89
|
+
this.normalizeInputData(inputData);
|
|
73
90
|
await this.updateCommand(filters, inputData);
|
|
74
91
|
return this.getItem(inputData);
|
|
75
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgreSqlCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlCrud.service.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,0FAAiE;
|
|
1
|
+
{"version":3,"file":"postgreSqlCrud.service.js","sourceRoot":"","sources":["../../../../../src/services/cruds/postgresql/postgreSqlCrud.service.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -9,6 +9,10 @@ interface ICompositeFilter {
|
|
|
9
9
|
OR?: (IFilter | ICompositeFilter)[];
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
+
interface ICreateMultipleResponse {
|
|
13
|
+
unprocessedItems: Record<string, any>;
|
|
14
|
+
}
|
|
15
|
+
|
|
12
16
|
type FilterInput = string | IFilter[] | ICompositeFilter[] | ICompositeFilter;
|
|
13
17
|
|
|
14
18
|
declare enum SORT_DIRECTIONS {
|
|
@@ -61,7 +65,7 @@ interface IUpdateOptions {
|
|
|
61
65
|
}
|
|
62
66
|
|
|
63
67
|
interface ICrudService<T> {
|
|
64
|
-
create(
|
|
68
|
+
create(data: T | T[]): Promise<T | ICreateMultipleResponse>;
|
|
65
69
|
findItem(options?: IFindOptions): Promise<T | null>;
|
|
66
70
|
find(options?: IFindOptions): Promise<IFindResult<T>>;
|
|
67
71
|
findAll(options?: IFindOptions): Promise<IFindResult<T>>;
|
|
@@ -81,6 +85,7 @@ interface ITableColumns {
|
|
|
81
85
|
type: string;
|
|
82
86
|
primary?: boolean;
|
|
83
87
|
columnId?: boolean;
|
|
88
|
+
default?: any;
|
|
84
89
|
};
|
|
85
90
|
}
|
|
86
91
|
|
|
@@ -93,8 +98,11 @@ declare class CrudSchema {
|
|
|
93
98
|
|
|
94
99
|
declare class CrudService<T> {
|
|
95
100
|
private crudService;
|
|
101
|
+
private crudSchema;
|
|
96
102
|
constructor(crudSchema: typeof CrudSchema);
|
|
97
|
-
|
|
103
|
+
private getDefaultValue;
|
|
104
|
+
private setDefaultValues;
|
|
105
|
+
create(data: T | T[]): Promise<T | ICreateMultipleResponse>;
|
|
98
106
|
find(options: IFindOptions): Promise<IFindResult<T>>;
|
|
99
107
|
findItem(options: IFindOptions): Promise<T | null>;
|
|
100
108
|
update(filters: IFilter[] | ICompositeFilter, data: Partial<T>): Promise<T | null>;
|
|
@@ -104,24 +112,24 @@ declare class CrudService<T> {
|
|
|
104
112
|
buildFilter(attribute: string, value: string, operator?: string): {
|
|
105
113
|
attribute: string;
|
|
106
114
|
operator: string;
|
|
107
|
-
value:
|
|
115
|
+
value: any;
|
|
108
116
|
};
|
|
109
117
|
buildQueryIndex(indexName: string, columns: string[]): {
|
|
110
118
|
indexName: string;
|
|
111
119
|
columns: string[];
|
|
112
120
|
};
|
|
113
|
-
buildSort(column: string, direction:
|
|
121
|
+
buildSort(column: string, direction: string): ISorting;
|
|
114
122
|
}
|
|
115
123
|
|
|
116
|
-
declare function buildFilter(attribute: string, value:
|
|
124
|
+
declare function buildFilter(attribute: string, value: any, operator?: string): {
|
|
117
125
|
attribute: string;
|
|
118
126
|
operator: string;
|
|
119
|
-
value:
|
|
127
|
+
value: any;
|
|
120
128
|
};
|
|
121
129
|
declare function buildQueryIndex(indexName: string, columns: string[]): {
|
|
122
130
|
indexName: string;
|
|
123
131
|
columns: string[];
|
|
124
132
|
};
|
|
125
|
-
declare function buildSort(column: string, direction?:
|
|
133
|
+
declare function buildSort(column: string, direction?: string): ISorting;
|
|
126
134
|
|
|
127
135
|
export { AggregateFunction, CrudSchema, CrudService, FilterInput, ICrudService, IFilter, IFindOptions, IFindPagination, ISorting, SortDirection, buildFilter, buildQueryIndex, buildSort };
|