ismx-nexo-node-app 0.3.33 → 0.3.35

package/dist/js/api/ServiceRestFormalTemplate.js

@@ -17,8 +17,6 @@ const ServiceRestFormal_1 = __importDefault(require("./ServiceRestFormal"));
 class ServiceRestFormalTemplate {
     constructor(resource, database, tableName) {
         this.indexer = "id";
-        this.unwrap = ServiceRestFormal_1.default.unwrap;
-        this.fullSelect = ServiceRestFormal_1.default.fullSelect;
         this.resource = resource;
         this.database = database;
         this.tableName = tableName;
@@ -141,5 +139,15 @@ class ServiceRestFormalTemplate {
             return Service_1.HttpResponse.ok("not implemented yet");
         });
     }
+    unwrap(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return ServiceRestFormal_1.default.unwrap(request);
+        });
+    }
+    fullSelect(request, api) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return ServiceRestFormal_1.default.fullSelect(request, api);
+        });
+    }
 }
 exports.default = ServiceRestFormalTemplate;

package/dist/js/repository/RepositoryDatabasePostgres.js

@@ -72,7 +72,7 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.tables[tableName])
                 throw new Error(`table ${tableName} does not exist`);
-            let { where, values } = this.toQuery(tableName, filters);
+            let { where, values } = this.toWhere(tableName, filters);
             let query = `SELECT * FROM ${this.schema}.${tableName} WHERE ${where}`;
             return this.query(query, values);
         });
@@ -137,7 +137,7 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
             let table = this.tables[tableName];
             let columns = PostgresUtils_1.default.columns(table);
             let offset = maxResults * pageNumber;
-            let { where, values } = this.toQuery(tableName, filters, "", 4);
+            let { where, values } = this.toWhere(tableName, filters, "", 4);
             let query = `SELECT * FROM ${this.schema}.${tableName} WHERE ${where} ORDER BY $1 LIMIT $2 OFFSET $3`;
             let elements = this.query(query, [sortKey, maxResults, offset, ...values]);
             let total = this.count(tableName, filters);
@@ -148,7 +148,7 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.tables[tableName])
                 throw new Error(`table ${tableName} does not exist`);
-            let { where, values } = this.toQuery(tableName, filters);
+            let { where, values } = this.toWhere(tableName, filters);
             let query = `SELECT count(*) as count FROM ${this.schema}.${tableName} WHERE ${where}`;
             return this.query(query, values).then((result) => result[0].count);
         });
@@ -157,7 +157,7 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.tables[tableName])
                 throw new Error(`table ${tableName} does not exist`);
-            let { where, values } = this.toQuery(tableName, filters);
+            let { where, values } = this.toWhere(tableName, filters);
             let query = `SELECT json_agg(u.${select}) as list FROM ${this.schema}.${tableName} u WHERE ${where}`;
             return this.query(query, values).then((result) => result[0].list);
         });
@@ -167,7 +167,7 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
             throw new Error(`not implemented yet`);
         });
     }
-    toQuery(tableName, filters, alias = "", index = 1) {
+    toWhere(tableName, filters, alias = "", index = 1) {
         let table = this.tables[tableName];
         let columns = PostgresUtils_1.default.columns(table);
         let elements = Object.entries(filters !== null && filters !== void 0 ? filters : []);

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

@@ -1,5 +1,5 @@
 import { HttpRequest, HttpResponse } from "./Service";
-import ServiceRestFormal from "./ServiceRestFormal";
+import ServiceRestFormal, { Wrapper } from "./ServiceRestFormal";
 import { Pagination } from "../repository/RepositoryDatabase";
 import RepositoryDatabase from "../repository/RepositoryDatabase";
 export default class ServiceRestFormalTemplate<Model = any> {
@@ -39,6 +39,9 @@ export default class ServiceRestFormalTemplate<Model = any> {
     protected servePost(request: HttpRequest<Model>): Promise<HttpResponse<Model>>;
     protected servePut(request: HttpRequest<Model>): Promise<HttpResponse<Model>>;
     protected serveDel(request: HttpRequest): Promise<HttpResponse<Model>>;
-    protected readonly unwrap: typeof ServiceRestFormal.unwrap;
-    protected readonly fullSelect: typeof ServiceRestFormal.fullSelect;
+    protected unwrap<Res>(request: Promise<HttpResponse<Wrapper<Res>>>): Promise<Res | undefined>;
+    protected fullSelect<Req, Res>(request: HttpRequest<Req>, api: {
+        select: ServiceRestFormal<Req, string[]>;
+        full: ServiceRestFormal<Req, Res>;
+    }): Promise<(Awaited<Res> | undefined)[]>;
 }

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

@@ -45,6 +45,11 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase {
         [key: string]: Primitive | Array<Primitive>;
     }): Promise<string[]>;
     del<T>(tableName: string, id: string): Promise<T>;
-    private toQuery;
+    toWhere(tableName: string, filters?: {
+        [key: string]: Primitive | Array<Primitive>;
+    }, alias?: string, index?: number): {
+        where: string;
+        values: (string | number | Date | Primitive[] | null | undefined)[];
+    };
     private introspect;
 }

package/package.json

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

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

@@ -1,5 +1,5 @@
 import {HttpRequest, HttpResponse} from "./Service";
-import ServiceRestFormal from "./ServiceRestFormal";
+import ServiceRestFormal, {Wrapper} from "./ServiceRestFormal";
 import {Pagination} from "../repository/RepositoryDatabase";
 import RepositoryDatabase from "../repository/RepositoryDatabase";
 
@@ -138,6 +138,11 @@ export default class ServiceRestFormalTemplate<Model=any>
 		return HttpResponse.ok("not implemented yet");
 	}
 
-	protected readonly unwrap = ServiceRestFormal.unwrap
-	protected readonly fullSelect = ServiceRestFormal.fullSelect
+	protected async unwrap<Res>(request: Promise<HttpResponse<Wrapper<Res>>>): Promise<Res | undefined> {
+		return ServiceRestFormal.unwrap<Res>(request);
+	}
+
+	protected async fullSelect<Req, Res>(request: HttpRequest<Req>, api: { select: ServiceRestFormal<Req, string[]>, full: ServiceRestFormal<Req, Res> }) {
+		return ServiceRestFormal.fullSelect(request, api);
+	}
 }

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

@@ -72,7 +72,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
     async find<T>(tableName: string, filters: { [key: string]: Primitive | Array<any> }): Promise<T[]>
     {
         if (!this.tables[tableName]) throw new Error(`table ${tableName} does not exist`);
-        let { where, values } = this.toQuery(tableName, filters);
+        let { where, values } = this.toWhere(tableName, filters);
         let query = `SELECT * FROM ${this.schema}.${tableName} WHERE ${where}`
         return this.query<T>(query, values);
     }
@@ -136,7 +136,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
         let columns = PostgresUtils.columns(table);
         let offset = maxResults * pageNumber;
 
-        let { where, values } = this.toQuery(tableName, filters, "", 4);
+        let { where, values } = this.toWhere(tableName, filters, "", 4);
         let query = `SELECT * FROM ${this.schema}.${tableName} WHERE ${ where } ORDER BY $1 LIMIT $2 OFFSET $3`;
         let elements = this.query<T>(query, [sortKey, maxResults, offset, ...values])
 
@@ -149,7 +149,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
     async count(tableName: string, filters?: { [key: string]: Primitive | Array<Primitive> }): Promise<number>
     {
         if (!this.tables[tableName]) throw new Error(`table ${tableName} does not exist`);
-        let { where, values } = this.toQuery(tableName, filters);
+        let { where, values } = this.toWhere(tableName, filters);
         let query = `SELECT count(*) as count FROM ${this.schema}.${tableName} WHERE ${where}`
         return this.query<{count:number}>(query, values).then((result) => result[0].count);
     }
@@ -157,7 +157,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
     async select(tableName: string, select: string, filters?: { [key: string]: Primitive | Array<Primitive> }): Promise<string[]>
     {
         if (!this.tables[tableName]) throw new Error(`table ${tableName} does not exist`);
-        let { where, values } = this.toQuery(tableName, filters);
+        let { where, values } = this.toWhere(tableName, filters);
         let query = `SELECT json_agg(u.${select}) as list FROM ${this.schema}.${tableName} u WHERE ${where}`
         return this.query<{list:string[]}>(query, values).then((result) => result[0].list);
     }
@@ -167,7 +167,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
         throw new Error(`not implemented yet`);
     }
 
-    private toQuery(tableName: string, filters?: { [key: string]: Primitive | Array<Primitive> }, alias:string = "", index=1)
+    toWhere(tableName: string, filters?: { [key: string]: Primitive | Array<Primitive> }, alias:string = "", index=1)
     {
         let table = this.tables[tableName];
         let columns = PostgresUtils.columns(table);