drapcode-utility 1.2.2 → 1.2.3
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/build/encryption/KMS.js +1 -1
- package/build/encryption/crypt.js +2 -2
- package/build/encryption/file.js +4 -4
- package/build/encryption/index.js +14 -14
- package/build/encryption/model.d.ts +2 -2
- package/build/index.js +5 -1
- package/build/middlewares/error-logger.js +6 -6
- package/build/middlewares/interceptor-logger-new.js +6 -6
- package/build/middlewares/interceptor-logger.js +3 -3
- package/build/middlewares/redis/request-log.js +4 -4
- package/build/utils/check-error.js +12 -8
- package/build/utils/date-util.js +3 -3
- package/build/utils/query-parser.js +58 -54
- package/build/utils/query-paser-new.js +53 -49
- package/build/utils/s3-util.js +22 -19
- package/build/utils/util.d.ts +1 -1
- package/build/utils/util.js +26 -22
- package/build/utils/uuid-generator.js +2 -2
- package/package.json +3 -3
|
@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
14
14
|
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
15
|
function step(op) {
|
|
16
16
|
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
18
|
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
19
|
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
20
|
switch (op[0]) {
|
|
@@ -35,10 +35,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
35
35
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
36
|
}
|
|
37
37
|
};
|
|
38
|
-
var __spreadArray = (this && this.__spreadArray) || function (to, from) {
|
|
39
|
-
for (var i = 0,
|
|
40
|
-
|
|
41
|
-
|
|
38
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
39
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
40
|
+
if (ar || !(i in from)) {
|
|
41
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
42
|
+
ar[i] = from[i];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
42
46
|
};
|
|
43
47
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
44
48
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
@@ -85,7 +89,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
|
|
|
85
89
|
searchQueryObj = null;
|
|
86
90
|
if (searchObj) {
|
|
87
91
|
_a = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _a.searchAggregateQuery, likeQuery = _a.likeQuery;
|
|
88
|
-
aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
|
|
92
|
+
aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
|
|
89
93
|
console.log("likeQuery after getSearchObjQuery", JSON.stringify(likeQuery));
|
|
90
94
|
if (likeQuery && likeQuery.length > 0) {
|
|
91
95
|
searchQueryObj = likeQuery;
|
|
@@ -103,7 +107,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
|
|
|
103
107
|
else if (searchObj) {
|
|
104
108
|
console.log("I donot have filter query");
|
|
105
109
|
_b = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _b.searchAggregateQuery, likeQuery = _b.likeQuery;
|
|
106
|
-
aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
|
|
110
|
+
aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery, true), searchAggregateQuery, true);
|
|
107
111
|
if (likeQuery.length) {
|
|
108
112
|
// aggregateQuery.push({ $match: { $or: likeQuery } });
|
|
109
113
|
aggregateQuery.push({ $match: { $and: likeQuery } });
|
|
@@ -124,7 +128,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
|
|
|
124
128
|
if (field.type === "belongsTo") {
|
|
125
129
|
aggregateQuery.push({
|
|
126
130
|
$lookup: {
|
|
127
|
-
from: ""
|
|
131
|
+
from: "".concat(collectionName_1),
|
|
128
132
|
localField: field.fieldName,
|
|
129
133
|
foreignField: "uuid",
|
|
130
134
|
as: field.fieldName,
|
|
@@ -139,8 +143,8 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
|
|
|
139
143
|
else {
|
|
140
144
|
aggregateQuery.push({
|
|
141
145
|
$lookup: {
|
|
142
|
-
from: ""
|
|
143
|
-
let: (_b = {}, _b[""
|
|
146
|
+
from: "".concat(collectionName_1),
|
|
147
|
+
let: (_b = {}, _b["".concat(field.fieldName)] = "$".concat(field.fieldName), _b),
|
|
144
148
|
pipeline: [
|
|
145
149
|
{
|
|
146
150
|
$match: {
|
|
@@ -150,10 +154,10 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
|
|
|
150
154
|
{
|
|
151
155
|
$cond: {
|
|
152
156
|
if: {
|
|
153
|
-
$in: ["$$"
|
|
157
|
+
$in: ["$$".concat(field.fieldName), ["", null]],
|
|
154
158
|
},
|
|
155
159
|
then: [],
|
|
156
|
-
else: { $ifNull: ["$$"
|
|
160
|
+
else: { $ifNull: ["$$".concat(field.fieldName), []] },
|
|
157
161
|
},
|
|
158
162
|
},
|
|
159
163
|
],
|
|
@@ -186,10 +190,10 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
|
|
|
186
190
|
aggregateQuery.push({
|
|
187
191
|
$lookup: {
|
|
188
192
|
from: "user",
|
|
189
|
-
let: (_c = {}, _c[""
|
|
193
|
+
let: (_c = {}, _c["".concat(field.fieldName)] = "$".concat(field.fieldName), _c),
|
|
190
194
|
pipeline: [
|
|
191
195
|
{
|
|
192
|
-
$match: { $expr: { $eq: ["$uuid", "$$"
|
|
196
|
+
$match: { $expr: { $eq: ["$uuid", "$$".concat(field.fieldName)] } },
|
|
193
197
|
},
|
|
194
198
|
{ $project: { _id: 0, password: 0 } },
|
|
195
199
|
],
|
|
@@ -201,7 +205,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
|
|
|
201
205
|
_e.sent();
|
|
202
206
|
_e.label = 2;
|
|
203
207
|
case 2:
|
|
204
|
-
if (finder != "COUNT" && !util_1.isEmpty(projection)) {
|
|
208
|
+
if (finder != "COUNT" && !(0, util_1.isEmpty)(projection)) {
|
|
205
209
|
aggregateQuery.push({ $project: projection });
|
|
206
210
|
}
|
|
207
211
|
if (finder === "COUNT") {
|
|
@@ -222,8 +226,8 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
|
|
|
222
226
|
}
|
|
223
227
|
console.log("==> aggregateQuery", aggregateQuery);
|
|
224
228
|
console.log("==> aggregateQuery", JSON.stringify(aggregateQuery));
|
|
225
|
-
queryStr = ".aggregate("
|
|
226
|
-
str = "req.db.collection('"
|
|
229
|
+
queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" } })");
|
|
230
|
+
str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
|
|
227
231
|
str += ".toArray()";
|
|
228
232
|
return [2 /*return*/, str];
|
|
229
233
|
}
|
|
@@ -263,7 +267,7 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
|
|
|
263
267
|
filterQuery[lastKey].push(mongoQuery);
|
|
264
268
|
}
|
|
265
269
|
else {
|
|
266
|
-
filterQuery["$or"
|
|
270
|
+
filterQuery["$or".concat(index)] = [mongoQuery];
|
|
267
271
|
}
|
|
268
272
|
}
|
|
269
273
|
else if (queryObj.conjunctionType == "AND") {
|
|
@@ -272,11 +276,11 @@ var mongoFilterQuery = function (query, externalParams, constants, currentUser,
|
|
|
272
276
|
filterQuery[lastKey].push(mongoQuery);
|
|
273
277
|
}
|
|
274
278
|
else {
|
|
275
|
-
filterQuery["$and"
|
|
279
|
+
filterQuery["$and".concat(index)] = [mongoQuery];
|
|
276
280
|
}
|
|
277
281
|
}
|
|
278
282
|
else {
|
|
279
|
-
filterQuery["$or"
|
|
283
|
+
filterQuery["$or".concat(index)] = [mongoQuery];
|
|
280
284
|
}
|
|
281
285
|
});
|
|
282
286
|
console.log("==> *** filterQuery mongoFilterQuery :>> ", filterQuery);
|
|
@@ -295,15 +299,15 @@ var mongoSelectQuery = function (query) {
|
|
|
295
299
|
if (fieldsInclude[0] === "*") {
|
|
296
300
|
fieldsExclude.map(function (field) {
|
|
297
301
|
if (field)
|
|
298
|
-
return (projection[""
|
|
302
|
+
return (projection["".concat(field)] = 0);
|
|
299
303
|
});
|
|
300
304
|
}
|
|
301
305
|
else {
|
|
302
306
|
if (["FIND_ALL", "FIND"].includes(finder))
|
|
303
|
-
fieldsInclude = util_1.processFieldsInlcude(fieldsInclude);
|
|
307
|
+
fieldsInclude = (0, util_1.processFieldsInlcude)(fieldsInclude);
|
|
304
308
|
fieldsInclude.map(function (field) {
|
|
305
309
|
if (field)
|
|
306
|
-
return (projection[""
|
|
310
|
+
return (projection["".concat(field)] = 1);
|
|
307
311
|
});
|
|
308
312
|
}
|
|
309
313
|
return projection;
|
|
@@ -335,7 +339,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
|
|
|
335
339
|
//TODO: In case of this, we assign some random string to avoid resulting all values
|
|
336
340
|
//TODO: This is use case in Spot Factor Project, where a new user with blank value able to see all records
|
|
337
341
|
//TODO: Discussed on meet
|
|
338
|
-
fieldValue = "random_string_since_field_not_present_"
|
|
342
|
+
fieldValue = "random_string_since_field_not_present_".concat((0, moment_1.default)(1318874398806).valueOf());
|
|
339
343
|
}
|
|
340
344
|
console.log("fieldValue queryToMongo 1", fieldValue);
|
|
341
345
|
var isDate = checkDate(fieldValue);
|
|
@@ -403,7 +407,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
|
|
|
403
407
|
return _q = {},
|
|
404
408
|
_q[field] = {
|
|
405
409
|
$gte: fieldValue,
|
|
406
|
-
$lt: date_util_1.nextDayDate(fieldValue),
|
|
410
|
+
$lt: (0, date_util_1.nextDayDate)(fieldValue),
|
|
407
411
|
},
|
|
408
412
|
_q;
|
|
409
413
|
// Todo: Remove this if works properly
|
|
@@ -459,7 +463,7 @@ var queryToMongo = function (query, requiredExternal, externalParams, constants,
|
|
|
459
463
|
},
|
|
460
464
|
_y;
|
|
461
465
|
if (key == drapcode_constant_1.BETWEEN) {
|
|
462
|
-
var _0 = exports.getMinMaxValue(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
|
|
466
|
+
var _0 = (0, exports.getMinMaxValue)(fieldValue), startValue = _0.startValue, endValue = _0.endValue, isInteger = _0.isInteger;
|
|
463
467
|
return _z = {},
|
|
464
468
|
_z[field] = {
|
|
465
469
|
$gte: isInteger ? +startValue : startValue,
|
|
@@ -509,13 +513,13 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
|
|
|
509
513
|
return valueList_1;
|
|
510
514
|
}
|
|
511
515
|
if (key === drapcode_constant_1.BETWEEN) {
|
|
512
|
-
var _a = exports.getMinMaxValue(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
|
|
516
|
+
var _a = (0, exports.getMinMaxValue)(value), startValue_1 = _a.startValue, endValue_1 = _a.endValue, isInteger = _a.isInteger;
|
|
513
517
|
if (requiredExternal) {
|
|
514
|
-
startValue_1 = ""
|
|
515
|
-
endValue_1 = ""
|
|
518
|
+
startValue_1 = "".concat(externalParams[startValue_1]);
|
|
519
|
+
endValue_1 = "".concat(externalParams[endValue_1]);
|
|
516
520
|
}
|
|
517
521
|
else {
|
|
518
|
-
if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) {
|
|
522
|
+
if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) {
|
|
519
523
|
return startValue_1.includes(cnst);
|
|
520
524
|
})) {
|
|
521
525
|
startValue_1 = getValueOfProjectConstant(startValue_1, currentUser, timezone);
|
|
@@ -523,7 +527,7 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
|
|
|
523
527
|
else {
|
|
524
528
|
startValue_1 = constants.filter(function (constant) { return constant.name == startValue_1; });
|
|
525
529
|
}
|
|
526
|
-
if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant).some(function (cnst) { return endValue_1.includes(cnst); })) {
|
|
530
|
+
if (__spreadArray([drapcode_constant_1.CURRENT_USER], drapcode_constant_1.DateConstant, true).some(function (cnst) { return endValue_1.includes(cnst); })) {
|
|
527
531
|
endValue_1 = getValueOfProjectConstant(endValue_1, currentUser, timezone);
|
|
528
532
|
}
|
|
529
533
|
else {
|
|
@@ -539,10 +543,10 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
|
|
|
539
543
|
}
|
|
540
544
|
//TODO: Need to figure out the params should be treated as number/string
|
|
541
545
|
if (!isNaN(startValue_1)) {
|
|
542
|
-
return startValue_1
|
|
546
|
+
return "".concat(startValue_1, "---").concat(endValue_1, "^");
|
|
543
547
|
}
|
|
544
548
|
else
|
|
545
|
-
return startValue_1
|
|
549
|
+
return "".concat(startValue_1, "---").concat(endValue_1);
|
|
546
550
|
}
|
|
547
551
|
console.log("==> value", value);
|
|
548
552
|
console.log("==> currentUser", currentUser);
|
|
@@ -638,18 +642,18 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
|
|
|
638
642
|
if (drapcode_constant_1.DateConstant.some(function (cnst) { return value.includes(cnst); })) {
|
|
639
643
|
return getValueOfProjectConstant(value, {}, timezone);
|
|
640
644
|
}
|
|
641
|
-
if (exports.isEntityInCondition(value)) {
|
|
645
|
+
if ((0, exports.isEntityInCondition)(value)) {
|
|
642
646
|
var key_1 = value.replace("ENTITY::", "");
|
|
643
647
|
return externalParams[key_1] ? externalParams[key_1] : "";
|
|
644
648
|
}
|
|
645
649
|
//TODO: This is just to confirm if external then it should be get from externalParams
|
|
646
650
|
if (requiredExternal) {
|
|
647
651
|
//TODO: Value returns from here undefined.
|
|
648
|
-
var externalParamValue = externalParams[""
|
|
652
|
+
var externalParamValue = externalParams["".concat(value)];
|
|
649
653
|
if (!isNaN(externalParamValue)) {
|
|
650
654
|
return +externalParamValue;
|
|
651
655
|
}
|
|
652
|
-
return externalParams[""
|
|
656
|
+
return externalParams["".concat(value)];
|
|
653
657
|
}
|
|
654
658
|
var constantArr = constants.filter(function (constant) { return constant.name == value; });
|
|
655
659
|
return constantArr.length ? "" + constantArr[0].value : "";
|
|
@@ -680,11 +684,11 @@ var getValueOfProjectConstant = function (value, currentUser, timezone) {
|
|
|
680
684
|
if (value === drapcode_constant_1.CURRENT_USER)
|
|
681
685
|
return currentUser["uuid"];
|
|
682
686
|
if (value === drapcode_constant_1.CURRENT_DATE)
|
|
683
|
-
result = date_util_1.createLoggerDateFormat(timezone);
|
|
687
|
+
result = (0, date_util_1.createLoggerDateFormat)(timezone);
|
|
684
688
|
if ([drapcode_constant_1.CURRENT_TIME, drapcode_constant_1.CURRENT_DATE_TIME].includes(value))
|
|
685
|
-
result = date_util_1.createLogsDateFormat(timezone);
|
|
689
|
+
result = (0, date_util_1.createLogsDateFormat)(timezone);
|
|
686
690
|
if (drapcode_constant_1.DateTimeUnit.some(function (cnst) { return value.includes(cnst); }))
|
|
687
|
-
result = date_util_1.getDateValue(value, timezone);
|
|
691
|
+
result = (0, date_util_1.getDateValue)(value, timezone);
|
|
688
692
|
return result;
|
|
689
693
|
};
|
|
690
694
|
var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
|
|
@@ -700,11 +704,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
|
|
|
700
704
|
// if input is string and db field type is boolean
|
|
701
705
|
searchAggregateQuery.push({
|
|
702
706
|
$addFields: (_b = {},
|
|
703
|
-
_b["_"
|
|
707
|
+
_b["_".concat(key)] = "$".concat(key),
|
|
704
708
|
_b),
|
|
705
709
|
});
|
|
706
710
|
likeQuery.push((_c = {},
|
|
707
|
-
_c["_"
|
|
711
|
+
_c["_".concat(key)] = toBoolean(value),
|
|
708
712
|
_c));
|
|
709
713
|
}
|
|
710
714
|
else if ([
|
|
@@ -716,22 +720,22 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
|
|
|
716
720
|
// if input is string and db field type is array
|
|
717
721
|
searchAggregateQuery.push({
|
|
718
722
|
$addFields: (_d = {},
|
|
719
|
-
_d["_"
|
|
723
|
+
_d["_".concat(key)] = "$".concat(key),
|
|
720
724
|
_d),
|
|
721
725
|
});
|
|
722
726
|
likeQuery.push((_e = {},
|
|
723
|
-
_e["_"
|
|
727
|
+
_e["_".concat(key)] = { $all: [value] },
|
|
724
728
|
_e));
|
|
725
729
|
}
|
|
726
730
|
else if (searchQueryTypeKey === "tel") {
|
|
727
731
|
// handling value when db field type is tel
|
|
728
732
|
searchAggregateQuery.push({
|
|
729
733
|
$addFields: (_f = {},
|
|
730
|
-
_f["_"
|
|
734
|
+
_f["_".concat(key)] = { $toString: "$".concat(key) },
|
|
731
735
|
_f),
|
|
732
736
|
});
|
|
733
737
|
likeQuery.push((_g = {},
|
|
734
|
-
_g["_"
|
|
738
|
+
_g["_".concat(key)] = {
|
|
735
739
|
$regex: value.startsWith("+") ? value.replace("+", "") : value,
|
|
736
740
|
$options: "i",
|
|
737
741
|
},
|
|
@@ -741,11 +745,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
|
|
|
741
745
|
// handling value when db field type is Double/Int
|
|
742
746
|
searchAggregateQuery.push({
|
|
743
747
|
$addFields: (_h = {},
|
|
744
|
-
_h["_"
|
|
748
|
+
_h["_".concat(key)] = { $toString: { $toLong: "$".concat(key) } },
|
|
745
749
|
_h),
|
|
746
750
|
});
|
|
747
751
|
likeQuery.push((_j = {},
|
|
748
|
-
_j["_"
|
|
752
|
+
_j["_".concat(key)] = {
|
|
749
753
|
$regex: value,
|
|
750
754
|
$options: "i",
|
|
751
755
|
},
|
|
@@ -757,20 +761,20 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
|
|
|
757
761
|
fieldKey = fieldKey.replace("end_", "");
|
|
758
762
|
searchAggregateQuery.push({
|
|
759
763
|
$addFields: (_k = {},
|
|
760
|
-
_k["_"
|
|
764
|
+
_k["_".concat(key)] = { $toString: "$".concat(fieldKey) },
|
|
761
765
|
_k),
|
|
762
766
|
});
|
|
763
767
|
if (key.startsWith("start_")) {
|
|
764
768
|
likeQuery.push((_l = {},
|
|
765
|
-
_l["_"
|
|
766
|
-
$gte: date_util_1.timezoneDateParse(value, false, true),
|
|
769
|
+
_l["_".concat(key)] = {
|
|
770
|
+
$gte: (0, date_util_1.timezoneDateParse)(value, false, true),
|
|
767
771
|
},
|
|
768
772
|
_l));
|
|
769
773
|
}
|
|
770
774
|
else if (key.startsWith("end_")) {
|
|
771
775
|
likeQuery.push((_m = {},
|
|
772
|
-
_m["_"
|
|
773
|
-
$lt: date_util_1.timezoneDateParse(value, true),
|
|
776
|
+
_m["_".concat(key)] = {
|
|
777
|
+
$lt: (0, date_util_1.timezoneDateParse)(value, true),
|
|
774
778
|
},
|
|
775
779
|
_m));
|
|
776
780
|
}
|
|
@@ -781,11 +785,11 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
|
|
|
781
785
|
// converting db field to string first
|
|
782
786
|
searchAggregateQuery.push({
|
|
783
787
|
$addFields: (_o = {},
|
|
784
|
-
_o["_"
|
|
788
|
+
_o["_".concat(key)] = { $toString: "$".concat(key) },
|
|
785
789
|
_o),
|
|
786
790
|
});
|
|
787
791
|
likeQuery.push((_p = {},
|
|
788
|
-
_p["_"
|
|
792
|
+
_p["_".concat(key)] = {
|
|
789
793
|
$regex: value,
|
|
790
794
|
$options: "i",
|
|
791
795
|
},
|