c2-mongoose 2.1.407 → 2.1.409

package/dist/flow/searcher/v3/item/BuildAndQueriesFlowItem.js

@@ -24,6 +24,7 @@ var BuildAndQueriesFlowItem = /** @class */ (function () {
     BuildAndQueriesFlowItem.prototype.execute = function (filters, model) {
         var andQueriesParam = undefined;
         Object.entries(filters).forEach(function (_a) {
+            var _b;
             var key = _a[0], value = _a[1];
             if (value !== undefined || value === null) {
                 if ([
@@ -57,7 +58,7 @@ var BuildAndQueriesFlowItem = /** @class */ (function () {
                     return;
                 }
                 if (key.startsWith("$")) {
-                    andQueriesParam = __assign(__assign({}, andQueriesParam), value);
+                    andQueriesParam = __assign(__assign({}, andQueriesParam), (_b = {}, _b[key] = value, _b));
                     return;
                 }
                 if (typeof value === 'string' && IsValidObjectIdFlowItem_1.default.exec(value) && key !== 'owner' && key !== 'identifier') {

package/dist/flow/searcher/v3/item/BuildConditionSearchTextFlowItem.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var BuildRegexFlowItem_1 = __importDefault(require("../../v2/item/BuildRegexFlowItem"));
 var ExtractFieldsOfTypeFlowItem_1 = __importDefault(require("../../v2/item/ExtractFieldsOfTypeFlowItem"));
+var IsValidObjectIdFlowItem_1 = __importDefault(require("./IsValidObjectIdFlowItem"));
 var BuildConditionSearchTextFlowItem = /** @class */ (function () {
     function BuildConditionSearchTextFlowItem() {
     }
@@ -13,10 +14,22 @@ var BuildConditionSearchTextFlowItem = /** @class */ (function () {
         var conditions = undefined;
         var camposString = !filters.searchTextFields ? ExtractFieldsOfTypeFlowItem_1.default.exec(model.schema, 'String') : filters.searchTextFields;
         if (filters.searchText && camposString) {
-            var regex = BuildRegexFlowItem_1.default.exec(filters.searchText);
             conditions = { $or: [] };
+            var regex = BuildRegexFlowItem_1.default.exec(filters.searchText);
             for (var _i = 0, camposString_1 = camposString; _i < camposString_1.length; _i++) {
                 var fieldString = camposString_1[_i];
+                if (IsValidObjectIdFlowItem_1.default.exec(camposString)) {
+                    var conditionAux_1 = {};
+                    conditionAux_1["$expr"] = {
+                        "$regexMatch": {
+                            input: { $toString: "$_id" },
+                            regex: filters.searchText,
+                            options: "i" // (opcional) case insensitive
+                        }
+                    };
+                    conditions.$or.push(conditionAux_1);
+                    continue;
+                }
                 var conditionAux = {};
                 conditionAux[fieldString] = { $regex: regex };
                 conditions.$or.push(conditionAux);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.407",
+  "version": "2.1.409",
   "description": "Lib to make any search in database mongoose and use as basic crud",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/flow/searcher/v3/item/BuildAndQueriesFlowItem.ts

@@ -40,7 +40,7 @@ class BuildAndQueriesFlowItem {
         }
 
         if (key.startsWith("$")) {
-          andQueriesParam = { ...andQueriesParam, ...value }
+          andQueriesParam = { ...andQueriesParam, ...{ [key]: value} }
           return
         }
         if (typeof value === 'string' && IsValidObjectIdFlowItem.exec(value as string) && key !== 'owner' && key !== 'identifier') {

package/src/flow/searcher/v3/item/BuildConditionSearchTextFlowItem.ts

@@ -1,6 +1,7 @@
 import mongoose from "mongoose"
 import BuildRegexFlowItem from "../../v2/item/BuildRegexFlowItem"
 import ExtractFieldsOfTypeFlowItem from "../../v2/item/ExtractFieldsOfTypeFlowItem"
+import IsValidObjectIdFlowItem from "./IsValidObjectIdFlowItem"
 
 class BuildConditionSearchTextFlowItem {
   execute(filters: any, model: mongoose.Model<any>) {
@@ -8,9 +9,25 @@ class BuildConditionSearchTextFlowItem {
     let conditions = undefined
     const camposString = !filters.searchTextFields ? ExtractFieldsOfTypeFlowItem.exec(model.schema, 'String') : filters.searchTextFields
     if (filters.searchText && camposString) {
-      let regex = BuildRegexFlowItem.exec(filters.searchText)
       conditions = { $or: [] as any }
+      let regex = BuildRegexFlowItem.exec(filters.searchText)
+
       for (let fieldString of camposString) {
+
+        if (IsValidObjectIdFlowItem.exec(camposString)) {
+          let conditionAux: { [key: string]: any } = {}
+          conditionAux["$expr"] = {
+            "$regexMatch": {
+              input: { $toString: "$_id" }, // converte ObjectId -> string
+              regex: filters.searchText,              // substring a procurar
+              options: "i"                  // (opcional) case insensitive
+            }
+          }
+          conditions.$or.push(conditionAux)
+          continue
+        }
+
+
         let conditionAux: { [key: string]: any } = {}
         conditionAux[fieldString] = { $regex: regex }