ismx-nexo-node-app 0.3.40 → 0.3.42

package/dist/js/api/ServiceRestFormalTemplate.js

@@ -26,6 +26,10 @@ class ServiceRestFormalTemplate {
         this.getList.serveRestFormal = this.serveGetList.bind(this);
         this.postList = new ServiceRestFormal_1.default("POST", `${resource}/list`);
         this.postList.serveRestFormal = this.servePostList.bind(this);
+        this.full = new ServiceRestFormal_1.default("GET", `${resource}/full`);
+        this.full.serveRestFormal = this.serveFull.bind(this);
+        this.fullList = new ServiceRestFormal_1.default("GET", `${resource}/full/list`);
+        this.fullList.serveRestFormal = this.serveFullList.bind(this);
         this.page = new ServiceRestFormal_1.default("GET", `${resource}/page`);
         this.page.serveRestFormal = this.servePage.bind(this);
         this.map = new ServiceRestFormal_1.default("GET", `${resource}/map`);
@@ -75,6 +79,12 @@ class ServiceRestFormalTemplate {
             return Service_1.HttpResponse.ok(yield this.database.find(this.tableName, Object.assign({}, request.query)));
         });
     }
+    servePost(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let entity = this.database.add(this.tableName, request.body);
+            return Service_1.HttpResponse.ok(entity);
+        });
+    }
     servePostList(request) {
         return __awaiter(this, void 0, void 0, function* () {
             let list = request.body;
@@ -83,6 +93,24 @@ class ServiceRestFormalTemplate {
             return Service_1.HttpResponse.ok(this.database.addAll(this.tableName, list));
         });
     }
+    serveFull(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let id = this.getFormalId(request);
+            let result = yield this.database.one(this.tableName, id);
+            return Service_1.HttpResponse.ok(result);
+        });
+    }
+    serveFullList(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let list = yield this.unwrap(this.getList.serve(request));
+            let promises = list === null || list === void 0 ? void 0 : list.map((model) => {
+                let query = {};
+                query[this.indexer] = model[this.indexer];
+                return this.unwrap(this.full.serve(query));
+            });
+            return Service_1.HttpResponse.ok(yield Promise.all(promises !== null && promises !== void 0 ? promises : []));
+        });
+    }
     servePage(request) {
         return __awaiter(this, void 0, void 0, function* () {
             let { maxResults, pageNumber } = this.getFormalPage(request);
@@ -123,12 +151,6 @@ class ServiceRestFormalTemplate {
             return Service_1.HttpResponse.ok((yield this.database.count(this.tableName, Object.assign({}, request.query))));
         });
     }
-    servePost(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let entity = this.database.add(this.tableName, request.body);
-            return Service_1.HttpResponse.ok(entity);
-        });
-    }
     servePut(request) {
         return __awaiter(this, void 0, void 0, function* () {
             return Service_1.HttpResponse.ok("not implemented yet");

package/dist/js/repository/RepositoryDatabasePostgres.js

@@ -146,7 +146,7 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
             let schema = this.tables[tableName][0].schema;
             let { where, values } = this.toWhere(tableName, filters);
             let query = `SELECT count(*) as count FROM ${schema}.${tableName} WHERE ${where}`;
-            return this.query(query, values).then((result) => result[0].count);
+            return this.query(query, values).then((result) => { var _a, _b; return (_b = (_a = result[0]) === null || _a === void 0 ? void 0 : _a.count) !== null && _b !== void 0 ? _b : 0; });
         });
     }
     select(tableName_1, select_1) {
@@ -156,7 +156,7 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
             let schema = this.tables[tableName][0].schema;
             let { where, values } = this.toWhere(tableName, filters);
             let query = `SELECT json_agg(u.${select}) as list FROM ${schema}.${tableName} u WHERE ${where}`;
-            return this.query(query, values).then((result) => result[0].list);
+            return this.query(query, values).then((result) => { var _a, _b; return (_b = (_a = result[0]) === null || _a === void 0 ? void 0 : _a.list) !== null && _b !== void 0 ? _b : []; });
         });
     }
     del(tableName, id) {

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

@@ -10,6 +10,8 @@ export default class ServiceRestFormalTemplate<Model = any> {
     readonly getList: ServiceRestFormal<any, Model[]>;
     readonly post: ServiceRestFormal<Model, Model>;
     readonly postList: ServiceRestFormal<Model[], Model[]>;
+    readonly full: ServiceRestFormal<any, Model>;
+    readonly fullList: ServiceRestFormal<any, Model[]>;
     readonly put: ServiceRestFormal<Model, Model>;
     readonly del: ServiceRestFormal<any, Model>;
     readonly select: ServiceRestFormal<any, string[]>;
@@ -28,7 +30,10 @@ export default class ServiceRestFormalTemplate<Model = any> {
     };
     protected serveGet(request: HttpRequest): Promise<HttpResponse<Model>>;
     protected serveGetList(request: HttpRequest): Promise<HttpResponse<Model[]>>;
+    protected servePost(request: HttpRequest<Model>): Promise<HttpResponse<Model>>;
     protected servePostList(request: HttpRequest<Model[]>): Promise<HttpResponse<Model[]>>;
+    protected serveFull(request: HttpRequest): Promise<HttpResponse<Model>>;
+    protected serveFullList(request: HttpRequest): Promise<HttpResponse<Model[]>>;
     protected servePage(request: HttpRequest): Promise<HttpResponse<Pagination<Model>>>;
     protected serveMap(request: HttpRequest): Promise<HttpResponse<{
         [key: string]: Model;
@@ -36,7 +41,6 @@ export default class ServiceRestFormalTemplate<Model = any> {
     protected serveSelect(request: HttpRequest): Promise<HttpResponse<string[]>>;
     protected serveExist(request: HttpRequest): Promise<HttpResponse<Boolean>>;
     protected serveCount(request: HttpRequest): Promise<HttpResponse<Number>>;
-    protected servePost(request: HttpRequest<Model>): Promise<HttpResponse<Model>>;
     protected servePut(request: HttpRequest<Model>): Promise<HttpResponse<Model>>;
     protected serveDel(request: HttpRequest): Promise<HttpResponse<Model>>;
     protected unwrap<Res>(request: Promise<HttpResponse<Wrapper<Res>>>): Promise<Res | undefined>;

package/package.json

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

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

@@ -13,6 +13,9 @@ export default class ServiceRestFormalTemplate<Model=any>
 	readonly getList!: ServiceRestFormal<any, Model[]>;
 	readonly post!: ServiceRestFormal<Model, Model>;
 	readonly postList!: ServiceRestFormal<Model[], Model[]>;
+	readonly full!: ServiceRestFormal<any, Model>
+	readonly fullList!: ServiceRestFormal<any, Model[]>
+
 	readonly put!: ServiceRestFormal<Model, Model>;
 	readonly del!: ServiceRestFormal<any, Model>;
 
@@ -36,6 +39,12 @@ export default class ServiceRestFormalTemplate<Model=any>
 		this.postList = new ServiceRestFormal("POST", `${resource}/list`);
 		this.postList.serveRestFormal = this.servePostList.bind(this);
 
+		this.full = new ServiceRestFormal("GET", `${resource}/full`);
+		this.full.serveRestFormal = this.serveFull.bind(this);
+
+		this.fullList = new ServiceRestFormal("GET", `${resource}/full/list`);
+		this.fullList.serveRestFormal = this.serveFullList.bind(this);
+
 		this.page = new ServiceRestFormal("GET", `${resource}/page`);
 		this.page.serveRestFormal = this.servePage.bind(this);
 
@@ -88,12 +97,33 @@ export default class ServiceRestFormalTemplate<Model=any>
 		return HttpResponse.ok(await this.database.find<Model>(this.tableName, { ...request.query }));
 	}
 
+	protected async servePost(request: HttpRequest<Model>): Promise<HttpResponse<Model>> {
+		let entity = this.database.add<Model>(this.tableName, request.body);
+		return HttpResponse.ok(entity);
+	}
+
 	protected async servePostList(request: HttpRequest<Model[]>): Promise<HttpResponse<Model[]>> {
 		let list = request.body
 		if (!(list instanceof Array)) throw new Error("body must be a list");
 		return HttpResponse.ok(this.database.addAll<Model>(this.tableName, list as any));
 	}
 
+	protected async serveFull(request: HttpRequest): Promise<HttpResponse<Model>> {
+		let id = this.getFormalId(request);
+		let result = await this.database.one<Model>(this.tableName, id);
+		return HttpResponse.ok(result);
+	}
+
+	protected async serveFullList(request: HttpRequest): Promise<HttpResponse<Model[]>>
+	{
+		let list = await this.unwrap(this.getList.serve(request));
+		let promises = list?.map((model: any) => {
+			let query: any = {}; query[this.indexer] = model[this.indexer];
+			return this.unwrap(this.full.serve(query));
+		});
+		return HttpResponse.ok(await Promise.all(promises ?? []));
+	}
+
 	protected async servePage(request: HttpRequest): Promise<HttpResponse<Pagination<Model>>> {
 		let { maxResults, pageNumber } = this.getFormalPage(request);
 		let results = await this.database.page<Model>(this.tableName, "timestamp", maxResults, pageNumber);
@@ -125,11 +155,6 @@ export default class ServiceRestFormalTemplate<Model=any>
 		return HttpResponse.ok((await this.database.count(this.tableName, { ...request.query })));
 	}
 
-	protected async servePost(request: HttpRequest<Model>): Promise<HttpResponse<Model>> {
-		let entity = this.database.add<Model>(this.tableName, request.body);
-		return HttpResponse.ok(entity);
-	}
-
 	protected async servePut(request: HttpRequest<Model>): Promise<HttpResponse<Model>> {
 		return HttpResponse.ok("not implemented yet");
 	}

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

@@ -147,7 +147,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
         let schema = this.tables[tableName][0].schema;
         let { where, values } = this.toWhere(tableName, filters);
         let query = `SELECT count(*) as count FROM ${schema}.${tableName} WHERE ${where}`
-        return this.query<{count:number}>(query, values).then((result) => result[0].count);
+        return this.query<{count:number}>(query, values).then((result) => result[0]?.count ?? 0);
     }
 
     async select(tableName: string, select: string, filters: { [key: string]: Primitive | Array<Primitive> }={}): Promise<string[]>
@@ -156,7 +156,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
         let schema = this.tables[tableName][0].schema;
         let { where, values } = this.toWhere(tableName, filters);
         let query = `SELECT json_agg(u.${select}) as list FROM ${schema}.${tableName} u WHERE ${where}`
-        return this.query<{list:string[]}>(query, values).then((result) => result[0].list);
+        return this.query<{list:string[]}>(query, values).then((result) => result[0]?.list ?? []);
     }
 
     async del<T>(tableName: string, id: string): Promise<T>