ismx-nexo-node-app 0.4.133 → 0.4.135

package/dist/js/business/BusinessErrors.js

@@ -81,6 +81,8 @@ class BusinessErrors {
     getBodyParam(param, body) {
         let path = param.split(".");
         let value = body;
+        if (value === undefined || value === null)
+            this.except("0014", param);
         for (let key of path) {
             value = value[key];
             if (value === undefined || value === null)

package/dist/js/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RestUtils = exports.QueryUtils = exports.RepositoryRestFormalTemplate = exports.RepositoryRestFormal = exports.RepositoryRest = exports.RepositoryDatabasePostgres = exports.RepositoryDatabase = exports.Repository = exports.PromiseUtils = exports.ArrayUtils = exports.StringUtils = exports.NumberUtils = exports.CryptoUtils = exports.DateUtils = exports.BusinessLogger = exports.FormalError = exports.BusinessErrors = exports.BusinessThreadState = exports.BusinessThread = exports.BusinessServer = exports.FormalLoopbackBusiness = exports.FormalProxyBusiness = exports.ProxyBusiness = exports.BusinessState = exports.Business = exports.ColorUtils = exports.ServiceRestFormalTemplate = exports.ServiceRestFormal = exports.ServiceRest = exports.HttpResponse = exports.Service = void 0;
+exports.PostgresUtils = exports.RestUtils = exports.QueryUtils = exports.RepositoryRestFormalTemplate = exports.RepositoryRestFormal = exports.RepositoryRest = exports.RepositoryDatabasePostgres = exports.RepositoryDatabase = exports.Repository = exports.PromiseUtils = exports.ArrayUtils = exports.StringUtils = exports.NumberUtils = exports.CryptoUtils = exports.DateUtils = exports.BusinessLogger = exports.FormalError = exports.BusinessErrors = exports.BusinessThreadState = exports.BusinessThread = exports.BusinessServer = exports.FormalLoopbackBusiness = exports.FormalProxyBusiness = exports.ProxyBusiness = exports.BusinessState = exports.Business = exports.ColorUtils = exports.ServiceRestFormalTemplate = exports.ServiceRestFormal = exports.ServiceRest = exports.HttpResponse = exports.Service = void 0;
 const Service_1 = __importStar(require("./api/Service"));
 class Service extends Service_1.default {
 }
@@ -151,3 +151,7 @@ const RestUtils_1 = __importDefault(require("./repository/utils/RestUtils"));
 class RestUtils extends RestUtils_1.default {
 }
 exports.RestUtils = RestUtils;
+const PostgresUtils_1 = __importDefault(require("./repository/utils/PostgresUtils"));
+class PostgresUtils extends PostgresUtils_1.default {
+}
+exports.PostgresUtils = PostgresUtils;

package/dist/js/repository/RepositoryDatabasePostgres.js

@@ -35,9 +35,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PgOperator = void 0;
 const PostgresUtils_1 = __importDefault(require("./utils/PostgresUtils"));
 const RepositoryDatabase_1 = __importDefault(require("./RepositoryDatabase"));
 const Repository_1 = require("./Repository");
+class PgOperator {
+    constructor(vals, toWhere) {
+        this.toWhere = toWhere;
+        this.vals = vals;
+    }
+}
+exports.PgOperator = PgOperator;
 class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
     constructor() {
         super();
@@ -270,14 +278,22 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
                 continue;
             if (alias !== "")
                 alias += ".";
-            if (value instanceof Array)
+            if (value instanceof Array) {
                 where += ` AND ${alias}${column} = ANY(\$${iter++})`;
-            else if (value === null)
+                values.push(value);
+            }
+            else if (value instanceof PgOperator) {
+                let idxs = value.vals.map((v) => `\$${iter++}`);
+                where += ` AND ${value.toWhere(`${alias}${column}`, idxs)}`;
+                values.push(...value.vals);
+            }
+            else if (value === null) {
                 where += ` AND ${alias}${column} IS NULL`;
-            else
-                where += ` AND ${alias}${column}=\$${iter++}`;
-            if (value !== null)
+            }
+            else {
+                where += ` AND ${alias}${column} = \$${iter++}`;
                 values.push(value);
+            }
         }
         return { where, values };
     }

package/dist/js/repository/utils/PostgresUtils.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const RepositoryDatabasePostgres_1 = require("../RepositoryDatabasePostgres");
 class PostgresUtils {
     static camelToSnake(column) {
         return column.replace(/([A-Z])/g, '_$1').toLowerCase();
@@ -53,5 +54,8 @@ class PostgresUtils {
             result[key] = value;
         return result;
     }
+    static op(vals, toWhere) {
+        return new RepositoryDatabasePostgres_1.PgOperator(vals, toWhere);
+    }
 }
 exports.default = PostgresUtils;

package/dist/types/index.d.ts

@@ -103,3 +103,6 @@ export declare abstract class QueryUtils extends _QueryUtils {
 import _RestUtils from "./repository/utils/RestUtils";
 export declare abstract class RestUtils extends _RestUtils {
 }
+import _PostgresUtils from "./repository/utils/PostgresUtils";
+export declare abstract class PostgresUtils extends _PostgresUtils {
+}

package/dist/types/repository/RepositoryDatabasePostgres.d.ts

@@ -5,6 +5,11 @@ export interface Column {
     schema: string;
     default?: string;
 }
+export declare class PgOperator {
+    readonly toWhere: (column: string, params: string[]) => string;
+    readonly vals: Valuable[];
+    constructor(vals: Valuable[], toWhere: (column: string, params: string[]) => string);
+}
 export default class RepositoryDatabasePostgres extends RepositoryDatabase {
     private readonly introspectIntervalTime;
     protected client: any;
@@ -56,10 +61,10 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase {
     runTable<T>(name: string, params?: Valuable[], filters?: Partial<T>): Promise<T[]>;
     runValue<T>(name: string, params?: Valuable[], filters?: Partial<T>): Promise<Valuable | undefined>;
     toWhere(tableName: string, filters?: {
-        [key: string]: Valuable | Array<Valuable>;
+        [key: string]: Valuable | Array<Valuable> | PgOperator;
     }, alias?: string, index?: number): {
         where: string;
-        values: (string | number | symbol | Date | Valuable[])[];
+        values: (string | number | symbol | Date | Valuable[] | null | undefined)[];
     };
     anyWhere(filters: any, alias?: string, index?: number): {
         where: string;

package/dist/types/repository/utils/PostgresUtils.d.ts

@@ -1,4 +1,4 @@
-import { Column } from "../RepositoryDatabasePostgres";
+import { Column, PgOperator } from "../RepositoryDatabasePostgres";
 import { Valuable } from "../RepositoryDatabase";
 export default abstract class PostgresUtils {
     static camelToSnake(column: string): string;
@@ -15,4 +15,5 @@ export default abstract class PostgresUtils {
     static fromEntries(iterable: [string, any][]): {
         [key: string]: any;
     };
+    static op(vals: Valuable[], toWhere: (column: string, params: string[]) => string): PgOperator;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.4.133",
+  "version": "0.4.135",
   "description": "",
   "scripts": {
     "build": "rm -rf ./dist && npx tsc",

package/src/main/node/business/BusinessErrors.ts

@@ -79,6 +79,8 @@ export default class BusinessErrors {
     getBodyParam(param: string, body: any): any {
         let path = param.split(".");
         let value = body;
+        if (value === undefined || value === null)
+            this.except("0014", param);
         for (let key of path) {
             value = value[key];
             if (value === undefined || value === null) this.except("0014", param);

package/src/main/node/index.ts

@@ -97,3 +97,6 @@ export abstract class QueryUtils extends _QueryUtils {}
 
 import _RestUtils from "./repository/utils/RestUtils";
 export abstract class RestUtils extends _RestUtils {}
+
+import _PostgresUtils from "./repository/utils/PostgresUtils";
+export abstract class PostgresUtils extends _PostgresUtils {}

package/src/main/node/repository/RepositoryDatabasePostgres.ts

@@ -8,6 +8,14 @@ export interface Column {
     default?: string
 }
 
+export class PgOperator {
+    readonly toWhere: (column: string, params: string[]) => string;
+    readonly vals: Valuable[];
+    constructor(vals: Valuable[], toWhere: (column: string, params: string[]) => string) {
+        this.toWhere = toWhere; this.vals = vals;
+    }
+}
+
 export default class RepositoryDatabasePostgres extends RepositoryDatabase
 {
     private readonly introspectIntervalTime: number = 60 * 60 * 1000;
@@ -226,7 +234,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
         return this.run<T>(name, params, filters).then((result) => Object.values(result[0] ?? {})[0] as Valuable)
     }
 
-    toWhere(tableName: string, filters: { [key: string]: Valuable | Array<Valuable> }={}, alias:string = "", index=1)
+    toWhere(tableName: string, filters: { [key: string]: Valuable | Array<Valuable> | PgOperator }={}, alias:string = "", index=1)
     {
         let table = this.tables[tableName];
         let columns = PostgresUtils.columns(table);
@@ -236,10 +244,23 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
             let value = filters[PostgresUtils.snakeToCamel(column.replace(/"/g, ''))]
             if (value === undefined) continue;
             if (alias !== "") alias += "."
-            if (value instanceof Array) where += ` AND ${alias}${column} = ANY(\$${iter++})`
-            else if (value === null) where += ` AND ${alias}${column} IS NULL`
-            else where += ` AND ${alias}${column}=\$${iter++}`
-            if (value !== null) values.push(value);
+
+            if (value instanceof Array) {
+                where += ` AND ${alias}${column} = ANY(\$${iter++})`;
+                values.push(value);
+
+            } else if (value instanceof PgOperator) {
+                let idxs = value.vals.map((v) => `\$${iter++}`)
+                where += ` AND ${value.toWhere(`${alias}${column}`, idxs)}`
+                values.push(...value.vals);
+
+            } else if (value === null) {
+                where += ` AND ${alias}${column} IS NULL`
+
+            } else {
+                where += ` AND ${alias}${column} = \$${iter++}`;
+                values.push(value);
+            }
         }
 
         return { where, values };

package/src/main/node/repository/utils/PostgresUtils.ts

@@ -1,4 +1,4 @@
-import {Column} from "../RepositoryDatabasePostgres";
+import {Column, PgOperator} from "../RepositoryDatabasePostgres";
 import {Valuable} from "../RepositoryDatabase";
 
 export default abstract class PostgresUtils
@@ -68,4 +68,8 @@ export default abstract class PostgresUtils
 			result[key] = value;
 		return result;
 	}
+
+    static op(vals: Valuable[], toWhere: (column: string, params: string[]) => string): PgOperator {
+        return new PgOperator(vals, toWhere);
+    }
 }