c2-mongoose 2.1.229 → 2.1.230

package/dist/flow/SearcherFlow.d.ts

@@ -1,6 +1,5 @@
 import mongoose from "mongoose";
 import { SearchOptions, SearchResponse } from "../types/SearchResponse";
-import SearchFlow from "./SearchFlow";
 export interface IPopulate {
     [key: string]: any;
     path: string;
@@ -19,12 +18,13 @@ declare class SearcherFlow<D> {
     private select;
     private populate;
     private filters;
-    constructor(repository: mongoose.Model<any>, search?: SearchFlow);
+    constructor(repository: mongoose.Model<any>);
     prepareSearch(search: any): void;
-    search(model: mongoose.Model<any>, options: SearchOptions): Promise<SearchResponse<D>>;
+    search(options: SearchOptions): Promise<SearchResponse<D>>;
     transformObject(originalObject: any): any;
     buildDefaultFilters(objectSearch: any): any;
     isValidObjectId(value: string): boolean;
     buildOrdenation(): any;
+    buildRegex(searchText: string): RegExp;
 }
 export default SearcherFlow;

package/dist/flow/SearcherFlow.js

@@ -56,7 +56,7 @@ var Utils_1 = require("../utils/Utils");
 var BuildPopulateSingleFlowItem_1 = __importDefault(require("./item/BuildPopulateSingleFlowItem"));
 var BuildSelectSingleFlowItem_1 = __importDefault(require("./item/BuildSelectSingleFlowItem"));
 var SearcherFlow = /** @class */ (function () {
-    function SearcherFlow(repository, search) {
+    function SearcherFlow(repository) {
         this.searchText = "";
         this.orderSense = "desc";
         this.orderBy = "_id";
@@ -67,9 +67,6 @@ var SearcherFlow = /** @class */ (function () {
         this.populate = [""];
         this.filters = undefined;
         this.model = repository;
-        for (var key in search) {
-            this[key] = search[key];
-        }
     }
     SearcherFlow.prototype.prepareSearch = function (search) {
         for (var key in search) {
@@ -78,17 +75,13 @@ var SearcherFlow = /** @class */ (function () {
         this.filters = this.buildDefaultFilters(this);
         this.page = Number(this.page);
         this.limit = Number(this.limit);
-        // this.projection = this.buildProjections()
-        // this.populate = this.buildPopulate()
-        // this.buildOrdenation()
     };
-    SearcherFlow.prototype.search = function (model, options) {
+    SearcherFlow.prototype.search = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             var stagesItems, stagesPaging, stagesMetadata, facet, _i, stagesMetadata_1, metadata, result, _a, resultAux;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        console.log("new searcher");
                         stagesItems = [];
                         if ((0, Utils_1.isNotEmpty)(options.pipelines)) {
                             stagesItems.push.apply(stagesItems, options.pipelines);
@@ -98,7 +91,7 @@ var SearcherFlow = /** @class */ (function () {
                         }
                         stagesItems.push({ $match: this.filters });
                         if ((0, Utils_1.isNotEmpty)(this.select)) {
-                            stagesItems.push({ $project: BuildSelectSingleFlowItem_1.default.build(model, this.select) });
+                            stagesItems.push({ $project: BuildSelectSingleFlowItem_1.default.build(this.model, this.select) });
                         }
                         stagesItems.push({ $sort: this.buildOrdenation() });
                         if (this.pageable === true) {
@@ -142,7 +135,7 @@ var SearcherFlow = /** @class */ (function () {
                             metadata = stagesMetadata_1[_i];
                             facet[metadata.id] = metadata.conditions;
                         }
-                        return [4 /*yield*/, model.aggregate([
+                        return [4 /*yield*/, this.model.aggregate([
                                 {
                                     $facet: facet
                                 },
@@ -156,7 +149,7 @@ var SearcherFlow = /** @class */ (function () {
                         result = _b.sent();
                         if (!(0, Utils_1.isNotEmpty)(this.populate)) return [3 /*break*/, 3];
                         _a = result[0];
-                        return [4 /*yield*/, model.populate(result[0].items, BuildPopulateSingleFlowItem_1.default.buildPopulate(model, this.populate, this.select))];
+                        return [4 /*yield*/, this.model.populate(result[0].items, BuildPopulateSingleFlowItem_1.default.buildPopulate(this.model, this.populate, this.select))];
                     case 2:
                         _a.items = _b.sent();
                         _b.label = 3;
@@ -187,6 +180,10 @@ var SearcherFlow = /** @class */ (function () {
     };
     SearcherFlow.prototype.buildDefaultFilters = function (objectSearch) {
         var _this = this;
+        // Recuperar todos os campos do tipo String
+        var camposString = Object.keys(this.model.schema.paths).filter(function (campo) {
+            return _this.model.schema.paths[campo].instance === 'String';
+        });
         var filters = { $and: [] };
         Object.entries(objectSearch).forEach(function (_a) {
             var key = _a[0], value = _a[1];
@@ -276,6 +273,17 @@ var SearcherFlow = /** @class */ (function () {
                 }
             }
         });
+        if ((0, Utils_1.isNotEmpty)(this.searchText) && (0, Utils_1.isNotEmpty)(camposString)) {
+            var regex = this.buildRegex(this.searchText);
+            var conditions = { $or: [] };
+            for (var _i = 0, camposString_1 = camposString; _i < camposString_1.length; _i++) {
+                var fieldString = camposString_1[_i];
+                var conditionAux = {};
+                conditionAux[fieldString] = { $regex: regex };
+                conditions.$or.push(conditionAux);
+            }
+            filters.$and.push(conditions);
+        }
         if (filters.$and.length === 0)
             delete filters['$and'];
         return filters;
@@ -290,6 +298,22 @@ var SearcherFlow = /** @class */ (function () {
         order[this.orderBy] = this.orderSense === "desc" ? -1 : 1;
         return order;
     };
+    SearcherFlow.prototype.buildRegex = function (searchText) {
+        var regexExpression = searchText
+            .replace(/[+?^${}()|[\]\\]/g, '\\$&') //Tratar os caracteres que podem ser chaves, escape os demais q podem ser regex
+            .replace(/^"/, '^').replace(/"$/, '$') //Replace aspas duplas para busca exata
+            .replace(/^%22/, '^').replace(/%22$/, '$') //Replace aspas duplas para busca exata
+            .replace(/%20/, ' ') //Replace espaço em branco para nao quebrar o proximo replace
+            .replace(/\*/g, '.*?') //Replace % para o padrão regex (% é muito utilizado como o .*? e é mais simples para o usuario digitar)
+            .replace(/%/g, '.*?') //Replace % para o padrão regex (% é muito utilizado como o .*? e é mais simples para o usuario digitar)
+            .replace(/[ç|Ç|c|C]/g, '[c,C,ç,Ç]')
+            .replace(/[a|á|à|ä|â|A|Á|Â|Ã|Ä]/g, '[a,á,à,ä,â,A,Á,Â,Ã,Ä]')
+            .replace(/[e|é|ë|è|E|É|Ë|È]/g, '[e,é,ë,è,E,É,Ë,È]')
+            .replace(/[i|í|ï|ì|I|Í|Ï|Ì]/g, '[i,í,ï,ì,I,Í,Ï,Ì]')
+            .replace(/[o|ó|ö|ò|õ|O|Ó|Ö|Ô|Õ]/g, '[o,ó,ö,ò,õ,O,Ó,Ö,Ô,Õ]')
+            .replace(/[u|ü|ú|ù|U|Ú|Ü|Ù]/g, '[u,ü,ú,ù,U,Ú,Ü,Ù]');
+        return new RegExp("".concat(regexExpression), 'i');
+    };
     return SearcherFlow;
 }());
 exports.default = SearcherFlow;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.229",
+  "version": "2.1.230",
   "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/SearcherFlow.ts

@@ -28,11 +28,8 @@ class SearcherFlow<D> {
     private populate: string[] = [""]
     private filters: any = undefined
 
-    constructor(repository: mongoose.Model<any>, search?: SearchFlow) {
+    constructor(repository: mongoose.Model<any>) {
         this.model = repository
-        for (const key in search) {
-            this[key] = search[key];
-        }
     }
 
     public prepareSearch(search: any) {
@@ -43,14 +40,10 @@ class SearcherFlow<D> {
         this.filters = this.buildDefaultFilters(this)
         this.page = Number(this.page)
         this.limit = Number(this.limit)
-        // this.projection = this.buildProjections()
-        // this.populate = this.buildPopulate()
-        // this.buildOrdenation()
     }
 
-    async search(model: mongoose.Model<any>, options: SearchOptions): Promise<SearchResponse<D>> {
+    async search(options: SearchOptions): Promise<SearchResponse<D>> {
 
-        console.log("new searcher")
         let stagesItems: any[] = []
 
         if (isNotEmpty(options.pipelines)) {
@@ -63,7 +56,7 @@ class SearcherFlow<D> {
         stagesItems.push({ $match: this.filters })
 
         if (isNotEmpty(this.select)) {
-            stagesItems.push({ $project: BuildSelectSingleFlowItem.build(model, this.select) })
+            stagesItems.push({ $project: BuildSelectSingleFlowItem.build(this.model, this.select) })
         }
 
         stagesItems.push({ $sort: this.buildOrdenation() })
@@ -114,7 +107,7 @@ class SearcherFlow<D> {
             facet[metadata.id] = metadata.conditions
         }
 
-        const result = await model.aggregate(
+        const result = await this.model.aggregate(
             [
                 {
                     $facet: facet
@@ -128,7 +121,7 @@ class SearcherFlow<D> {
 
 
         if (isNotEmpty(this.populate)) {
-            result[0].items = await model.populate(result[0].items, BuildPopulateSingleFlowItem.buildPopulate(model, this.populate, this.select))
+            result[0].items = await this.model.populate(result[0].items, BuildPopulateSingleFlowItem.buildPopulate(this.model, this.populate, this.select))
         }
 
         let resultAux = this.transformObject(result[0])
@@ -161,6 +154,13 @@ class SearcherFlow<D> {
     }
 
     public buildDefaultFilters(objectSearch: any) {
+
+        // Recuperar todos os campos do tipo String
+        const camposString = Object.keys(this.model.schema.paths).filter((campo: string) => {
+            return this.model.schema.paths[campo].instance === 'String';
+        });
+
+
         let filters = { $and: [] } as any
         Object.entries(objectSearch).forEach(([key, value]) => {
             if (isNotEmpty(value)) {
@@ -258,6 +258,18 @@ class SearcherFlow<D> {
             }
         })
 
+        if (isNotEmpty(this.searchText) && isNotEmpty(camposString)) {
+            let regex = this.buildRegex(this.searchText)
+            let conditions = { $or: [] as any }
+            for (let fieldString of camposString) {
+                let conditionAux: { [key: string]: any } = {}
+                conditionAux[fieldString] = { $regex: regex }
+
+                conditions.$or.push(conditionAux)
+            }
+            filters.$and.push(conditions)
+        }
+
         if (filters.$and.length === 0)
             delete filters['$and']
 
@@ -274,7 +286,24 @@ class SearcherFlow<D> {
         this.orderBy = this.orderBy
         order[this.orderBy] = this.orderSense === "desc" ? -1 : 1
         return order
-      }
+    }
+
+    buildRegex(searchText: string): RegExp {
+        let regexExpression = searchText
+            .replace(/[+?^${}()|[\]\\]/g, '\\$&') //Tratar os caracteres que podem ser chaves, escape os demais q podem ser regex
+            .replace(/^"/, '^').replace(/"$/, '$') //Replace aspas duplas para busca exata
+            .replace(/^%22/, '^').replace(/%22$/, '$') //Replace aspas duplas para busca exata
+            .replace(/%20/, ' ')  //Replace espaço em branco para nao quebrar o proximo replace
+            .replace(/\*/g, '.*?') //Replace % para o padrão regex (% é muito utilizado como o .*? e é mais simples para o usuario digitar)
+            .replace(/%/g, '.*?') //Replace % para o padrão regex (% é muito utilizado como o .*? e é mais simples para o usuario digitar)
+            .replace(/[ç|Ç|c|C]/g, '[c,C,ç,Ç]')
+            .replace(/[a|á|à|ä|â|A|Á|Â|Ã|Ä]/g, '[a,á,à,ä,â,A,Á,Â,Ã,Ä]')
+            .replace(/[e|é|ë|è|E|É|Ë|È]/g, '[e,é,ë,è,E,É,Ë,È]')
+            .replace(/[i|í|ï|ì|I|Í|Ï|Ì]/g, '[i,í,ï,ì,I,Í,Ï,Ì]')
+            .replace(/[o|ó|ö|ò|õ|O|Ó|Ö|Ô|Õ]/g, '[o,ó,ö,ò,õ,O,Ó,Ö,Ô,Õ]')
+            .replace(/[u|ü|ú|ù|U|Ú|Ü|Ù]/g, '[u,ü,ú,ù,U,Ú,Ü,Ù]')
+        return new RegExp(`${regexExpression}`, 'i');
+    }
 }
 
 export default SearcherFlow