drapcode-utility 1.9.78 → 2.0.0

package/build/encryption/index.js

@@ -90,7 +90,9 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt, enc
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    if (!(item && typeof item === "object")) return [3 /*break*/, 4];
+                    if (!item && typeof item !== "object") {
+                        return [2 /*return*/, item];
+                    }
                     _loop_1 = function (fieldName) {
                         var field, promises, _c, _d, _e, _f, refField, _g, _h;
                         return __generator(this, function (_j) {
@@ -118,7 +120,7 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt, enc
                                     _j.label = 4;
                                 case 4:
                                     if (!decrypt) return [3 /*break*/, 6];
-                                    if (!drapcode_constant_1.BelongsCreatedByRefField.includes(field === null || field === void 0 ? void 0 : field.type)) return [3 /*break*/, 6];
+                                    if (!(decrypt && drapcode_constant_1.BelongsCreatedByRefField.includes(field === null || field === void 0 ? void 0 : field.type))) return [3 /*break*/, 6];
                                     refField = field;
                                     if (!refField.refCollection &&
                                         [drapcode_constant_1.FieldTypes.createdBy.id, drapcode_constant_1.FieldTypes.updatedBy.id].includes(field.type)) {
@@ -163,6 +165,7 @@ var processDataEncryptionDecryption = function (data, encryption, decrypt) { ret
                 encryptionType = encryption.encryptionType, dataKey = encryption.dataKey;
                 if (!data)
                     return [2 /*return*/, data];
+                console.log("data :>> ", data);
                 _a = encryptionType;
                 switch (_a) {
                     case "KMS": return [3 /*break*/, 1];

package/build/utils/query-utils.js

@@ -17,7 +17,7 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
     var searchAggregateQuery = [];
     var likeQuery = [];
     Object.entries(searchObj).forEach(function (_a) {
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
         var key = _a[0], value = _a[1];
         if (value) {
             var searchQueryTypeKey = searchQueryTypeObj[key];
@@ -101,42 +101,59 @@ var getSearchObjQuery = function (searchObj, searchQueryTypeObj, timezone) {
                         if (key.startsWith("start_")) {
                             likeQuery.push((_o = {},
                                 _o["_".concat(key)] = {
-                                    $gte: (0, date_util_1.timezoneDateParse)(value, true, true),
+                                    $gte: (0, date_util_1.timezoneDateParse)(value, false, true),
                                 },
                                 _o));
                         }
                         else if (key.startsWith("end_")) {
                             likeQuery.push((_p = {},
                                 _p["_".concat(key)] = {
-                                    $lt: (0, date_util_1.timezoneDateParse)(value, true),
+                                    $lt: (0, date_util_1.timezoneDateParse)(value),
                                 },
                                 _p));
                         }
                     }
+                    else {
+                        searchAggregateQuery.push({
+                            $addFields: (_q = {},
+                                _q["_".concat(key)] = { $toString: "$".concat(key) },
+                                _q),
+                        });
+                        likeQuery.push((_r = {},
+                            _r["_".concat(key)] = {
+                                $gte: (0, date_util_1.timezoneDateParse)(value, false, true),
+                            },
+                            _r));
+                        likeQuery.push((_s = {},
+                            _s["_".concat(key)] = {
+                                $lt: (0, date_util_1.timezoneDateParse)(value, false),
+                            },
+                            _s));
+                    }
                 }
                 else {
                     // if input is string and db field type is number
                     // converting db field to string first
                     searchAggregateQuery.push({
-                        $addFields: (_q = {},
-                            _q["_".concat(key)] = { $toString: "$".concat(key) },
-                            _q),
+                        $addFields: (_t = {},
+                            _t["_".concat(key)] = { $toString: "$".concat(key) },
+                            _t),
                     });
-                    likeQuery.push((_r = {},
-                        _r["_".concat(key)] = {
+                    likeQuery.push((_u = {},
+                        _u["_".concat(key)] = {
                             $regex: value,
                             $options: "i",
                         },
-                        _r));
+                        _u));
                 }
             }
             else {
-                likeQuery.push((_s = {},
-                    _s[key] = {
+                likeQuery.push((_v = {},
+                    _v[key] = {
                         $regex: value,
                         $options: "i",
                     },
-                    _s));
+                    _v));
             }
         }
     });

package/build/utils/rest-client.js

@@ -286,7 +286,7 @@ var prepareReturnObject = function (data, status, success, headers) {
     };
 };
 var makeAxiosCall = function (projectId, methodType, url, axiosConfig, data, timeout, wrapJsonDataInArray, awsSignPluginConfig) { return __awaiter(void 0, void 0, void 0, function () {
-    var result, instance, dataArray_1, awsRes;
+    var result, instance, dataArray_1, payload, urlObj_1, awsRes, error_2;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -323,20 +323,38 @@ var makeAxiosCall = function (projectId, methodType, url, axiosConfig, data, tim
                     default:
                         break;
                 }
-                if (!awsSignPluginConfig) return [3 /*break*/, 2];
-                return [4 /*yield*/, (0, util_1.getAwsSignature)(axiosConfig, awsSignPluginConfig)];
+                _a.label = 1;
             case 1:
+                _a.trys.push([1, 5, , 6]);
+                if (!awsSignPluginConfig) return [3 /*break*/, 3];
+                payload = JSON.stringify(data);
+                axiosConfig = __assign(__assign({}, axiosConfig), { data: payload });
+                if (axiosConfig.params) {
+                    urlObj_1 = new URL(axiosConfig.url);
+                    Object.entries(axiosConfig.params).forEach(function (_a) {
+                        var key = _a[0], value = _a[1];
+                        urlObj_1.searchParams.append(key, value);
+                    });
+                    axiosConfig.url = urlObj_1.toString();
+                }
+                return [4 /*yield*/, (0, util_1.getAwsSignature)(axiosConfig, awsSignPluginConfig)];
+            case 2:
                 awsRes = _a.sent();
                 if (awsRes.error)
                     return [2 /*return*/, awsRes.error];
-                axiosConfig = __assign(__assign({}, awsRes.data), { url: url, data: data });
-                _a.label = 2;
-            case 2:
+                axiosConfig = __assign(__assign({}, awsRes.data), { data: payload });
+                _a.label = 3;
+            case 3:
                 console.log("\n ==> Final axiosConfig for projectID: ".concat(projectId, ":>> "), axiosConfig);
                 return [4 /*yield*/, (0, axios_1.default)(__assign({}, axiosConfig))];
-            case 3:
+            case 4:
                 result = _a.sent();
                 return [2 /*return*/, result];
+            case 5:
+                error_2 = _a.sent();
+                console.log("\n ===error", error_2);
+                return [2 /*return*/, error_2];
+            case 6: return [2 /*return*/];
         }
     });
 }); };

package/build/utils/util.js

@@ -835,12 +835,16 @@ var toggleConsoleLogs = function (enable) {
 exports.toggleConsoleLogs = toggleConsoleLogs;
 // Utility function to replace '/' with '____'
 var replaceSlashWithUnderscore = function (value) {
-    return value && value.replace(/\//g, "____");
+    return value && typeof value === 'string' && value.includes('/')
+        ? value.replace(/\//g, '____')
+        : value;
 };
 exports.replaceSlashWithUnderscore = replaceSlashWithUnderscore;
 // Utility function to replace '____' with '/'
 var replaceUnderscoreWithSlash = function (value) {
-    return value && value.replace(/____/g, "/");
+    return value && typeof value === 'string' && value.includes('____')
+        ? value.replace(/____/g, '/')
+        : value;
 };
 exports.replaceUnderscoreWithSlash = replaceUnderscoreWithSlash;
 var capitalize = function (str, restToLower) {
@@ -1260,12 +1264,11 @@ var replaceValuesFromRequestMapping = function (dataArr, mappingArray) {
 };
 exports.replaceValuesFromRequestMapping = replaceValuesFromRequestMapping;
 var getAwsSignature = function (axiosConfig, awsSignPluginConfig) { return __awaiter(void 0, void 0, void 0, function () {
-    var response, method, headers, url, data, parsedUrl, payload, accessKeyId, secretAccessKey, region, service, signedRequest;
+    var response, method, headers, url, data, parsedUrl, accessKeyId, secretAccessKey, region, service, signedRequest;
     return __generator(this, function (_a) {
         response = { error: "", data: {} };
         method = axiosConfig.method, headers = axiosConfig.headers, url = axiosConfig.url, data = axiosConfig.data;
         parsedUrl = new URL(url);
-        payload = JSON.stringify(data);
         if (awsSignPluginConfig) {
             accessKeyId = awsSignPluginConfig.accessKeyId, secretAccessKey = awsSignPluginConfig.secretAccessKey, region = awsSignPluginConfig.region, service = awsSignPluginConfig.service;
             signedRequest = (0, aws4_1.sign)({
@@ -1274,9 +1277,10 @@ var getAwsSignature = function (axiosConfig, awsSignPluginConfig) { return __awa
                 region: region,
                 host: parsedUrl.host,
                 headers: headers,
-                body: payload,
+                body: data,
+                path: parsedUrl.pathname + parsedUrl.search,
             }, { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey });
-            response.data = signedRequest;
+            response.data = __assign(__assign({}, signedRequest), { url: url });
             return [2 /*return*/, response];
         }
         else

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.9.78",
+  "version": "2.0.0",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -40,9 +40,9 @@
     "aws4": "^1.13.2",
     "axios": "^1.1.2",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^1.7.0",
+    "drapcode-constant": "^1.7.1",
     "drapcode-logger": "^1.3.4",
-    "drapcode-redis": "^1.2.5",
+    "drapcode-redis": "^1.2.6",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",