drapcode-utility 1.8.5 → 1.8.7

package/build/utils/check-error.js

@@ -54,6 +54,7 @@ var voca_1 = __importDefault(require("voca"));
 var checkForError = function (result, errors, mapping, status) { return __awaiter(void 0, void 0, void 0, function () {
     var finalErrors, errorMsgPath, errorValue, fError, finalFinalStatus_1, finalMessage, finalMessages_1;
     return __generator(this, function (_a) {
+        console.log("\n ==result", result);
         finalErrors = [];
         console.log("errors", errors);
         if (errors && errors.length > 0) {
@@ -79,10 +80,7 @@ var checkForError = function (result, errors, mapping, status) { return __awaite
         }
         console.log("finalErrors", finalErrors);
         if (finalErrors.length > 0) {
-            finalErrors = Array.from(new Map(finalErrors.map(function (err) { return [
-                "".concat(Number(err.status), "|").concat(err.message),
-                { status: Number(err.status), message: err.message },
-            ]; })).values());
+            finalErrors = removeDuplicateError(finalErrors);
             finalFinalStatus_1 = 400;
             finalMessage = "";
             console.log("finalMessage", finalMessage);
@@ -111,6 +109,11 @@ var checkForError = function (result, errors, mapping, status) { return __awaite
     });
 }); };
 exports.checkForError = checkForError;
+var removeDuplicateError = function (finalErrors) {
+    // Remove duplicates based only on the message
+    var uniqueErrors = Array.from(new Map(finalErrors.map(function (err) { return [err.message.trim(), err]; })).values());
+    return uniqueErrors;
+};
 var handleMultErrorConfig = function (error, result, status) {
     if (!error || Object.keys(error).length === 0) {
         return null;

package/build/utils/query-parser.d.ts

@@ -1,4 +1,4 @@
-export declare const queryParser: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj: any, refCollectionFieldsInItems: any, searchQueryTypeObj: any, currentTenant: any, currentUserSetting: any, lookupConfig: any, rowLevelSecurityFilter: any) => Promise<string>;
+export declare const queryParser: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj: any, refCollectionFieldsInItems: any, searchQueryTypeObj: any, currentTenant: any, currentUserSetting: any, lookupConfig: any, rowLevelSecurityFilter: any) => Promise<any>;
 export declare const isEntityInCondition: (value: any) => boolean;
 export declare const isFixedValueQuery: (value: any) => boolean;
 export declare const getMinMaxValue: (value: any) => {

package/build/utils/query-parser.js

@@ -63,7 +63,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
     if (currentUserSetting === void 0) { currentUserSetting = {}; }
     if (lookupConfig === void 0) { lookupConfig = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var filterQuery, rlsFilterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, resetLimit, direction, str;
+        var filterQuery, rlsFilterQuery, aggregateQuery, queryStr, searchQueryObj, _a, searchAggregateQuery, likeQuery, finalQuery, _b, searchAggregateQuery, likeQuery, projection, finder, sortBy, orderBy, offset, limit, resetLimit, direction;
         var _c, _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -166,11 +166,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(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" }, allowDiskUse: true })");
-                    str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
-                    str += ".toArray()";
-                    return [2 /*return*/, str];
+                    return [2 /*return*/, aggregateQuery];
             }
         });
     });

package/build/utils/query-paser-new.d.ts

@@ -1 +1 @@
-export declare const queryParserNew: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj?: any, refCollectionFieldsInItems?: any, searchQueryTypeObj?: any, lookupConfig?: any) => Promise<string>;
+export declare const queryParserNew: (collectionName: string, query: any, constants: any[], externalParams: any, currentUser: any, timezone: string, searchObj?: any, refCollectionFieldsInItems?: any, searchQueryTypeObj?: any, lookupConfig?: any) => Promise<any>;

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

@@ -57,7 +57,7 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
     if (searchQueryTypeObj === void 0) { searchQueryTypeObj = {}; }
     if (lookupConfig === void 0) { lookupConfig = []; }
     return __awaiter(void 0, void 0, void 0, function () {
-        var filterQuery, aggregateQuery, queryStr, searchQueryObj_1, finalQuery, likeQuery_1, projection, finder, sortBy, orderBy, aggregateFunctionField, offset, limit, direction, str;
+        var filterQuery, aggregateQuery, queryStr, searchQueryObj_1, finalQuery, likeQuery_1, projection, finder, sortBy, orderBy, aggregateFunctionField, offset, limit, direction;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
@@ -256,10 +256,8 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     if (finder != "COUNT" && limit) {
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
                     }
-                    queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" }, allowDiskUse: true })");
-                    str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
-                    str += ".toArray()";
-                    return [2 /*return*/, str];
+                    console.log("==> aggregateQuery", JSON.stringify(aggregateQuery, null, 2));
+                    return [2 /*return*/, aggregateQuery];
             }
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.8.5",
+  "version": "1.8.7",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,9 +37,9 @@
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^1.6.3",
-    "drapcode-logger": "^1.3.0",
-    "drapcode-redis": "^1.1.9",
+    "drapcode-constant": "^1.6.5",
+    "drapcode-logger": "^1.3.1",
+    "drapcode-redis": "^1.2.0",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",