drapcode-utility 2.0.1 → 2.0.2

package/build/errors/bad-request-error.js

@@ -1,34 +1,16 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BadRequestError = void 0;
-var custom_error_1 = require("./custom-error");
-var BadRequestError = /** @class */ (function (_super) {
-    __extends(BadRequestError, _super);
-    function BadRequestError(message) {
-        var _this = _super.call(this, message) || this;
-        _this.message = message;
-        _this.statusCode = 400;
-        Object.setPrototypeOf(_this, BadRequestError.prototype);
-        return _this;
+const custom_error_1 = require("./custom-error");
+class BadRequestError extends custom_error_1.CustomError {
+    constructor(message) {
+        super(message);
+        this.message = message;
+        this.statusCode = 400;
+        Object.setPrototypeOf(this, BadRequestError.prototype);
     }
-    BadRequestError.prototype.serializeErrors = function () {
+    serializeErrors() {
         return [{ message: this.message }];
-    };
-    return BadRequestError;
-}(custom_error_1.CustomError));
+    }
+}
 exports.BadRequestError = BadRequestError;

package/build/errors/custom-error.js

@@ -1,28 +1,10 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomError = void 0;
-var CustomError = /** @class */ (function (_super) {
-    __extends(CustomError, _super);
-    function CustomError(message) {
-        var _this = _super.call(this) || this;
-        Object.setPrototypeOf(_this, CustomError.prototype);
-        return _this;
+class CustomError extends Error {
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, CustomError.prototype);
     }
-    return CustomError;
-}(Error));
+}
 exports.CustomError = CustomError;

package/build/errors/not-found.js

@@ -1,33 +1,15 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NotFoundError = void 0;
-var custom_error_1 = require("./custom-error");
-var NotFoundError = /** @class */ (function (_super) {
-    __extends(NotFoundError, _super);
-    function NotFoundError() {
-        var _this = _super.call(this, "Route Not Found") || this;
-        _this.statusCode = 404;
-        Object.setPrototypeOf(_this, NotFoundError.prototype);
-        return _this;
+const custom_error_1 = require("./custom-error");
+class NotFoundError extends custom_error_1.CustomError {
+    constructor() {
+        super("Route Not Found");
+        this.statusCode = 404;
+        Object.setPrototypeOf(this, NotFoundError.prototype);
     }
-    NotFoundError.prototype.serializeErrors = function () {
+    serializeErrors() {
         return [{ message: "Not Found" }];
-    };
-    return NotFoundError;
-}(custom_error_1.CustomError));
+    }
+}
 exports.NotFoundError = NotFoundError;

package/build/format-fields/index.d.ts

@@ -1,4 +1,3 @@
 export declare const formatFieldsOfItem: (item: any, fields: any) => any;
 export declare const getFormatFieldData: (fieldData: any, fieldType: string) => any;
-export declare const xssSanitizer: (req: any, res: any, next: any) => void;
 export declare const cleanXssValuesFromData: (data: any, fields?: any) => any;

package/build/format-fields/index.js

@@ -1,54 +1,45 @@
 "use strict";
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanXssValuesFromData = exports.xssSanitizer = exports.getFormatFieldData = exports.formatFieldsOfItem = void 0;
-var drapcode_constant_1 = require("drapcode-constant");
-var jsdom_1 = require("jsdom");
-var dompurify_1 = __importDefault(require("dompurify"));
-var window = new jsdom_1.JSDOM("").window;
-var domPurify = (0, dompurify_1.default)(window);
+exports.cleanXssValuesFromData = exports.getFormatFieldData = exports.formatFieldsOfItem = void 0;
+const drapcode_constant_1 = require("drapcode-constant");
+const jsdom_1 = require("jsdom");
+const dompurify_1 = __importDefault(require("dompurify"));
+const { createdAt, text, large_text, date, password, uuid, custom_uuid, email, url, number, unix_timestamp, belongsTo, boolean, time_slot, slug, json, markdown, file, } = drapcode_constant_1.FieldTypes;
+const window = new jsdom_1.JSDOM("").window;
+const domPurify = (0, dompurify_1.default)(window);
 domPurify.setConfig({
     ALLOWED_TAGS: [],
     ALLOWED_ATTR: [],
 });
-var formatFieldsOfItem = function (item, fields) {
+const formatFieldsOfItem = (item, fields) => {
     if (!item)
         return item;
     if (!fields && !fields.length)
         return item;
     if (Array.isArray(item)) {
-        item = item.map(function (itemData) { return formatField(itemData, fields); });
+        item = item.map((itemData) => formatField(itemData, fields));
     }
     else
         item = formatField(item, fields);
     return item;
 };
 exports.formatFieldsOfItem = formatFieldsOfItem;
-var formatField = function (itemData, fields) {
-    var newItemData = {};
+const formatField = (itemData, fields) => {
+    let newItemData = {};
     itemData = (0, exports.cleanXssValuesFromData)(itemData, fields);
-    Object.keys(itemData).forEach(function (key) {
-        var field = fields.find(function (field) { return field.fieldName === key; });
+    Object.keys(itemData).forEach((key) => {
+        const field = fields.find((field) => field.fieldName === key);
         newItemData[key] = field
             ? (0, exports.getFormatFieldData)(itemData[key], field.type)
             : itemData[key];
     });
     return newItemData;
 };
-var getFormatFieldData = function (fieldData, fieldType) {
-    var createdAt = drapcode_constant_1.FieldTypes.createdAt, text = drapcode_constant_1.FieldTypes.text, large_text = drapcode_constant_1.FieldTypes.large_text, date = drapcode_constant_1.FieldTypes.date, password = drapcode_constant_1.FieldTypes.password, uuid = drapcode_constant_1.FieldTypes.uuid, custom_uuid = drapcode_constant_1.FieldTypes.custom_uuid, email = drapcode_constant_1.FieldTypes.email, url = drapcode_constant_1.FieldTypes.url, number = drapcode_constant_1.FieldTypes.number, unix_timestamp = drapcode_constant_1.FieldTypes.unix_timestamp, belongsTo = drapcode_constant_1.FieldTypes.belongsTo, boolean = drapcode_constant_1.FieldTypes.boolean, time_slot = drapcode_constant_1.FieldTypes.time_slot, slug = drapcode_constant_1.FieldTypes.slug, json = drapcode_constant_1.FieldTypes.json, markdown = drapcode_constant_1.FieldTypes.markdown;
-    var stringType = [
+const getFormatFieldData = (fieldData, fieldType) => {
+    const stringType = [
         createdAt.id,
         text.id,
         large_text.id,
@@ -63,8 +54,8 @@ var getFormatFieldData = function (fieldData, fieldType) {
         json.id,
         markdown.id,
     ];
-    var numberType = [number.id, unix_timestamp.id];
-    var arrayType = __spreadArray(__spreadArray([], drapcode_constant_1.NonBelongsSelectOptionFields, true), [belongsTo.id], false);
+    const numberType = [number.id, unix_timestamp.id];
+    const arrayType = [...drapcode_constant_1.SelectOptionFields, belongsTo.id];
     if (stringType.includes(fieldType)) {
         if (typeof fieldData !== "string")
             fieldData = String(fieldData);
@@ -78,8 +69,8 @@ var getFormatFieldData = function (fieldData, fieldType) {
             if (typeof fieldData === "string") {
                 fieldData = fieldData.toLowerCase();
             }
-            var trueValues = ["true", "1", 1];
-            var falseValues = ["false", "0", 0, ""];
+            const trueValues = ["true", "1", 1];
+            const falseValues = ["false", "0", 0, ""];
             if (trueValues.includes(fieldData)) {
                 fieldData = true;
             }
@@ -96,38 +87,17 @@ var getFormatFieldData = function (fieldData, fieldType) {
     return fieldData;
 };
 exports.getFormatFieldData = getFormatFieldData;
-// Middleware
-var xssSanitizer = function (req, res, next) {
-    try {
-        if (req.params && Object.keys(req.params))
-            req.params = (0, exports.cleanXssValuesFromData)(req.params);
-        if (req.query && Object.keys(req.query))
-            req.query = (0, exports.cleanXssValuesFromData)(req.query);
-        if (req.headers && Object.keys(req.headers))
-            req.headers = (0, exports.cleanXssValuesFromData)(req.headers);
-    }
-    catch (error) {
-        console.error("\n error :>> ", error);
-    }
-    next();
-};
-exports.xssSanitizer = xssSanitizer;
-var cleanXssValuesFromData = function (data, fields) {
-    if (fields === void 0) { fields = null; }
-    var exceptionFields = [];
+const cleanXssValuesFromData = (data, fields = null) => {
+    const exceptionFields = [];
     try {
         if (fields) {
-            fields.forEach(function (field) {
-                if ([
-                    drapcode_constant_1.FieldTypes.large_text.id,
-                    drapcode_constant_1.FieldTypes.markdown.id,
-                    drapcode_constant_1.FieldTypes.file.id,
-                ].includes(field.type))
+            fields.forEach((field) => {
+                if ([large_text.id, markdown.id, file.id].includes(field.type))
                     exceptionFields.push(field.fieldName);
             });
         }
         if (Array.isArray(data)) {
-            data = data.map(function (item) { return processXssData(item, exceptionFields); });
+            data = data.map((item) => processXssData(item, exceptionFields));
         }
         else
             data = processXssData(data, exceptionFields);
@@ -138,12 +108,10 @@ var cleanXssValuesFromData = function (data, fields) {
     }
 };
 exports.cleanXssValuesFromData = cleanXssValuesFromData;
-var processXssData = function (item, exceptionFields) {
-    if (exceptionFields === void 0) { exceptionFields = []; }
-    var keys = Object.keys(item);
+const processXssData = (item, exceptionFields = []) => {
+    const keys = Object.keys(item);
     if (keys.length) {
-        for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-            var fieldName = keys_1[_i];
+        for (const fieldName of keys) {
             if (!exceptionFields.includes(fieldName)) {
                 item[fieldName] = sanitizeFieldValue(item[fieldName]);
             }
@@ -151,17 +119,16 @@ var processXssData = function (item, exceptionFields) {
     }
     return item;
 };
-var sanitizeFieldValue = function (value) {
+const sanitizeFieldValue = (value) => {
     if (value) {
         if (Array.isArray(value)) {
-            value = value.map(function (val) { return sanitizeFieldValue(val); });
+            value = value.map((val) => sanitizeFieldValue(val));
         }
         else if (typeof value === "object" && value !== null) {
-            var tempItem = value;
-            var itemKeys = Object.keys(tempItem);
+            const tempItem = value;
+            const itemKeys = Object.keys(tempItem);
             if (itemKeys.length) {
-                for (var _i = 0, itemKeys_1 = itemKeys; _i < itemKeys_1.length; _i++) {
-                    var key = itemKeys_1[_i];
+                for (const key of itemKeys) {
                     tempItem[key] = domPurify.sanitize(tempItem[key]);
                 }
             }

package/build/index.d.ts

@@ -4,15 +4,12 @@ export * from "./errors/not-found";
 export * from "./errors/app-error";
 export * from "./errors/axios-error";
 export * from "./middlewares/error-logger";
-export * from "./middlewares/interceptor-logger";
-export * from "./middlewares/interceptor-logger-new";
 export * from "./utils/date-util";
 export * from "./utils/query-parser";
-export * from "./utils/query-parser-new";
+export * from "./query/queryBuilder";
 export * from "./utils/util";
 export * from "./utils/uuid-generator";
 export * from "./utils/check-error";
-export * from "./utils/prepare-query";
 export * from "./utils/s3-util";
 export * from "./utils/project-util";
 export * from "./utils/common-util";

package/build/index.js

@@ -20,15 +20,12 @@ __exportStar(require("./errors/not-found"), exports);
 __exportStar(require("./errors/app-error"), exports);
 __exportStar(require("./errors/axios-error"), exports);
 __exportStar(require("./middlewares/error-logger"), exports);
-__exportStar(require("./middlewares/interceptor-logger"), exports);
-__exportStar(require("./middlewares/interceptor-logger-new"), exports);
 __exportStar(require("./utils/date-util"), exports);
 __exportStar(require("./utils/query-parser"), exports);
-__exportStar(require("./utils/query-parser-new"), exports);
+__exportStar(require("./query/queryBuilder"), exports);
 __exportStar(require("./utils/util"), exports);
 __exportStar(require("./utils/uuid-generator"), exports);
 __exportStar(require("./utils/check-error"), exports);
-__exportStar(require("./utils/prepare-query"), exports);
 __exportStar(require("./utils/s3-util"), exports);
 __exportStar(require("./utils/project-util"), exports);
 __exportStar(require("./utils/common-util"), exports);

package/build/middlewares/error-logger.d.ts

@@ -1,3 +1,3 @@
 import { Response, NextFunction } from "express";
 import { CustomError } from "../errors/custom-error";
-export declare const errorLogger: (err: CustomError, req: any, res: Response, next: NextFunction) => Response<any, Record<string, any>> | undefined;
+export declare const errorLogger: (err: CustomError, req: any, res: Response, next: NextFunction) => void | Response<any, Record<string, any>>;

package/build/middlewares/error-logger.js

@@ -4,20 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorLogger = void 0;
-var drapcode_logger_1 = require("drapcode-logger");
-var date_util_1 = require("../utils/date-util");
-var fs_1 = __importDefault(require("fs"));
-var parse_error = function (err) {
+const drapcode_logger_1 = require("drapcode-logger");
+const date_util_1 = require("../utils/date-util");
+const fs_1 = __importDefault(require("fs"));
+const parse_error = (err) => {
     if (!err.stack)
         return err;
-    var caller_line = err.stack.split("\n");
+    const caller_line = err.stack.split("\n");
     if (caller_line) {
-        var index = caller_line.filter(function (x) {
-            var result = x.trim();
-            var res = false;
+        const index = caller_line.filter((x) => {
+            let result = x.trim();
+            let res = false;
             if (x) {
                 result = x.match(/at _callee/g);
-                res = result && result.lenght > 0;
+                res = result && result.length > 0;
             }
             return res;
         });
@@ -27,35 +27,35 @@ var parse_error = function (err) {
     }
     return err.stack;
 };
-var errorLogger = function (err, req, res, next) {
-    var loggerPath = process.env.LOG_FOLDER_PATH || "/tmp/log";
-    var originalUrl = req.originalUrl, method = req.method, body = req.body, params = req.params, query = req.query, db = req.db, projectName = req.projectName, projectId = req.projectId, ip = req.ip;
-    var PreviouseFilePath;
+const errorLogger = (err, req, res, next) => {
+    let loggerPath = process.env.LOG_FOLDER_PATH || "/tmp/log";
+    const { originalUrl, method, body, params, query, db, projectName, projectId, ip, } = req;
+    let PreviousFilePath;
     if (projectName) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
-        PreviouseFilePath = "".concat(loggerPath, "/").concat(projectName, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
+        loggerPath = `${loggerPath}/${projectName}/${(0, date_util_1.createLoggerDateFormat)()}/output`;
+        PreviousFilePath = `${loggerPath}/${projectName}/${(0, date_util_1.createLoggerPreviousDateFormat)()}/`;
     }
     else if (projectId) {
-        loggerPath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
-        PreviouseFilePath = "".concat(loggerPath, "/").concat(projectId, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
+        loggerPath = `${loggerPath}/${projectId}/${(0, date_util_1.createLoggerDateFormat)()}/output`;
+        PreviousFilePath = `${loggerPath}/${projectId}/${(0, date_util_1.createLoggerPreviousDateFormat)()}/`;
     }
     else {
-        loggerPath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerDateFormat)(), "/output");
-        PreviouseFilePath = "".concat(loggerPath, "/").concat((0, date_util_1.createLoggerPreviouseDateFormat)(), "/");
+        loggerPath = `${loggerPath}/${(0, date_util_1.createLoggerDateFormat)()}/output`;
+        PreviousFilePath = `${loggerPath}/${(0, date_util_1.createLoggerPreviousDateFormat)()}/`;
     }
-    if (fs_1.default.existsSync(PreviouseFilePath)) {
-        fs_1.default.rmSync(PreviouseFilePath, { recursive: true, force: true });
+    if (fs_1.default.existsSync(PreviousFilePath)) {
+        fs_1.default.rmSync(PreviousFilePath, { recursive: true, force: true });
     }
-    var reqObject = {
+    const reqObject = {
         uri: originalUrl,
-        method: method,
-        body: body,
-        params: params,
-        query: query,
+        method,
+        body,
+        params,
+        query,
         dbName: "",
         message: "",
         line: "",
-        ip: ip,
+        ip,
     };
     if (db) {
         reqObject["dbName"] = db.name;
@@ -63,12 +63,12 @@ var errorLogger = function (err, req, res, next) {
     if (err) {
         reqObject.message = err.message || err;
         reqObject.line = parse_error(err) || "";
-        var logger = new drapcode_logger_1.FileLogger(loggerPath).createLogger();
+        const logger = new drapcode_logger_1.FileLogger({ fileName: loggerPath }).createLogger();
         logger.error(reqObject);
         return res.status(err.statusCode || 500).json({
             errors: [{ message: err.message || "something went wrong!!" }],
         });
     }
-    next();
+    return next();
 };
 exports.errorLogger = errorLogger;

package/build/middlewares/redis/request-log.js

@@ -1,79 +1,29 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            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;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveRequest = void 0;
-var drapcode_redis_1 = require("drapcode-redis");
-var util_1 = require("../../utils/util");
-var saveRequest = function (req, res) {
-    if (req === void 0) { req = {}; }
-    if (res === void 0) { res = {}; }
-    return __awaiter(void 0, void 0, void 0, function () {
-        var redisData, ip, respObj;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    req.body = (0, util_1.isEmpty)(req.body) ? req.query : req.body;
-                    ip = req.headers["x-forwarded-for"] ||
-                        req.connection.remoteAddress ||
-                        req.socket.remoteAddress ||
-                        (req.connection.socket ? req.connection.socket.remoteAddress : null);
-                    respObj = {
-                        projectId: req.projectId,
-                        projectName: req.projectName,
-                        route: req.originalUrl,
-                        method: req.method,
-                        statusCode: res.statusCode || 200,
-                        request: JSON.stringify(req.body),
-                        response: JSON.stringify(res),
-                        ipAddress: ip,
-                    };
-                    return [4 /*yield*/, (0, drapcode_redis_1.redis_get_method)("requestLog")];
-                case 1:
-                    redisData = _a.sent();
-                    if (!redisData)
-                        redisData = [];
-                    redisData.push(respObj);
-                    return [4 /*yield*/, (0, drapcode_redis_1.redis_set_method)("requestLog", redisData)];
-                case 2:
-                    _a.sent();
-                    return [2 /*return*/];
-            }
-        });
-    });
+const drapcode_redis_1 = require("drapcode-redis");
+const util_1 = require("../../utils/util");
+const saveRequest = async (req = {}, res = {}) => {
+    req.body = (0, util_1.isEmpty)(req.body) ? req.query : req.body;
+    let redisData;
+    let ip = req.headers["x-forwarded-for"] ||
+        req.connection.remoteAddress ||
+        req.socket.remoteAddress ||
+        (req.connection.socket ? req.connection.socket.remoteAddress : null);
+    const respObj = {
+        projectId: req.projectId,
+        projectName: req.projectName,
+        route: req.originalUrl,
+        method: req.method,
+        statusCode: res.statusCode || 200,
+        request: JSON.stringify(req.body),
+        response: JSON.stringify(res),
+        ipAddress: ip,
+    };
+    redisData = await (0, drapcode_redis_1.redis_get_method)("requestLog");
+    if (!redisData)
+        redisData = [];
+    redisData.push(respObj);
+    await (0, drapcode_redis_1.redis_set_method)(`requestLog`, redisData);
 };
 exports.saveRequest = saveRequest;

package/build/query/queryBuilder.d.ts

@@ -0,0 +1,9 @@
+interface AuthDetail {
+    user?: any;
+    tenant?: any;
+    setting?: any;
+    subTenant?: any;
+}
+export declare const queryBuilder: (collectionName: string, query: any, constants: any[], externalParams: any, authDetail: AuthDetail, timezone: string, searchObj: any | undefined, refCollectionFieldsInItems: any | undefined, searchQueryTypeObj: any | undefined, lookupConfig: any | undefined, rowLevelSecurityFilter: any) => Promise<any>;
+export declare const isEntityCondition: (value: any) => boolean;
+export {};