ismx-nexo-node-app 0.3.32 → 0.3.34

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

@@ -158,7 +158,7 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
             if (!this.tables[tableName])
                 throw new Error(`table ${tableName} does not exist`);
             let { where, values } = this.toQuery(tableName, filters);
-            let query = `SELECT json_agg(${select}) as list FROM ${this.schema}.${tableName} WHERE ${where}`;
+            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);
         });
     }

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ismx-nexo-node-app",
-  "version": "0.3.32",
+  "version": "0.3.34",
   "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

@@ -158,7 +158,7 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
     {
         if (!this.tables[tableName]) throw new Error(`table ${tableName} does not exist`);
         let { where, values } = this.toQuery(tableName, filters);
-        let query = `SELECT json_agg(${select}) as list FROM ${this.schema}.${tableName} WHERE ${where}`
+        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);
     }