drapcode-utility 1.8.6 → 1.8.8

package/build/encryption/index.js

@@ -121,7 +121,7 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt, enc
                                     if (!drapcode_constant_1.BelongsCreatedByRefField.includes(field === null || field === void 0 ? void 0 : field.type)) return [3 /*break*/, 6];
                                     refField = field;
                                     if (!refField.refCollection &&
-                                        field.type === drapcode_constant_1.FieldTypes.createdBy.id) {
+                                        [drapcode_constant_1.FieldTypes.createdBy.id, drapcode_constant_1.FieldTypes.updatedBy.id].includes(field.type)) {
                                         refField.refCollection = {
                                             collectionField: "userName",
                                             collectionName: "user",

package/build/encryption/utility.js

@@ -17,7 +17,8 @@ var getEncryptedReferenceFieldsQuery = function (collectionFields, projectId) {
         return drapcode_constant_1.BelongsCreatedByRefField.includes(field.type);
     });
     collectionFields.forEach(function (field) {
-        if (!field.refCollection && field.type === drapcode_constant_1.FieldTypes.createdBy.id) {
+        if (!field.refCollection &&
+            [drapcode_constant_1.FieldTypes.createdBy.id, drapcode_constant_1.FieldTypes.updatedBy.id].includes(field.type)) {
             collectionsNamesArr.push("user");
         }
         else {

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.6",
+  "version": "1.8.8",
   "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.5",
-    "drapcode-logger": "^1.3.1",
-    "drapcode-redis": "^1.2.0",
+    "drapcode-constant": "^1.6.6",
+    "drapcode-logger": "^1.3.2",
+    "drapcode-redis": "^1.2.1",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",