@6thbridge/utils 1.1.8-1 → 1.2.0-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/lib/database/MongoDBRepository.d.ts +3 -56
- package/lib/database/MongoDBRepository.js +6 -77
- package/lib/database/MongoDBRepository.js.map +1 -1
- package/lib/database/MongoDBTypeRepository.d.ts +103 -0
- package/lib/database/MongoDBTypeRepository.js +90 -0
- package/lib/database/MongoDBTypeRepository.js.map +1 -0
- package/lib/database/index.d.ts +1 -0
- package/lib/database/index.js +1 -0
- package/lib/database/index.js.map +1 -1
- package/lib/database/meta.entity.d.ts +10 -0
- package/lib/database/meta.entity.js +7 -0
- package/lib/database/meta.entity.js.map +1 -0
- package/lib/database/meta.model.d.ts +37 -0
- package/lib/database/meta.model.js +50 -0
- package/lib/database/meta.model.js.map +1 -0
- package/lib/database/meta.repository.d.ts +7 -0
- package/lib/database/meta.repository.js +16 -0
- package/lib/database/meta.repository.js.map +1 -0
- package/lib/logger/logger.d.ts +2 -2
- package/lib/middlewares/common.js +1 -1
- package/lib/middlewares/common.js.map +1 -1
- package/lib/monitoring/index.d.ts +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -1
- package/lib/types/index.d.ts +1 -0
- package/lib/types/index.js +3 -1
- package/lib/types/index.js.map +1 -1
- package/lib/utils/database.js +11 -11
- package/lib/utils/database.js.map +1 -1
- package/package.json +21 -23
package/lib/utils/database.js
CHANGED
|
@@ -8,6 +8,11 @@ const dayjs_1 = __importDefault(require("dayjs"));
|
|
|
8
8
|
const customParseFormat_1 = __importDefault(require("dayjs/plugin/customParseFormat"));
|
|
9
9
|
const lodash_1 = require("lodash");
|
|
10
10
|
dayjs_1.default.extend(customParseFormat_1.default);
|
|
11
|
+
const DEFAULT_QUERY_OPTIONS = {
|
|
12
|
+
dateField: 'createdAt',
|
|
13
|
+
dateFormat: ['X', 'YYYY-MM-DD', 'YYYY-MM-DDTHH:mm:ss.SSSZ', 'DD-MM-YYYY'],
|
|
14
|
+
enableParentClientSearch: false,
|
|
15
|
+
};
|
|
11
16
|
/**
|
|
12
17
|
* @description resolveRequestQueryToMongoDBQuery
|
|
13
18
|
* @param {object} requestQuery
|
|
@@ -33,12 +38,7 @@ exports.ObjectToMongoDBQueryResult = ObjectToMongoDBQueryResult;
|
|
|
33
38
|
class DatabaseUtil {
|
|
34
39
|
static resolveObjectToMongoDBQuery(requestQuery, options) {
|
|
35
40
|
var _a, _b;
|
|
36
|
-
|
|
37
|
-
options = {
|
|
38
|
-
dateFormat: ['X', "YYYY-MM-DD", "YYYY-MM-DDTHH:mm:ss.SSSZ", "DD-MM-YYYY"],
|
|
39
|
-
dateField: 'createdAt',
|
|
40
|
-
};
|
|
41
|
-
}
|
|
41
|
+
const resolvedOptions = Object.assign(Object.assign({}, DEFAULT_QUERY_OPTIONS), options);
|
|
42
42
|
const response = {
|
|
43
43
|
page: 1,
|
|
44
44
|
limit: 50,
|
|
@@ -65,17 +65,17 @@ class DatabaseUtil {
|
|
|
65
65
|
continue;
|
|
66
66
|
}
|
|
67
67
|
if (key === 'dateFrom' && !(0, lodash_1.isEmpty)(requestQuery[key])) {
|
|
68
|
-
response.filter[
|
|
68
|
+
response.filter[resolvedOptions.dateField || 'createdAt'] = Object.assign(Object.assign({}, response.filter[resolvedOptions.dateField || 'createdAt']), { $gte: (0, dayjs_1.default)(requestQuery[key] || new Date(), resolvedOptions.dateFormat).startOf('day').toDate() });
|
|
69
69
|
continue;
|
|
70
70
|
}
|
|
71
71
|
if (key === 'dateTo' && !(0, lodash_1.isEmpty)(requestQuery[key])) {
|
|
72
|
-
response.filter[
|
|
72
|
+
response.filter[resolvedOptions.dateField || 'createdAt'] = Object.assign(Object.assign({}, response.filter[resolvedOptions.dateField || 'createdAt']), { $lte: (0, dayjs_1.default)(requestQuery[key] || new Date(), resolvedOptions.dateFormat).endOf('day').toDate() });
|
|
73
73
|
continue;
|
|
74
74
|
}
|
|
75
75
|
//query
|
|
76
76
|
if (key === 'q') {
|
|
77
77
|
const sanitizedQuery = requestQuery[key].replace(/[^\w\s]/gi, '');
|
|
78
|
-
if (!((_b =
|
|
78
|
+
if (!((_b = resolvedOptions.searchFields) === null || _b === void 0 ? void 0 : _b.length)) {
|
|
79
79
|
response.filter.$text = {
|
|
80
80
|
$search: new RegExp(sanitizedQuery, 'gi'),
|
|
81
81
|
$caseSensitive: false,
|
|
@@ -83,12 +83,12 @@ class DatabaseUtil {
|
|
|
83
83
|
continue;
|
|
84
84
|
}
|
|
85
85
|
response.filter.$or = [...(response.filter.$or || [])];
|
|
86
|
-
|
|
86
|
+
resolvedOptions.searchFields.forEach((field) => {
|
|
87
87
|
response.filter.$or.push({ [field]: new RegExp(sanitizedQuery, 'gi') });
|
|
88
88
|
});
|
|
89
89
|
continue;
|
|
90
90
|
}
|
|
91
|
-
if (key === 'clientId' &&
|
|
91
|
+
if (key === 'clientId' && resolvedOptions.enableParentClientSearch) {
|
|
92
92
|
response.filter["$or"] = [{ clientId: requestQuery[key] }, { parentClientId: requestQuery[key] }];
|
|
93
93
|
continue;
|
|
94
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uFAA+D;AAC/D,mCAAiC;AAEjC,eAAK,CAAC,MAAM,CAAC,2BAAiB,CAAC,CAAC;AAEhC;;;;GAIG;AAEH,MAAa,0BAA0B;IAAvC;QACI,cAAS,GAAY,WAAW,CAAC;QACjC,eAAU,GAAwB,CAAC,GAAG,EAAE,YAAY,EAAE,0BAA0B,EAAE,YAAY,CAAC,CAAA;QAE/F,6BAAwB,GAAa,KAAK,CAAC;IAC/C,CAAC;CAAA;AALD,gEAKC;AAED,MAAa,0BAA0B;IAAvC;QACI,SAAI,GAAY,CAAC,CAAC;QAClB,UAAK,GAAY,EAAE,CAAC;QAEpB,WAAM,GAAQ,EAAE,CAAC;QACjB,SAAI,GAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IAC5B,CAAC;CAAA;AAND,gEAMC;AAGD,MAAa,YAAY;IACrB,MAAM,CAAC,2BAA2B,CAAC,YAAiC,EAAE,OAAoC;;QACtG,
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@6thbridge/utils",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0-1",
|
|
4
4
|
"description": "simple interface for the our commonly used functions",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -24,37 +24,35 @@
|
|
|
24
24
|
},
|
|
25
25
|
"license": "ISC",
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@opentelemetry/api": "^1.9.
|
|
28
|
-
"@opentelemetry/auto-instrumentations-node": "^0.
|
|
27
|
+
"@opentelemetry/api": "^1.9.1",
|
|
28
|
+
"@opentelemetry/auto-instrumentations-node": "^0.72.0",
|
|
29
29
|
"amqp-connection-manager": "^4.1.15",
|
|
30
|
-
"amqplib": "^0.
|
|
31
|
-
"axios": "1.
|
|
30
|
+
"amqplib": "^1.0.2",
|
|
31
|
+
"axios": "1.14.0",
|
|
32
32
|
"axios-better-stacktrace": "^2.1.7",
|
|
33
|
-
"bignumber.js": "^
|
|
33
|
+
"bignumber.js": "^10.0.2",
|
|
34
34
|
"csv-parse": "^5.6.0",
|
|
35
|
-
"dayjs": "^1.11.
|
|
36
|
-
"
|
|
37
|
-
"ioredis": "^5.6.1",
|
|
35
|
+
"dayjs": "^1.11.20",
|
|
36
|
+
"ioredis": "^5.10.1",
|
|
38
37
|
"joi": "^17.13.3",
|
|
39
|
-
"libphonenumber-js": "^1.12.
|
|
38
|
+
"libphonenumber-js": "^1.12.41",
|
|
40
39
|
"lodash": "4.17.23",
|
|
41
|
-
"mongoose": "^
|
|
42
|
-
"mongoose-paginate-v2": "^1.9.
|
|
43
|
-
"
|
|
44
|
-
"path-to-regexp": "^6.3.0",
|
|
40
|
+
"mongoose": "^9.3.3",
|
|
41
|
+
"mongoose-paginate-v2": "^1.9.4",
|
|
42
|
+
"path-to-regexp": "^8.4.1",
|
|
45
43
|
"randomstring": "^1.3.1",
|
|
46
|
-
"rollbar": "^
|
|
44
|
+
"rollbar": "^3.1.0",
|
|
47
45
|
"xlsx": "^0.18.5"
|
|
48
46
|
},
|
|
49
47
|
"devDependencies": {
|
|
50
|
-
"@types/amqplib": "^0.10.
|
|
51
|
-
"@types/express": "^4.17.
|
|
52
|
-
"@types/jest": "^29.5.
|
|
53
|
-
"@types/lodash": "^4.
|
|
54
|
-
"@types/randomstring": "^1.
|
|
55
|
-
"@types/xlsx": "^0.0.
|
|
56
|
-
"jest": "^
|
|
57
|
-
"ts-jest": "^29.
|
|
48
|
+
"@types/amqplib": "^0.10.8",
|
|
49
|
+
"@types/express": "^4.17.25",
|
|
50
|
+
"@types/jest": "^29.5.14",
|
|
51
|
+
"@types/lodash": "^4.17.24",
|
|
52
|
+
"@types/randomstring": "^1.3.0",
|
|
53
|
+
"@types/xlsx": "^0.0.36",
|
|
54
|
+
"jest": "^30.3.0",
|
|
55
|
+
"ts-jest": "^29.4.6",
|
|
58
56
|
"ts-node": "^10.9.2",
|
|
59
57
|
"typescript": "^5.4.3"
|
|
60
58
|
},
|