ismx-nexo-node-app 0.4.27 → 0.4.29

package/dist/js/api/ServiceRestFormalTemplate.js

@@ -101,12 +101,13 @@ class ServiceRestFormalTemplate {
             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);
+            return Service_1.HttpResponse.ok(this.serveGet({ query: { id: result[this.indexer] } }));
         });
     }
     servePost(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            return Service_1.HttpResponse.ok(yield this.database.add(this.tableName, request.body));
+            let result = yield this.database.add(this.tableName, request.body);
+            return Service_1.HttpResponse.ok(this.serveGet({ query: { id: result[this.indexer] } }));
         });
     }
     servePostList(request) {

package/dist/js/repository/RepositoryDatabasePostgres.js

@@ -164,6 +164,22 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
             return this.query(query, values).then((result) => result[0]);
         });
     }
+    delete(tableName, id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return (yield this.deleteAll(tableName, { id }))[0];
+        });
+    }
+    deleteAll(tableName, filters) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.tables[tableName])
+                throw new Error(`table ${tableName} does not exist`);
+            let table = this.tables[tableName];
+            let schema = table[0].schema;
+            let { where, values } = this.toWhere(tableName, filters);
+            let query = `DELETE FROM ${schema}.${tableName} WHERE ${where} RETURNING *`;
+            return this.query(query, values);
+        });
+    }
     page(tableName_1, sortKey_1) {
         return __awaiter(this, arguments, void 0, function* (tableName, sortKey, maxResults = 50, pageNumber = 0, filters = {}) {
             if (!this.tables[tableName])
@@ -204,11 +220,6 @@ class RepositoryDatabasePostgres extends RepositoryDatabase_1.default {
             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) {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error(`not implemented yet`);
-        });
-    }
     toWhere(tableName, filters = {}, alias = "", index = 1) {
         let table = this.tables[tableName];
         let columns = PostgresUtils_1.default.columns(table);

package/dist/types/api/ServiceRestFormalTemplate.d.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> {
     readonly resource: string;
@@ -42,7 +42,7 @@ export default class ServiceRestFormalTemplate<Model = any> {
         [key: string]: any;
     }>>;
     protected servePut(request: HttpRequest<Model>): Promise<HttpResponse<Model>>;
-    protected servePost(request: HttpRequest<Model>): Promise<HttpResponse<Model>>;
+    protected servePost(request: HttpRequest<Transient<Model>>): Promise<HttpResponse<Model>>;
     protected servePostList(request: HttpRequest<Model[]>): Promise<HttpResponse<Model[]>>;
     protected servePostKeymap(request: HttpRequest<{
         [key: string]: any;

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

@@ -58,5 +58,6 @@ export default abstract class RepositoryDatabase extends Repository {
     abstract select(tableName: string, select: string, filters?: {
         [key: string]: Primitive | Array<Primitive>;
     }): Promise<string[]>;
-    abstract del<T>(tableName: string, id: string): Promise<T>;
+    abstract delete<T>(tableName: string, id: string): Promise<T>;
+    abstract deleteAll<T>(tableName: string, filters: Partial<T>): Promise<T[]>;
 }

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

@@ -37,6 +37,8 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase {
         [key: string]: Primitive;
     } | any)[]): Promise<T[]>;
     update<T>(tableName: string, id: string, object: Partial<T>): Promise<T>;
+    delete<T>(tableName: string, id: string): Promise<T>;
+    deleteAll<T>(tableName: string, filters: Partial<T>): Promise<T[]>;
     page<T>(tableName: string, sortKey: string, maxResults?: number, pageNumber?: number, filters?: {
         [key: string]: Primitive | Array<Primitive>;
     }): Promise<Pagination<T>>;
@@ -49,7 +51,6 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase {
     select(tableName: string, select: string, filters?: {
         [key: string]: Primitive | Array<Primitive>;
     }): Promise<string[]>;
-    del<T>(tableName: string, id: string): Promise<T>;
     toWhere(tableName: string, filters?: {
         [key: string]: Primitive | Array<Primitive>;
     }, alias?: string, index?: number): {

package/package.json

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

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

@@ -107,11 +107,12 @@ export default class ServiceRestFormalTemplate<Model=any>
 		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);
+		return HttpResponse.ok(this.serveGet({ query: { id: result[this.indexer as keyof Model] as string } }));
 	}
 
-	protected async servePost(request: HttpRequest<Model>): Promise<HttpResponse<Model>> {
-		return HttpResponse.ok(await this.database.add<Model>(this.tableName, request.body));
+	protected async servePost(request: HttpRequest<Transient<Model>>): Promise<HttpResponse<Model>> {
+		let result = await this.database.add<Model>(this.tableName, request.body);
+		return HttpResponse.ok(this.serveGet({ query: { id: result[this.indexer as keyof Model] as string } }));
 	}
 
 	protected async servePostList(request: HttpRequest<Model[]>): Promise<HttpResponse<Model[]>> {

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

@@ -72,5 +72,7 @@ export default abstract class RepositoryDatabase extends Repository
 
     abstract select(tableName: string, select: string, filters?: { [key: string]: Primitive | Array<Primitive> }): Promise<string[]>;
 
-    abstract del<T>(tableName: string, id: string): Promise<T>;
+    abstract delete<T>(tableName: string, id: string): Promise<T>;
+
+    abstract deleteAll<T>(tableName: string, filters: Partial<T>): Promise<T[]>;
 }

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

@@ -140,6 +140,19 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
         return this.query<T>(query, values).then((result) => result[0]);
     }
 
+    async delete<T>(tableName: string, id: string): Promise<T> {
+        return (await this.deleteAll(tableName, { id } as any))[0] as T;
+    }
+
+    async deleteAll<T>(tableName: string, filters: Partial<T>): Promise<T[]> {
+        if (!this.tables[tableName]) throw new Error(`table ${tableName} does not exist`);
+        let table = this.tables[tableName];
+        let schema = table[0].schema;
+        let { where, values } = this.toWhere(tableName, filters as any);
+        let query = `DELETE FROM ${schema}.${tableName} WHERE ${where} RETURNING *`;
+        return this.query<T>(query, values);
+    }
+
     async page<T>(tableName: string, sortKey: string, maxResults: number = 50, pageNumber: number = 0, filters: {[key:string]:Primitive|Array<Primitive>}={}): Promise<Pagination<T>>
     {
         if (!this.tables[tableName]) throw new Error(`table ${tableName} does not exist`);
@@ -180,11 +193,6 @@ export default class RepositoryDatabasePostgres extends RepositoryDatabase
         return this.query<{list:string[]}>(query, values).then((result) => result[0]?.list ?? []);
     }
 
-    async del<T>(tableName: string, id: string): Promise<T>
-    {
-        throw new Error(`not implemented yet`);
-    }
-
     toWhere(tableName: string, filters: { [key: string]: Primitive | Array<Primitive> }={}, alias:string = "", index=1)
     {
         let table = this.tables[tableName];