ismx-nexo-node-app 0.4.60 → 0.4.62

package/dist/js/api/ServiceRestFormalTemplate.js

@@ -72,7 +72,9 @@ class ServiceRestFormalTemplate {
         return { maxResults, pageNumber };
     }
     extendEntity(entity) {
-        return entity;
+        return __awaiter(this, void 0, void 0, function* () {
+            return entity;
+        });
     }
     /**
      * Handles GET requests by retrieving a single record from the database based on the provided request.
@@ -84,7 +86,7 @@ class ServiceRestFormalTemplate {
         return __awaiter(this, void 0, void 0, function* () {
             let id = this.getFormalId(request);
             let entity = yield this.database.one(this.tableName, id);
-            let result = this.extendEntity(entity);
+            let result = yield this.extendEntity(entity);
             return Service_1.HttpResponse.ok(result);
         });
     }
@@ -97,7 +99,7 @@ class ServiceRestFormalTemplate {
     serveGetList(request) {
         return __awaiter(this, void 0, void 0, function* () {
             let entities = yield this.database.find(this.tableName, Object.assign({}, request.query));
-            let result = entities.map(this.extendEntity);
+            let result = yield Promise.all(entities.map((entity) => this.extendEntity(entity)));
             return Service_1.HttpResponse.ok(result);
         });
     }
@@ -111,7 +113,7 @@ class ServiceRestFormalTemplate {
         return __awaiter(this, void 0, void 0, function* () {
             let { maxResults, pageNumber } = this.getFormalPage(request);
             let result = yield this.database.page(this.tableName, "timestamp", maxResults, pageNumber);
-            result.elements = result.elements.map(this.extendEntity);
+            result.elements = yield Promise.all(result.elements.map((entity) => this.extendEntity(entity)));
             return Service_1.HttpResponse.ok(result);
         });
     }
@@ -132,6 +134,7 @@ class ServiceRestFormalTemplate {
                 else
                     response[key] = this.extendEntity(result);
             }
+            yield Promise.all(Object.values(response));
             return Service_1.HttpResponse.ok(response);
         });
     }
@@ -165,8 +168,9 @@ class ServiceRestFormalTemplate {
             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((yield this.serveGet({ query: { [this.indexer]: id } })).content);
+            let entity = yield this.database.update(this.tableName, id, request.body);
+            let result = (yield this.serveGet({ query: { [this.indexer]: id } })).content;
+            return Service_1.HttpResponse.ok(result);
         });
     }
     /**
@@ -178,9 +182,10 @@ class ServiceRestFormalTemplate {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     servePost(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            let result = yield this.database.add(this.tableName, request.body);
-            let id = result[this.indexer];
-            return Service_1.HttpResponse.ok((yield this.serveGet({ query: { [this.indexer]: id } })).content);
+            let entity = yield this.database.add(this.tableName, request.body);
+            let id = entity[this.indexer];
+            let result = (yield this.serveGet({ query: { [this.indexer]: id } })).content;
+            return Service_1.HttpResponse.ok(result);
         });
     }
     servePostList(request) {

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

@@ -36,7 +36,7 @@ export default class ServiceRestFormalTemplate<Model = any> {
         maxResults: number;
         pageNumber: number;
     };
-    extendEntity<T extends Model>(entity: Model): T;
+    extendEntity<T extends Model = Model>(entity: Model): Promise<T>;
     /**
      * Handles GET requests by retrieving a single record from the database based on the provided request.
      *

package/package.json

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

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

@@ -84,7 +84,7 @@ export default class ServiceRestFormalTemplate<Model=any>
 		return { maxResults, pageNumber }
 	}
 
-	extendEntity<T extends Model>(entity : Model) : T {
+	async extendEntity<T extends Model = Model>(entity : Model) : Promise<T> {
 		return entity as T;
 	}
 
@@ -97,7 +97,7 @@ export default class ServiceRestFormalTemplate<Model=any>
 	protected async serveGet(request: HttpRequest): Promise<HttpResponse<Model>> {
 		let id = this.getFormalId(request);
 		let entity = await this.database.one<Model>(this.tableName, id);
-		let result = this.extendEntity(entity);
+		let result = await this.extendEntity(entity);
 		return HttpResponse.ok(result);
 	}
 
@@ -109,7 +109,7 @@ export default class ServiceRestFormalTemplate<Model=any>
 	 */
 	protected async serveGetList(request: HttpRequest): Promise<HttpResponse<Model[]>> {
 		let entities = await this.database.find<Model>(this.tableName, { ...request.query });
-		let result = entities.map(this.extendEntity);
+		let result = await Promise.all(entities.map((entity) => this.extendEntity(entity)));
 		return HttpResponse.ok(result);
 	}
 
@@ -122,7 +122,7 @@ export default class ServiceRestFormalTemplate<Model=any>
 	protected async servePage(request: HttpRequest): Promise<HttpResponse<Pagination<Model>>> {
 		let { maxResults, pageNumber } = this.getFormalPage(request);
 		let result = await this.database.page<Model>(this.tableName, "timestamp", maxResults, pageNumber);
-		result.elements = result.elements.map(this.extendEntity);
+		result.elements = await Promise.all(result.elements.map((entity) => this.extendEntity(entity)));
 		return HttpResponse.ok(result);
 	}
 
@@ -134,11 +134,13 @@ export default class ServiceRestFormalTemplate<Model=any>
 	 */
 	protected async serveMap(request: HttpRequest): Promise<HttpResponse<{[key: string]: Model}>> {
 		let results = await this.database.find<Model>(this.tableName, { ...request.query });
-		let response: {[key: string]: Model} = {}; for (let result of results) {
+		let response: {[key: string]: Promise<Model>} = {};
+		for (let result of results) {
 			let key = (result as any)[this.indexer];
 			if (!key) return HttpResponse.ok({});
 			else response[key] = this.extendEntity(result);
 		}
+		await Promise.all(Object.values(response));
 		return HttpResponse.ok(response);
 	}
 
@@ -167,8 +169,9 @@ export default class ServiceRestFormalTemplate<Model=any>
 	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((await this.serveGet({ query: { [this.indexer]: id } })).content);
+		let entity = await this.database.update<Model>(this.tableName, id, request.body);
+		let result = (await this.serveGet({ query: { [this.indexer]: id } })).content;
+		return HttpResponse.ok(result);
 	}
 
 	/**
@@ -179,9 +182,10 @@ export default class ServiceRestFormalTemplate<Model=any>
 	 */
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
 	protected async servePost(request: HttpRequest<Transient<Model>>): Promise<HttpResponse<Model>> {
-		let result = await this.database.add<Model>(this.tableName, request.body);
-		let id = result[this.indexer as keyof Model] as unknown as string;
-		return HttpResponse.ok((await this.serveGet({ query: { [this.indexer]: id } } )).content);
+		let entity = await this.database.add<Model>(this.tableName, request.body);
+		let id = entity[this.indexer as keyof Model] as unknown as string;
+		let result = (await this.serveGet({ query: { [this.indexer]: id } })).content
+		return HttpResponse.ok(result);
 	}
 
 	protected async servePostList(request: HttpRequest<Model[]>): Promise<HttpResponse<Model[]>> {