drapcode-utility 1.0.1 → 1.0.2

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

@@ -0,0 +1 @@
+export declare const formatFieldsOfItem: (item: any, fields: any) => any;

package/build/format-fields/index.js

@@ -0,0 +1,68 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatFieldsOfItem = void 0;
+var drapcode_constant_1 = require("drapcode-constant");
+var formatFieldsOfItem = function (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); });
+    }
+    else
+        item = formatField(item, fields);
+    return item;
+};
+exports.formatFieldsOfItem = formatFieldsOfItem;
+var formatField = function (itemData, fields) {
+    var newItemData = {};
+    Object.keys(itemData).forEach(function (key) {
+        var field = fields.find(function (field) { return field.fieldName === key; });
+        newItemData[key] = field
+            ? 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, reference = drapcode_constant_1.FieldTypes.reference, belongsTo = drapcode_constant_1.FieldTypes.belongsTo, multi_reference = drapcode_constant_1.FieldTypes.multi_reference, dynamic_option = drapcode_constant_1.FieldTypes.dynamic_option, static_option = drapcode_constant_1.FieldTypes.static_option, boolean = drapcode_constant_1.FieldTypes.boolean, time_slot = drapcode_constant_1.FieldTypes.time_slot;
+    var stringType = [
+        createdAt.id,
+        text.id,
+        large_text.id,
+        date.id,
+        password.id,
+        uuid.id,
+        custom_uuid.id,
+        email.id,
+        url.id,
+        time_slot.id,
+    ];
+    var numberType = [number.id, unix_timestamp.id];
+    var arrayType = [
+        reference.id,
+        belongsTo.id,
+        multi_reference.id,
+        dynamic_option.id,
+        static_option.id,
+    ];
+    if (stringType.includes(fieldType)) {
+        if (typeof fieldData !== "string")
+            fieldData = String(fieldData);
+    }
+    if (numberType.includes(fieldType)) {
+        if (typeof fieldData !== "number")
+            fieldData = Number(fieldData);
+    }
+    if (fieldType === boolean.id) {
+        if (typeof fieldData !== "boolean")
+            fieldData = Boolean(fieldData);
+    }
+    if (arrayType.includes(fieldType)) {
+        if (!Array.isArray(fieldData)) {
+            fieldData = fieldData ? [fieldData] : [];
+        }
+    }
+    return fieldData;
+};

package/build/index.d.ts

@@ -15,3 +15,4 @@ export * from "./utils/uuid-generator";
 export * from "./utils/check-error";
 export * from "./utils/prepare-query";
 export * from "./encryption/index";
+export * from "./format-fields/index";

package/build/index.js

@@ -27,3 +27,4 @@ __exportStar(require("./utils/uuid-generator"), exports);
 __exportStar(require("./utils/check-error"), exports);
 __exportStar(require("./utils/prepare-query"), exports);
 __exportStar(require("./encryption/index"), exports);
+__exportStar(require("./format-fields/index"), exports);

package/build/utils/check-error.js

@@ -117,6 +117,7 @@ var handleMultErrorConfig = function (error, result, status) {
         console.log("handleMultErrorConfig result :>> " + Object.keys(result));
         apiErrorMessage = lodash_1.default.get(result, message);
         if (apiErrorMessage) {
+            console.log("*** utility 3 ***");
             if (typeof apiErrorMessage == "string") {
                 console.log("It's string so leave");
             }
@@ -133,13 +134,16 @@ var handleMultErrorConfig = function (error, result, status) {
             apiErrorValue = lodash_1.default.get(result, path);
         }
         else {
+            console.log("*** utility 7 ***");
             apiErrorValue = status;
         }
+        console.log("*** utility 8 ***");
     }
     else {
         console.log("result", result);
         apiErrorValue = status;
     }
+    console.log("apiErrorValue", apiErrorValue);
     apiErrorValue = "" + apiErrorValue;
     console.log("apiErrorMessage", apiErrorMessage);
     console.log("apiErrorValue", apiErrorValue);
@@ -150,6 +154,7 @@ var handleMultErrorConfig = function (error, result, status) {
         };
     }
     else if (["false", "error", "fail", "failed"].includes(apiErrorValue.toLowerCase())) {
+        console.log("*** utility 9 ***");
         return {
             status: 400,
             message: apiErrorMessage,
@@ -158,6 +163,8 @@ var handleMultErrorConfig = function (error, result, status) {
     else if (voca_1.default.startsWith(apiErrorValue, "3") ||
         voca_1.default.startsWith(apiErrorValue, "4") ||
         voca_1.default.startsWith(apiErrorValue, "5")) {
+        console.log("*** utility 10 ***");
+        console.log("Compare 4");
         return {
             status: apiErrorValue,
             message: apiErrorMessage,

package/build/utils/query-parser.js

@@ -66,10 +66,17 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     if (!query)
                         return [2 /*return*/, ""];
                     console.log("***1*** queryParser ***");
+                    console.log("%%%%% refCollectionFieldsInItems", JSON.stringify(refCollectionFieldsInItems));
+                    console.log("%%%% timezone", timezone);
+                    console.log("collectionName", collectionName);
+                    console.log("query", JSON.stringify(query));
+                    console.log("constants", JSON.stringify(constants));
+                    console.log("externalParams", JSON.stringify(externalParams));
+                    console.log("currentUser", JSON.stringify(currentUser));
+                    console.log("searchObj", JSON.stringify(searchObj));
+                    console.log("searchQueryTypeObj", JSON.stringify(searchQueryTypeObj));
                     filterQuery = mongoFilterQuery(query, externalParams, constants, currentUser, currentTenant, timezone);
-                    console.log("**************************");
                     console.log("filterQuery", JSON.stringify(filterQuery));
-                    console.log("==> searchQueryTypeObj :>>", searchQueryTypeObj);
                     aggregateQuery = [];
                     queryStr = ".aggregate([])";
                     if (filterQuery.length &&
@@ -79,17 +86,22 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         if (searchObj) {
                             _a = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _a.searchAggregateQuery, likeQuery = _a.likeQuery;
                             aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
+                            console.log("likeQuery after getSearchObjQuery", JSON.stringify(likeQuery));
                             if (likeQuery && likeQuery.length > 0) {
                                 searchQueryObj = likeQuery;
                             }
                         }
+                        console.log("aggregateQuery After search object condition", JSON.stringify(aggregateQuery));
+                        console.log("searchQueryObj", JSON.stringify(searchQueryObj));
                         finalQuery = { $and: filterQuery };
                         if (searchQueryObj) {
                             (_c = finalQuery.$and).push.apply(_c, searchQueryObj);
                         }
+                        console.log("finalQuery after", JSON.stringify(finalQuery));
                         aggregateQuery.push({ $match: finalQuery });
                     }
                     else if (searchObj) {
+                        console.log("I donot have filter query");
                         _b = getSearchObjQuery(searchObj, searchQueryTypeObj, timezone), searchAggregateQuery = _b.searchAggregateQuery, likeQuery = _b.likeQuery;
                         aggregateQuery = __spreadArray(__spreadArray([], aggregateQuery), searchAggregateQuery);
                         if (likeQuery.length) {
@@ -97,6 +109,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                             aggregateQuery.push({ $match: { $and: likeQuery } });
                         }
                     }
+                    console.log("aggregateQuery", JSON.stringify(aggregateQuery));
                     console.log("==> query", query);
                     projection = mongoSelectQuery(query);
                     finder = query.finder, sortBy = query.sortBy, orderBy = query.orderBy;
@@ -208,6 +221,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
                     }
                     console.log("==> aggregateQuery", aggregateQuery);
+                    console.log("==> aggregateQuery", JSON.stringify(aggregateQuery));
                     queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
                     str = "req.db.collection('" + collectionName + "')" + queryStr;
                     str += ".toArray()";

package/build/utils/query-paser-new.js

@@ -191,14 +191,11 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                                 }
                             }
                         });
-                        console.log("==> aggregateQuery", aggregateQuery);
-                        console.log("==> likeQuery", likeQuery_1);
                         if (likeQuery_1.length) {
                             // aggregateQuery.push({ $match: { $or: likeQuery } });
                             aggregateQuery.push({ $match: { $and: likeQuery_1 } });
                         }
                     }
-                    console.log("==> query", query);
                     projection = mongoSelectQuery(query);
                     finder = query.finder, sortBy = query.sortBy, orderBy = query.orderBy, aggregateFunctionField = query.aggregateFunctionField;
                     if (!(finder != "COUNT" && refCollectionFieldsInItems)) return [3 /*break*/, 2];
@@ -329,7 +326,6 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     if (finder != "COUNT" && limit) {
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
                     }
-                    console.log("==> aggregateQuery", JSON.stringify(aggregateQuery, null, 2));
                     queryStr = ".aggregate(" + JSON.stringify(aggregateQuery) + ", { collation: { locale: \"en\" } })";
                     str = "req.db.collection('" + collectionName + "')" + queryStr;
                     str += ".toArray()";
@@ -601,20 +597,16 @@ var replaceExternalParams = function (query, requiredExternal, externalParams, c
         else
             return startValue_1 + "---" + endValue_1;
     }
-    console.log("==> value", value);
-    console.log("==> currentUser", currentUser);
     if (value.includes(drapcode_constant_1.CURRENT_USER)) {
         if (value === drapcode_constant_1.CURRENT_USER) {
             return currentUser["uuid"];
         }
         var splitValues = value.split("::");
-        console.log("splitValues", splitValues);
         var refCollection = splitValues[1];
         var refCollectionField = splitValues[2];
         if (refCollection && refCollectionField) {
             console.log("I have refCollection and Field");
             var refCollectionData = currentUser[refCollection];
-            console.log("refCollectionData", refCollectionData);
             if (!refCollectionData) {
                 return "";
             }

package/build/utils/util.js

@@ -263,6 +263,8 @@ var replaceDataValueIntoExpression = function (expression, data, user, sessionVa
         else {
             if (Object.keys(data).length > 0) {
                 dataOfItem = exports.parseValueFromData(data, prop);
+                //TODO: Need better way
+                delete data[prop];
             }
         }
         expression = replaceValueInExpression(needle, dataOfItem, expression);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",