c2-mongoose 2.0.6 → 2.1.0

package/dist/flow/CrudFlow.d.ts

@@ -1,12 +1,14 @@
 import mongoose from "mongoose";
+import { SearchResponse } from "../types/SearchResponse";
 import SearchFlow from "./SearchFlow";
-declare class CrudFlow<D> extends SearchFlow {
+declare class CrudFlow<D> {
     private repository;
-    constructor(repository: mongoose.Model<any>, model?: any);
+    private search;
+    constructor(repository: mongoose.Model<any>, search: SearchFlow);
     create(data: any, session?: any): Promise<any[]>;
     delete(id: string, session?: any): Promise<void>;
     update(id: string, data: D, session?: any): Promise<D>;
-    find(search: SearchFlow): Promise<SearchResponse<D>>;
+    find(): Promise<SearchResponse<D>>;
     getOne(model: D, params?: any): Promise<D>;
     get(id: string, pop?: string, sel?: string): Promise<D>;
 }

package/dist/flow/CrudFlow.js

@@ -1,19 +1,4 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -50,18 +35,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var SearchFlow_1 = __importDefault(require("./SearchFlow"));
-var CrudFlow = /** @class */ (function (_super) {
-    __extends(CrudFlow, _super);
-    function CrudFlow(repository, model) {
-        if (model === void 0) { model = {}; }
-        var _this = _super.call(this, model) || this;
-        _this.repository = repository;
-        return _this;
+var CrudFlow = /** @class */ (function () {
+    function CrudFlow(repository, search) {
+        this.repository = repository;
+        this.search = search;
     }
     CrudFlow.prototype.create = function (data, session) {
         if (session === void 0) { session = undefined; }
@@ -101,11 +79,11 @@ var CrudFlow = /** @class */ (function (_super) {
             });
         });
     };
-    CrudFlow.prototype.find = function (search) {
+    CrudFlow.prototype.find = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, search.search(this.repository)];
+                    case 0: return [4 /*yield*/, this.search.search(this.repository)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -117,7 +95,7 @@ var CrudFlow = /** @class */ (function (_super) {
             var data;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, _super.prototype.findOne.call(this, this.repository, model, params)];
+                    case 0: return [4 /*yield*/, this.search.findOne(this.repository, model, params)];
                     case 1:
                         data = _a.sent();
                         return [2 /*return*/, data];
@@ -141,5 +119,5 @@ var CrudFlow = /** @class */ (function (_super) {
         });
     };
     return CrudFlow;
-}(SearchFlow_1.default));
+}());
 exports.default = CrudFlow;

package/dist/flow/SearchFlow.d.ts

@@ -1,4 +1,5 @@
 import mongoose from "mongoose";
+import { SearchResponse } from "../types/SearchResponse";
 declare abstract class SearchFlow {
     searchText: string;
     order: string;

package/dist/flow/SearchFlow.js

@@ -181,7 +181,7 @@ var SearchFlow = /** @class */ (function () {
                         paging.limit = this.limit;
                         searchResponse = {};
                         searchResponse.items = items;
-                        searchResponse.paging = paging;
+                        searchResponse.pagination = paging;
                         return [2 /*return*/, searchResponse];
                 }
             });
@@ -253,6 +253,13 @@ var SearchFlow = /** @class */ (function () {
                     if ((0, Utils_1.isNotEmpty)(values[1])) {
                         condition[keyAux] = __assign(__assign({}, condition[keyAux]), { $lte: new Date(values[1]) });
                     }
+                    filters.$and.push(condition);
+                }
+                else if (key.endsWith('Like')) {
+                    console.log(key);
+                    var keyAux = key.replace('Like', '');
+                    condition[keyAux] = { $regex: value, $options: 'i' };
+                    filters.$and.push(condition);
                 }
                 else {
                     if (!Array.isArray(value)) {
@@ -261,8 +268,6 @@ var SearchFlow = /** @class */ (function () {
                     else {
                         condition[key] = { $in: value };
                     }
-                }
-                if ((0, Utils_1.isNotEmpty)(condition)) {
                     filters.$and.push(condition);
                 }
             }

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 import CrudFlow from "./flow/CrudFlow";
 import SearchFlow from "./flow/SearchFlow";
-export { SearchFlow, CrudFlow };
+import { Pagination, SearchResponse } from "./types/SearchResponse";
+export { CrudFlow, SearchFlow, SearchResponse, Pagination };

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CrudFlow = exports.SearchFlow = void 0;
+exports.SearchFlow = exports.CrudFlow = void 0;
 var CrudFlow_1 = __importDefault(require("./flow/CrudFlow"));
 exports.CrudFlow = CrudFlow_1.default;
 var SearchFlow_1 = __importDefault(require("./flow/SearchFlow"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.0.6",
+  "version": "2.1.0",
   "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/CrudFlow.ts

@@ -1,13 +1,15 @@
 import mongoose from "mongoose"
+import { SearchResponse } from "../types/SearchResponse"
 import SearchFlow from "./SearchFlow"
 
-class CrudFlow<D> extends SearchFlow {
+class CrudFlow<D> {
 
     private repository: mongoose.Model<any>
+    private search: any
 
-    constructor(repository: mongoose.Model<any>, model: any = {}) {
-        super(model as D)
+    constructor(repository: mongoose.Model<any>, search: SearchFlow) {
         this.repository = repository
+        this.search = search
     }
 
     public async create(data: any, session: any = undefined) {
@@ -23,12 +25,12 @@ class CrudFlow<D> extends SearchFlow {
         return dataAfter as D
     }
 
-    public async find(search: SearchFlow): Promise<SearchResponse<D>> {
-        return await search.search(this.repository)
+    public async find(): Promise<SearchResponse<D>> {
+        return await this.search.search(this.repository)
     }
 
     public async getOne(model: D, params: any = {}): Promise<D> {
-        const data = await super.findOne(this.repository, model, params)
+        const data = await this.search.findOne(this.repository, model, params)
         return data as D
     }
 

package/src/flow/SearchFlow.ts

@@ -1,5 +1,6 @@
 import mongoose from "mongoose"
 import { dbCollation } from "../configuration/Environment"
+import { Pagination, SearchResponse } from "../types/SearchResponse"
 import { isEmpty, isNotEmpty } from "../utils/Utils"
 
 abstract class SearchFlow {
@@ -117,14 +118,14 @@ abstract class SearchFlow {
   private async result(model: mongoose.Model<any>, items: []): Promise<SearchResponse<any>> {
     var total = await this.count(model)
 
-    var paging: Paging = {}
+    var paging: Pagination = {}
     paging.total = total
     paging.page = this.page
     paging.limit = this.limit
 
     var searchResponse: SearchResponse<any> = {}
     searchResponse.items = items
-    searchResponse.paging = paging
+    searchResponse.pagination = paging
 
     return searchResponse
   }
@@ -183,15 +184,18 @@ abstract class SearchFlow {
               $lte: new Date(values[1])
             }
           }
+          filters.$and.push(condition)
+        } else if (key.endsWith('Like')) {
+          console.log(key)
+          var keyAux = key.replace('Like', '')
+          condition[keyAux] = {$regex: value as any, $options: 'i'}
+          filters.$and.push(condition)
         } else {
           if (!Array.isArray(value)) {
             condition[key] = value
           } else {
             condition[key] = { $in: value }
           }
-        }
-
-        if (isNotEmpty(condition)) {
           filters.$and.push(condition)
         }
       }

package/src/index.ts

@@ -1,4 +1,5 @@
 import CrudFlow from "./flow/CrudFlow"
 import SearchFlow from "./flow/SearchFlow"
+import { Pagination, SearchResponse } from "./types/SearchResponse"
 
-export { SearchFlow, CrudFlow } 
+export { CrudFlow, SearchFlow, SearchResponse, Pagination }

package/src/types/SearchResponse.d.ts

@@ -1,9 +1,9 @@
-declare interface SearchResponse<T> {
-    paging?: Paging,
+export declare interface SearchResponse<T> {
+    pagination?: Pagination,
     items?: T[]
 }
 
-declare interface Paging {
+export declare interface Pagination {
     total?: number,
     page?: number,
     limit?: number