exodus-framework 2.0.731 → 2.0.732

package/lib/contracts/http.d.ts

@@ -49,12 +49,24 @@ export declare enum EApiRequestMethod {
     DELETE = "delete",
     PATCH = "patch"
 }
+export type SimpleCondition = {
+    eq?: any;
+    gt?: any;
+    lt?: any;
+    between?: [any, any];
+    notBetween?: [any, any];
+};
+export type LogicalCondition = {
+    or?: SimpleCondition[];
+    and?: SimpleCondition[];
+};
+export type IRequestFilterCondition = SimpleCondition & LogicalCondition;
 export interface IRequestListData<D> {
     page: number;
     limit?: number;
     orderBy?: keyof D;
     order?: 'ASC' | 'DESC';
-    filters?: Record<keyof D, any>;
+    filters?: Record<keyof D, IRequestFilterCondition>;
 }
 export interface IResponseListData<D> {
     total: number;

package/lib/contracts/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/contracts/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAOzC,MAAM,CAAC,OAAO,MAAM,oBAAoB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAO3E,MAAM,CAAC,OAAO,MAAM,aAAa,CAAC,CAAC,GAAG,OAAO,IAAI;IAC/C,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,CAAC,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,kBAAkB,CAAC,CAAC,GAAG,OAAO;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,CAAC,CAAC;CACV;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAQD,oBAAY,iBAAiB;IAE3B,QAAQ,MAAM;IACd,QAAQ,MAAM;IACd,OAAO,MAAM;IACb,gCAAgC,MAAM;IAEtC,yBAAyB,MAAM;IAC/B,sBAAsB,MAAM;IAG5B,iBAAiB,MAAM;IACvB,mBAAmB,MAAM;IACzB,wBAAwB,MAAM;IAC9B,oBAAoB,MAAM;IAG1B,WAAW,MAAM;IACjB,gBAAgB,MAAM;IACtB,kBAAkB,MAAM;IACxB,wBAAwB,MAAM;IAC9B,cAAc,MAAM;IACpB,uBAAuB,MAAM;IAC7B,kBAAkB,MAAM;CACzB;AACD,oBAAY,iBAAiB;IAC3B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;CAChC;AACD,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,CAAC,EAAE,CAAC;CACX;AAED,MAAM,WAAW,WAAW;CAAG;AAE/B,MAAM,MAAM,YAAY,CAAC,IAAI,GAAG,GAAG,EAAE,KAAK,GAAG,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../src/contracts/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAOzC,MAAM,CAAC,OAAO,MAAM,oBAAoB,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAO3E,MAAM,CAAC,OAAO,MAAM,aAAa,CAAC,CAAC,GAAG,OAAO,IAAI;IAC/C,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,CAAC,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,kBAAkB,CAAC,CAAC,GAAG,OAAO;IACrD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,CAAC,CAAC;CACV;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,oBAAoB,CAAC;IAC3B,IAAI,CAAC,EAAE,CAAC,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAQD,oBAAY,iBAAiB;IAE3B,QAAQ,MAAM;IACd,QAAQ,MAAM;IACd,OAAO,MAAM;IACb,gCAAgC,MAAM;IAEtC,yBAAyB,MAAM;IAC/B,sBAAsB,MAAM;IAG5B,iBAAiB,MAAM;IACvB,mBAAmB,MAAM;IACzB,wBAAwB,MAAM;IAC9B,oBAAoB,MAAM;IAG1B,WAAW,MAAM;IACjB,gBAAgB,MAAM;IACtB,kBAAkB,MAAM;IACxB,wBAAwB,MAAM;IAC9B,cAAc,MAAM;IACpB,uBAAuB,MAAM;IAC7B,kBAAkB,MAAM;CACzB;AACD,oBAAY,iBAAiB;IAC3B,IAAI,SAAS;IACb,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,EAAE,CAAC,EAAE,GAAG,CAAC;IACT,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACrB,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,EAAE,CAAC,EAAE,eAAe,EAAE,CAAC;IACvB,GAAG,CAAC,EAAE,eAAe,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,eAAe,GAAG,gBAAgB,CAAC;AAEzE,MAAM,WAAW,gBAAgB,CAAC,CAAC;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC;CACpD;AACD,MAAM,WAAW,iBAAiB,CAAC,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,CAAC,EAAE,CAAC;CACX;AAED,MAAM,WAAW,WAAW;CAAG;AAE/B,MAAM,MAAM,YAAY,CAAC,IAAI,GAAG,GAAG,EAAE,KAAK,GAAG,GAAG,IAAI,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC"}

package/lib/utils/database.d.ts

@@ -1,4 +1,7 @@
+import { WhereOptions } from '@sequelize/core';
 import { Sequelize } from 'sequelize';
+import { IRequestFilterCondition } from '../contracts';
 export declare const serviceDB: Sequelize;
 export declare const masterDB: Sequelize;
+export declare function processFilters<D>(filters?: Record<keyof D, IRequestFilterCondition>): WhereOptions<D>;
 //# sourceMappingURL=database.d.ts.map

package/lib/utils/database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC,eAAO,MAAM,SAAS,WAYpB,CAAC;AAEH,eAAO,MAAM,QAAQ,WAYnB,CAAC"}
+{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAM,SAAS,EAA2B,MAAM,WAAW,CAAC;AAEnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAGvD,eAAO,MAAM,SAAS,WAYpB,CAAC;AAEH,eAAO,MAAM,QAAQ,WAYnB,CAAC;AAsCH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,GACjD,YAAY,CAAC,CAAC,CAAC,CA+BjB"}

package/lib/utils/database.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.serviceDB = exports.masterDB = void 0;
+exports.masterDB = void 0;
+exports.processFilters = processFilters;
+exports.serviceDB = void 0;
 var _sequelize = require("sequelize");
-var _logger = _interopRequireDefault(require("./logger"));
 var _app = require("../app");
+var _logger = _interopRequireDefault(require("./logger"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const serviceDB = exports.serviceDB = new _sequelize.Sequelize({
   database: _app.Core.settings.getDatabase().service.database,
@@ -33,4 +35,65 @@ const masterDB = exports.masterDB = new _sequelize.Sequelize({
   logging(sql, timing) {
     (0, _logger.default)().trace('DATABASE', sql, timing);
   }
-});
+});
+
+// Função recursiva para processar condições simples e lógicas
+function processCondition(cond) {
+  if ('or' in cond) {
+    return {
+      [_sequelize.Op.or]: cond.or.map(subCond => processCondition(subCond))
+    };
+  }
+  if ('and' in cond) {
+    return {
+      [_sequelize.Op.and]: cond.and.map(subCond => processCondition(subCond))
+    };
+  }
+  const simpleWhere = {};
+  if (cond.eq !== undefined) {
+    simpleWhere[_sequelize.Op.eq] = cond.eq;
+  }
+  if (cond.gt !== undefined) {
+    simpleWhere[_sequelize.Op.gt] = cond.gt;
+  }
+  if (cond.lt !== undefined) {
+    simpleWhere[_sequelize.Op.lt] = cond.lt;
+  }
+  if (cond.between !== undefined) {
+    simpleWhere[_sequelize.Op.between] = cond.between;
+  }
+  if (cond.notBetween !== undefined) {
+    simpleWhere[_sequelize.Op.notBetween] = cond.notBetween;
+  }
+  return simpleWhere;
+}
+
+// Função principal para processar os filtros
+function processFilters(filters) {
+  if (!filters) {
+    return {};
+  }
+  const where = {};
+  Object.entries(filters).forEach(([key, condition]) => {
+    const field = key;
+    const processedCondition = processCondition(condition);
+
+    // Verifica se a condição é uma condição lógica global (Op.or ou Op.and)
+    if (processedCondition[_sequelize.Op.or] || processedCondition[_sequelize.Op.and]) {
+      // Mescla as condições lógicas no objeto where
+      Object.assign(where, processedCondition);
+    } else {
+      // Caso contrário, aplica a condição no campo específico
+      if (where[field] && typeof where[field] === 'object') {
+        // Combina múltiplas condições no mesmo campo com Op.and
+        where[field] = {
+          ...where[field],
+          ...processedCondition
+        };
+      } else {
+        where[field] = processedCondition;
+      }
+    }
+  });
+  return where;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exodus-framework",
-  "version": "2.0.731",
+  "version": "2.0.732",
   "description": "Exodus Framework",
   "author": "jhownpaixao",
   "license": "ISC",