ismx-nexo-node-app 0.4.148 → 0.4.151

package/dist/js/api/ServiceRestFormalTemplate.js

@@ -57,15 +57,11 @@ class ServiceRestFormalTemplate {
     }
     getFormalPage(request) {
         var _a, _b;
-        let maxResultsStr = (_a = request.query) === null || _a === void 0 ? void 0 : _a["maxResults"];
-        if (!maxResultsStr)
-            throw new Error();
-        let maxResults = Number.parseInt(maxResultsStr);
-        let pageNumberStr = (_b = request.query) === null || _b === void 0 ? void 0 : _b["pageNumber"];
-        if (!pageNumberStr)
-            throw new Error();
-        let pageNumber = Number.parseInt(pageNumberStr);
-        return { maxResults, pageNumber };
+        let sizeStr = (_a = request.query) === null || _a === void 0 ? void 0 : _a["size"];
+        let size = Number.isInteger(sizeStr) ? Number.parseInt(sizeStr) : 50;
+        let pageStr = (_b = request.query) === null || _b === void 0 ? void 0 : _b["page"];
+        let page = Number.isInteger(pageStr) ? Number.parseInt(pageStr) : 0;
+        return { size, page };
     }
     extendEntity(entity) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -110,9 +106,9 @@ class ServiceRestFormalTemplate {
      */
     servePage(request) {
         return __awaiter(this, void 0, void 0, function* () {
-            let { maxResults, pageNumber } = this.getFormalPage(request);
+            let { size, page } = this.getFormalPage(request);
             let filters = Object.assign(Object.assign({}, this.extendFilters(request)), request.query);
-            let result = yield this.database.page(this.tableName, "timestamp", maxResults, pageNumber, filters);
+            let result = yield this.database.page(this.tableName, "timestamp", size, page, filters);
             result.elements = yield Promise.all(result.elements.map((entity) => this.extendEntity(entity)));
             return Service_1.HttpResponse.ok(result);
         });

package/dist/js/business/utils/DateUtils.js

@@ -22,12 +22,11 @@ class DateUtils {
         let minutes = date.getMinutes().toString().padStart(2, "0");
         let seconds = date.getSeconds().toString().padStart(2, "0");
         let result = "";
-        if (precision !== DateUtils.HOURS)
-            result += hours;
-        if (precision !== DateUtils.MINUTES)
-            result += `:${minutes}`;
-        if (precision !== DateUtils.SECONDS)
-            result += `:${seconds}`;
+        switch (precision) {
+            case DateUtils.SECONDS: result = `:${seconds}`;
+            case DateUtils.MINUTES: result = `:${minutes}${result}`;
+            case DateUtils.HOURS: result = `${hours}${result}`;
+        }
         return result;
     }
     static toIsoDate(date) {

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

@@ -31,8 +31,8 @@ export default class ServiceRestFormalTemplate<Model = any> {
     protected indexer: string;
     getFormalId(request: HttpRequest): string;
     getFormalPage(request: HttpRequest): {
-        maxResults: number;
-        pageNumber: number;
+        size: number;
+        page: number;
     };
     extendEntity<T extends Model = Model>(entity: Model): Promise<T>;
     extendFilters(request: HttpRequest): Partial<Transient<Model>>;

package/package.json

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

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

@@ -68,14 +68,12 @@ export default class ServiceRestFormalTemplate<Model=any>
 		else return id;
 	}
 
-	getFormalPage(request: HttpRequest): { maxResults: number, pageNumber: number } {
-		let maxResultsStr = request.query?.["maxResults"];
-		if (!maxResultsStr) throw new Error();
-		let maxResults = Number.parseInt(maxResultsStr);
-		let pageNumberStr = request.query?.["pageNumber"];
-		if (!pageNumberStr) throw new Error();
-		let pageNumber = Number.parseInt(pageNumberStr);
-		return { maxResults, pageNumber }
+	getFormalPage(request: HttpRequest): { size: number, page: number } {
+		let sizeStr = request.query?.["size"];
+		let size = Number.isInteger(sizeStr) ? Number.parseInt(sizeStr!) : 50;
+        let pageStr = request.query?.["page"];
+        let page = Number.isInteger(pageStr) ? Number.parseInt(pageStr!) : 0;
+		return { size, page };
 	}
 
 	async extendEntity<T extends Model = Model>(entity : Model) : Promise<T> {
@@ -118,9 +116,9 @@ export default class ServiceRestFormalTemplate<Model=any>
 	 * @return {Promise<HttpResponse<Pagination<Model>>>} A promise resolving to an HTTP response containing the paginated list of entities.
 	 */
 	protected async servePage(request: HttpRequest): Promise<HttpResponse<Pagination<Model>>> {
-		let { maxResults, pageNumber } = this.getFormalPage(request);
+		let { size, page } = this.getFormalPage(request);
 		let filters = { ...this.extendFilters(request), ...request.query };
-		let result = await this.database.page<Model>(this.tableName, "timestamp", maxResults, pageNumber, filters);
+		let result = await this.database.page<Model>(this.tableName, "timestamp", size, page, filters);
 		result.elements = await Promise.all(result.elements.map((entity) => this.extendEntity(entity)));
 		return HttpResponse.ok(result);
 	}

package/src/main/node/business/utils/DateUtils.ts

@@ -34,11 +34,12 @@ export default abstract class DateUtils {
         let minutes = date.getMinutes().toString().padStart(2, "0");
         let seconds = date.getSeconds().toString().padStart(2, "0");
 
-        let result = ""
-        if (precision !== DateUtils.HOURS) result += hours;
-        if (precision !== DateUtils.MINUTES) result += `:${minutes}`;
-        if (precision !== DateUtils.SECONDS) result += `:${seconds}`;
-
+        let result = "";
+        switch (precision) {
+            case DateUtils.SECONDS: result = `:${seconds}`;
+            case DateUtils.MINUTES: result = `:${minutes}${result}`;
+            case DateUtils.HOURS: result = `${hours}${result}`;
+        }
         return result;
     }