ismx-nexo-node-app 0.4.90 → 0.4.92

package/dist/js/api/ServiceRestFormalTemplate.js

@@ -72,6 +72,9 @@ class ServiceRestFormalTemplate {
             return entity;
         });
     }
+    defaultFilter() {
+        return {};
+    }
     /**
      * Handles GET requests by retrieving a single record from the database based on the provided request.
      *
@@ -93,7 +96,8 @@ class ServiceRestFormalTemplate {
      */
     serveGetList(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            let entities = yield this.database.find(this.tableName, Object.assign({}, request.query));
+            let filters = Object.assign(Object.assign({}, this.defaultFilter()), request.query);
+            let entities = yield this.database.find(this.tableName, filters);
             let result = yield Promise.all(entities.map((entity) => this.extendEntity(entity)));
             return Service_1.HttpResponse.ok(result);
         });
@@ -107,7 +111,8 @@ class ServiceRestFormalTemplate {
     servePage(request) {
         return __awaiter(this, void 0, void 0, function* () {
             let { maxResults, pageNumber } = this.getFormalPage(request);
-            let result = yield this.database.page(this.tableName, "timestamp", maxResults, pageNumber);
+            let filters = Object.assign(Object.assign({}, this.defaultFilter()), request.query);
+            let result = yield this.database.page(this.tableName, "timestamp", maxResults, pageNumber, filters);
             result.elements = yield Promise.all(result.elements.map((entity) => this.extendEntity(entity)));
             return Service_1.HttpResponse.ok(result);
         });
@@ -120,7 +125,8 @@ class ServiceRestFormalTemplate {
      */
     serveMap(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            let results = yield this.database.find(this.tableName, Object.assign({}, request.query));
+            let filters = Object.assign(Object.assign({}, this.defaultFilter()), request.query);
+            let results = yield this.database.find(this.tableName, filters);
             let extended = results.map((entity) => this.extendEntity(entity));
             let response = {};
             yield Promise.all(extended).then((entities) => {
@@ -145,9 +151,10 @@ class ServiceRestFormalTemplate {
     serveGetKeymap(request) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
+            let filters = Object.assign(Object.assign({}, this.defaultFilter()), request.query);
             let key = (_b = (_a = request.query) === null || _a === void 0 ? void 0 : _a["_key"]) !== null && _b !== void 0 ? _b : this.indexer;
             let value = (_d = (_c = request.query) === null || _c === void 0 ? void 0 : _c["_value"]) !== null && _d !== void 0 ? _d : "value";
-            let keymap = yield this.database.group(this.tableName, key, value, Object.assign({}, request.query));
+            let keymap = yield this.database.group(this.tableName, key, value, filters);
             let result = {};
             for (let key of Object.keys(keymap))
                 result[key] = keymap[key][0];
@@ -167,7 +174,7 @@ class ServiceRestFormalTemplate {
             (_a = request.body) === null || _a === void 0 ? true : delete _a[this.indexer];
             let entity = yield this.database.update(this.tableName, id, request.body);
             let result = (yield this.serveGet({ query: { [this.indexer]: id } })).content;
-            return Service_1.HttpResponse.ok(result);
+            return Service_1.HttpResponse.ok(result ? yield this.extendEntity(result) : result);
         });
     }
     /**
@@ -182,7 +189,7 @@ class ServiceRestFormalTemplate {
             let entity = yield this.database.add(this.tableName, request.body);
             let id = entity[this.indexer];
             let result = (yield this.serveGet({ query: { [this.indexer]: id } })).content;
-            return Service_1.HttpResponse.ok(result);
+            return Service_1.HttpResponse.ok(result ? yield this.extendEntity(result) : result);
         });
     }
     servePostList(request) {
@@ -203,18 +210,21 @@ class ServiceRestFormalTemplate {
             var _a, _b, _c;
             let selection = (_b = (_a = request.query) === null || _a === void 0 ? void 0 : _a["selection"]) !== null && _b !== void 0 ? _b : this.indexer;
             (_c = request.query) === null || _c === void 0 ? true : delete _c["selection"];
-            let select = yield this.database.select(this.tableName, selection, Object.assign({}, request.query));
+            let filters = Object.assign(Object.assign({}, this.defaultFilter()), request.query);
+            let select = yield this.database.select(this.tableName, selection, filters);
             return Service_1.HttpResponse.ok(select);
         });
     }
     serveExist(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            return Service_1.HttpResponse.ok((yield this.database.count(this.tableName, Object.assign({}, request.query))) > 0);
+            let filters = Object.assign(Object.assign({}, this.defaultFilter()), request.query);
+            return Service_1.HttpResponse.ok((yield this.database.count(this.tableName, filters)) > 0);
         });
     }
     serveCount(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            return Service_1.HttpResponse.ok((yield this.database.count(this.tableName, Object.assign({}, request.query))));
+            let filters = Object.assign(Object.assign({}, this.defaultFilter()), request.query);
+            return Service_1.HttpResponse.ok((yield this.database.count(this.tableName, filters)));
         });
     }
     serveDel(request) {
@@ -222,7 +232,7 @@ class ServiceRestFormalTemplate {
             let entity = (yield this.serveGet(request)).content;
             if (entity)
                 yield this.database.delete(this.tableName, entity[this.indexer]);
-            return Service_1.HttpResponse.ok(entity);
+            return Service_1.HttpResponse.ok(entity ? yield this.extendEntity(entity) : entity);
         });
     }
 }

package/dist/js/business/utils/ArrayUtils.js

@@ -1,4 +1,13 @@
 "use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 class ArrayUtils {
     /**
@@ -77,5 +86,16 @@ class ArrayUtils {
     static subtract(arr1, arr2) {
         return arr1.filter(item => !arr2.includes(item));
     }
+    /**
+     *
+     * @param array
+     * @param predicate
+     */
+    static filterAsync(array, predicate) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield Promise.all(array.map((item, idx) => __awaiter(this, void 0, void 0, function* () { return !!(yield predicate(item, idx, array)); })));
+            return array.filter((_, index) => results[index]);
+        });
+    }
 }
 exports.default = ArrayUtils;

package/dist/types/api/ServiceRestFormalTemplate.d.ts

@@ -35,6 +35,7 @@ export default class ServiceRestFormalTemplate<Model = any> {
         pageNumber: number;
     };
     extendEntity<T extends Model = Model>(entity: Model): Promise<T>;
+    defaultFilter(): Partial<Transient<Model>>;
     /**
      * Handles GET requests by retrieving a single record from the database based on the provided request.
      *

package/dist/types/business/utils/ArrayUtils.d.ts

@@ -51,4 +51,10 @@ export default abstract class ArrayUtils {
      * @template T
      */
     static subtract<T>(arr1: T[], arr2: T[]): T[];
+    /**
+     *
+     * @param array
+     * @param predicate
+     */
+    static filterAsync<T>(array: T[], predicate: (value: T, index: number, array: T[]) => boolean | Promise<boolean>): Promise<T[]>;
 }

package/package.json

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

package/src/main/node/api/ServiceRestFormalTemplate.ts

@@ -2,6 +2,7 @@ import {HttpRequest, HttpResponse} from "./Service";
 import ServiceRestFormal, {Wrapper} from "./ServiceRestFormal";
 import {Pagination, Transient} from "../repository/Repository";
 import RepositoryDatabase from "../repository/RepositoryDatabase";
+import ArrayUtils from "../business/utils/ArrayUtils";
 
 export default class ServiceRestFormalTemplate<Model=any>
 {
@@ -81,6 +82,10 @@ export default class ServiceRestFormalTemplate<Model=any>
 		return entity as T;
 	}
 
+	defaultFilter(): Partial<Transient<Model>> {
+		return {};
+	}
+
 	/**
 	 * Handles GET requests by retrieving a single record from the database based on the provided request.
 	 *
@@ -100,7 +105,8 @@ export default class ServiceRestFormalTemplate<Model=any>
 	 * @return {Promise<HttpResponse<Model[]>>} A promise that resolves to an HTTP response containing an array of models.
 	 */
 	protected async serveGetList(request: HttpRequest): Promise<HttpResponse<Model[]>> {
-		let entities = await this.database.find<Model>(this.tableName, { ...request.query });
+		let filters = { ...this.defaultFilter(), ...request.query };
+		let entities = await this.database.find<Model>(this.tableName, filters);
 		let result = await Promise.all(entities.map((entity) => this.extendEntity(entity)));
 		return HttpResponse.ok(result);
 	}
@@ -113,7 +119,8 @@ export default class ServiceRestFormalTemplate<Model=any>
 	 */
 	protected async servePage(request: HttpRequest): Promise<HttpResponse<Pagination<Model>>> {
 		let { maxResults, pageNumber } = this.getFormalPage(request);
-		let result = await this.database.page<Model>(this.tableName, "timestamp", maxResults, pageNumber);
+		let filters = { ...this.defaultFilter(), ...request.query };
+		let result = await this.database.page<Model>(this.tableName, "timestamp", maxResults, pageNumber, filters);
 		result.elements = await Promise.all(result.elements.map((entity) => this.extendEntity(entity)));
 		return HttpResponse.ok(result);
 	}
@@ -125,7 +132,8 @@ export default class ServiceRestFormalTemplate<Model=any>
 	 * @return {Promise<HttpResponse<{[key: string]: Model}>>} A promise that resolves to an HTTP response containing a map of models, where the key is derived from the indexed property of each model.
 	 */
 	protected async serveMap(request: HttpRequest): Promise<HttpResponse<{[key: string]: Model}>> {
-		let results = await this.database.find<Model>(this.tableName, { ...request.query });
+		let filters = { ...this.defaultFilter(), ...request.query };
+		let results = await this.database.find<Model>(this.tableName, filters);
 		let extended = results.map((entity) => this.extendEntity(entity));
 
 		let response: {[key: string]: Model} = {};
@@ -147,9 +155,11 @@ export default class ServiceRestFormalTemplate<Model=any>
 	 * @return {Promise<HttpResponse<{ [key:string]:any }>>} A promise resolving to an HTTP response containing the key-value mapping.
 	 */
 	protected async serveGetKeymap(request: HttpRequest): Promise<HttpResponse<{ [key:string]:any }>> {
+		let filters = { ...this.defaultFilter(), ...request.query };
 		let key = request.query?.["_key"] ?? this.indexer;
 		let value = request.query?.["_value"] ?? "value";
-		let keymap = await this.database.group(this.tableName, key, value, { ...request.query });
+		let keymap = await this.database.group(this.tableName, key, value, filters);
+
 		let result: { [key:string]:any } = {};
 		for (let key of Object.keys(keymap)) result[key] = keymap[key][0];
 		return HttpResponse.ok(result);
@@ -166,7 +176,7 @@ export default class ServiceRestFormalTemplate<Model=any>
 		delete request.body?.[this.indexer as keyof Model];
 		let entity = await this.database.update<Model>(this.tableName, id, request.body);
 		let result = (await this.serveGet({ query: { [this.indexer]: id } })).content;
-		return HttpResponse.ok(result);
+		return HttpResponse.ok(result ? await this.extendEntity(result) : result);
 	}
 
 	/**
@@ -180,7 +190,7 @@ export default class ServiceRestFormalTemplate<Model=any>
 		let entity = await this.database.add<Model>(this.tableName, request.body);
 		let id = entity[this.indexer as keyof Model] as unknown as string;
 		let result = (await this.serveGet({ query: { [this.indexer]: id } })).content
-		return HttpResponse.ok(result);
+		return HttpResponse.ok(result ? await this.extendEntity(result) : result);
 	}
 
 	protected async servePostList(request: HttpRequest<Model[]>): Promise<HttpResponse<Model[]>> {
@@ -196,21 +206,25 @@ export default class ServiceRestFormalTemplate<Model=any>
 	protected async serveSelect(request: HttpRequest): Promise<HttpResponse<string[]>> {
 		let selection = request.query?.["selection"] ?? this.indexer;
 		delete request.query?.["selection"];
-		let select = await this.database.select(this.tableName, selection, { ...request.query });
+
+		let filters = { ...this.defaultFilter(), ...request.query };
+		let select = await this.database.select(this.tableName, selection, filters);
 		return HttpResponse.ok(select);
 	}
 
 	protected async serveExist(request: HttpRequest): Promise<HttpResponse<Boolean>> {
-		return HttpResponse.ok((await this.database.count(this.tableName, { ...request.query })) > 0);
+		let filters = { ...this.defaultFilter(), ...request.query };
+		return HttpResponse.ok((await this.database.count(this.tableName, filters)) > 0);
 	}
 
 	protected async serveCount(request: HttpRequest): Promise<HttpResponse<Number>> {
-		return HttpResponse.ok((await this.database.count(this.tableName, { ...request.query })));
+		let filters = { ...this.defaultFilter(), ...request.query };
+		return HttpResponse.ok((await this.database.count(this.tableName, filters)));
 	}
 
 	protected async serveDel(request: HttpRequest): Promise<HttpResponse<Model>> {
 		let entity = (await this.serveGet(request)).content;
 		if (entity) await this.database.delete(this.tableName, entity[this.indexer as keyof Model] as unknown as string);
-		return HttpResponse.ok(entity);
+		return HttpResponse.ok(entity ? await this.extendEntity(entity) : entity);
 	}
 }

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

@@ -1,8 +1,5 @@
 import Service, {HttpRequest, HttpResponse} from "../api/Service";
 import Business from "./Business";
-import path from "path";
-import {fileURLToPath} from "url";
-import {readdir} from "fs/promises";
 
 export default class BusinessServer extends Business
 {

package/src/main/node/business/utils/ArrayUtils.ts

@@ -77,4 +77,15 @@ export default abstract class ArrayUtils {
 	static subtract<T>(arr1: T[], arr2: T[]): T[] {
 		return arr1.filter(item => !arr2.includes(item));
 	}
+
+	/**
+	 *
+	 * @param array
+	 * @param predicate
+	 */
+	static async filterAsync<T>(array: T[], predicate: (value: T, index: number, array: T[]) => boolean | Promise<boolean>): Promise<T[]> {
+		const results = await Promise.all(array.map(async (item, idx) => !!(await predicate(item, idx, array))));
+		return array.filter((_, index) => results[index]);
+	}
+
 }