ismx-nexo-node-app 0.4.63 → 0.4.64

package/dist/js/api/ServiceRestFormalTemplate.js

@@ -126,15 +126,17 @@ class ServiceRestFormalTemplate {
     serveMap(request) {
         return __awaiter(this, void 0, void 0, function* () {
             let results = yield this.database.find(this.tableName, Object.assign({}, request.query));
+            let extended = results.map((entity) => this.extendEntity(entity));
             let response = {};
-            for (let result of results) {
-                let key = result[this.indexer];
-                if (!key)
-                    return Service_1.HttpResponse.ok({});
-                else
-                    response[key] = this.extendEntity(result);
-            }
-            yield Promise.all(Object.values(response));
+            yield Promise.all(extended).then((entities) => {
+                for (let entity of entities) {
+                    let key = entity[this.indexer];
+                    if (!key)
+                        return Service_1.HttpResponse.ok({});
+                    else
+                        response[key] = entity;
+                }
+            });
             return Service_1.HttpResponse.ok(response);
         });
     }

package/package.json

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

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

@@ -134,13 +134,16 @@ 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]: 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));
+		let extended = results.map((entity) => this.extendEntity(entity));
+
+		let response: {[key: string]: Model} = {};
+		await Promise.all(extended).then((entities) => {
+			for (let entity of entities) {
+				let key = (entity as any)[this.indexer];
+				if (!key) return HttpResponse.ok({});
+				else response[key] = entity;
+			}
+		});
 		return HttpResponse.ok(response);
 	}