c2-mongoose 2.1.176 → 2.1.178

package/dist/flow/SearchFlow.d.ts

@@ -2,7 +2,7 @@ import mongoose, { ClientSession } from "mongoose";
 import { SearchOptions, SearchResponse } from "../types/SearchResponse";
 declare abstract class SearchFlow {
     searchText: string;
-    order: string;
+    orderSense: string;
     orderBy: string;
     page: number;
     limit: number;

package/dist/flow/SearchFlow.js

@@ -56,7 +56,7 @@ var Utils_1 = require("../utils/Utils");
 var SearchFlow = /** @class */ (function () {
     function SearchFlow(params) {
         this.searchText = params.searchText || "";
-        this.order = params.order || "asc";
+        this.orderSense = params.order || "asc";
         this.orderBy = params.orderBy || "_id";
         this.select = params.select;
         this.populate = params.populate;
@@ -132,7 +132,7 @@ var SearchFlow = /** @class */ (function () {
     SearchFlow.prototype.buildOrdenation = function () {
         var order = {};
         this.orderBy = this.orderBy || "_id";
-        order[this.orderBy] = this.order === "desc" ? -1 : 1;
+        order[this.orderBy] = this.orderSense === "desc" ? -1 : 1;
         this.sort = order;
         return order;
     };
@@ -189,6 +189,7 @@ var SearchFlow = /** @class */ (function () {
                             ], {
                                 collation: {
                                     locale: "pt",
+                                    numericOrdering: true
                                 }
                             }).session(options === null || options === void 0 ? void 0 : options.session)];
                     case 1:
@@ -268,6 +269,7 @@ var SearchFlow = /** @class */ (function () {
                             ], {
                                 collation: {
                                     locale: "pt",
+                                    numericOrdering: true
                                 }
                             }).session(options === null || options === void 0 ? void 0 : options.session)];
                     case 1:
@@ -440,7 +442,7 @@ var SearchFlow = /** @class */ (function () {
             var key = _a[0], value = _a[1];
             if ((0, Utils_1.isNotEmpty)(value)) {
                 var condition = {};
-                if (['onlyMetadata', 'projection', 'pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+                if (['onlyMetadata', 'projection', 'pageable', 'orderSense', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                     return;
                 }
                 if (typeof value === 'string' && _this.isValidObjectId(value)) {
@@ -514,7 +516,7 @@ var SearchFlow = /** @class */ (function () {
             if (key.endsWith('Like')) {
                 return;
             }
-            if (['onlyMetadata', 'projection', 'pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+            if (['onlyMetadata', 'projection', 'pageable', 'orderSense', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
                 return;
             }
             if ((0, Utils_1.isNotEmpty)(value)) {

package/dist/flow/item/AddStageSortFlowItem.js

@@ -7,7 +7,7 @@ var GetStageSortFlowItem = /** @class */ (function () {
         var _a;
         if (facet === void 0) { facet = { items: [] }; }
         var facetAfter = facet;
-        var sortByDirection = searcher.order === "desc" ? -1 : 1;
+        var sortByDirection = searcher.orderSense === "desc" ? -1 : 1;
         var sortByField = searcher.orderBy || "_id";
         facetAfter.items.push({ $sort: (_a = {}, _a["".concat(sortByField)] = sortByDirection, _a) });
         facet = facetAfter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-mongoose",
-  "version": "2.1.176",
+  "version": "2.1.178",
   "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/SearchFlow.ts

@@ -5,7 +5,7 @@ import { isEmpty, isNotEmpty } from "../utils/Utils"
 
 abstract class SearchFlow {
   searchText: string
-  order: string
+  orderSense: string
   orderBy: string
   page: number
   limit: number
@@ -19,7 +19,7 @@ abstract class SearchFlow {
 
   constructor(params: any) {
     this.searchText = params.searchText || ""
-    this.order = params.order || "asc"
+    this.orderSense = params.order || "asc"
     this.orderBy = params.orderBy || "_id"
     this.select = params.select
     this.populate = params.populate
@@ -106,7 +106,7 @@ abstract class SearchFlow {
   public buildOrdenation() {
     let order = {} as any
     this.orderBy = this.orderBy || "_id"
-    order[this.orderBy] = this.order === "desc" ? -1 : 1
+    order[this.orderBy] = this.orderSense === "desc" ? -1 : 1
     this.sort = order
     return order
   }
@@ -170,6 +170,7 @@ abstract class SearchFlow {
       ], {
       collation: {
         locale: "pt",
+        numericOrdering: true
       }
     }
     ).session(options?.session as ClientSession)
@@ -245,6 +246,7 @@ abstract class SearchFlow {
       ], {
       collation: {
         locale: "pt",
+        numericOrdering: true
       }
     }).session(options?.session as ClientSession)
 
@@ -379,7 +381,7 @@ abstract class SearchFlow {
     Object.entries(objectSearch.model).forEach(([key, value]) => {
       if (isNotEmpty(value)) {
         let condition = {} as any
-        if (['onlyMetadata', 'projection', 'pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+        if (['onlyMetadata', 'projection', 'pageable', 'orderSense', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
           return
         }
 
@@ -463,7 +465,7 @@ abstract class SearchFlow {
       if (key.endsWith('Like')) {
         return
       }
-      if (['onlyMetadata', 'projection', 'pageable', 'order', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
+      if (['onlyMetadata', 'projection', 'pageable', 'orderSense', 'orderBy', 'properties', 'populate', 'page', 'limit', 'model', 'select', 'searchText', 'isPageable', 'searchPageable'].includes(key)) {
         return
       }
       if (isNotEmpty(value)) {

package/src/flow/item/AddStageSortFlowItem.ts

@@ -6,7 +6,7 @@ class GetStageSortFlowItem {
   add(facet: IFacet = { items: [] }, searcher: SearchFlow): IFacet {
     let facetAfter: IFacet = facet
 
-    let sortByDirection = searcher.order === "desc" ? -1 : 1
+    let sortByDirection = searcher.orderSense === "desc" ? -1 : 1
     let sortByField = searcher.orderBy || "_id"
 
     facetAfter.items.push({ $sort: { [`${sortByField}`]: sortByDirection } })