ismx-nexo-node-app 0.4.21 → 0.4.23

package/dist/js/api/ServiceRestFormalTemplate.js

@@ -95,6 +95,15 @@ class ServiceRestFormalTemplate {
             return Service_1.HttpResponse.ok(result);
         });
     }
+    servePut(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let id = this.getFormalId(request);
+            (_a = request.body) === null || _a === void 0 ? true : delete _a[this.indexer];
+            let result = yield this.database.update(this.tableName, id, request.body);
+            return Service_1.HttpResponse.ok(result);
+        });
+    }
     servePost(request) {
         return __awaiter(this, void 0, void 0, function* () {
             return Service_1.HttpResponse.ok(yield this.database.add(this.tableName, request.body));
@@ -169,11 +178,6 @@ class ServiceRestFormalTemplate {
             return Service_1.HttpResponse.ok((yield this.database.count(this.tableName, Object.assign({}, request.query))));
         });
     }
-    servePut(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return Service_1.HttpResponse.ok("not implemented yet");
-        });
-    }
     serveDel(request) {
         return __awaiter(this, void 0, void 0, function* () {
             return Service_1.HttpResponse.ok("not implemented yet");

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

@@ -19,7 +19,16 @@ class PostgresUtils {
             ]));
     }
     static columns(table) {
-        return table.map((t) => t.name);
+        return table.map((t) => {
+            if (!PostgresUtils.isReservedWord(t.name))
+                return t.name;
+            else
+                return `"${t.name}"`;
+        });
+    }
+    static isReservedWord(word) {
+        const reservedWords = new Set(['select', 'from', 'where', 'join', 'table', 'user', 'group', 'order', 'limit', 'offset', 'insert', 'update', 'delete']);
+        return reservedWords.has(word.toLowerCase());
     }
     static bindOrDefault(table, object, startIndex) {
         let index = startIndex;

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

@@ -41,6 +41,7 @@ export default class ServiceRestFormalTemplate<Model = any> {
     protected serveGetKeymap(request: HttpRequest): Promise<HttpResponse<{
         [key: string]: any;
     }>>;
+    protected servePut(request: HttpRequest<Model>): Promise<HttpResponse<Model>>;
     protected servePost(request: HttpRequest<Model>): Promise<HttpResponse<Model>>;
     protected servePostList(request: HttpRequest<Model[]>): Promise<HttpResponse<Model[]>>;
     protected servePostKeymap(request: HttpRequest<{
@@ -57,7 +58,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 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>;
     protected fullSelect<Req, Res>(request: HttpRequest<Req>, api: {

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

@@ -5,6 +5,7 @@ export default abstract class PostgresUtils {
     static camelToSnake(column: string): string;
     static snakeToCamel(obj: any): any;
     static columns(table: Column[]): string[];
+    static isReservedWord(word: string): boolean;
     static bindOrDefault(table: Column[], object: {
         [p: string]: Primitive;
     }, startIndex: any): {

package/package.json

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

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

@@ -1,6 +1,6 @@
 import {HttpRequest, HttpResponse} from "./Service";
 import ServiceRestFormal, {Wrapper} from "./ServiceRestFormal";
-import {Pagination} from "../repository/Repository";
+import {Pagination, Transient} from "../repository/Repository";
 import RepositoryDatabase from "../repository/RepositoryDatabase";
 
 export default class ServiceRestFormalTemplate<Model=any>
@@ -103,6 +103,13 @@ export default class ServiceRestFormalTemplate<Model=any>
 		return HttpResponse.ok(result);
 	}
 
+	protected async servePut(request: HttpRequest<Model>): Promise<HttpResponse<Model>> {
+		let id = this.getFormalId(request);
+		delete request.body?.[this.indexer as keyof Model];
+		let result = await this.database.update<Model>(this.tableName, id, request.body);
+		return HttpResponse.ok(result);
+	}
+
 	protected async servePost(request: HttpRequest<Model>): Promise<HttpResponse<Model>> {
 		return HttpResponse.ok(await this.database.add<Model>(this.tableName, request.body));
 	}
@@ -162,10 +169,6 @@ export default class ServiceRestFormalTemplate<Model=any>
 		return HttpResponse.ok((await this.database.count(this.tableName, { ...request.query })));
 	}
 
-	protected async servePut(request: HttpRequest<Model>): Promise<HttpResponse<Model>> {
-		return HttpResponse.ok("not implemented yet");
-	}
-
 	protected async serveDel(request: HttpRequest): Promise<HttpResponse<Model>> {
 		return HttpResponse.ok("not implemented yet");
 	}

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

@@ -27,7 +27,16 @@ export default abstract class PostgresUtils
 	}
 
 	static columns(table: Column[]): string[] {
-		return table.map((t) => t.name);
+		return table.map((t) => {
+			if (!PostgresUtils.isReservedWord(t.name))
+				return t.name;
+			else return `"${t.name}"`;
+		});
+	}
+
+	static isReservedWord(word: string): boolean {
+		const reservedWords = new Set(['select', 'from', 'where', 'join', 'table', 'user', 'group', 'order', 'limit', 'offset', 'insert', 'update', 'delete']);
+		return reservedWords.has(word.toLowerCase());
 	}
 
 	static bindOrDefault(table: Column[], object: { [p: string]: Primitive }, startIndex: any): { bindings: string[], values: any[] } {