Merge pull request #72 from italia/fix/pager_api

Fix/pager api

Author: simone-amadio-acn

controller/jobController.ts

@@ -75,10 +75,6 @@ export class jobController {
       entityExternalId
     );
 
-    if (entityObj === null || parseInt(limit) <= 0) {
-      return returnValues;
-    }
-
     let condition = {};
     if (Boolean(dateFrom) && Boolean(dateTo)) {
       condition = {
@@ -92,23 +88,22 @@ export class jobController {
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     //@ts-ignore
-    const countData = await entityObj.getJobs(condition);
-    let cont = 0;
-    countData.forEach((job) => {
-      if (job) {
-        cont++;
-      }
-    });
+    const countData: Job[] = await entityObj.getJobs(condition);
+    const cont = countData.length;
 
-    const pages = Math.ceil(cont / limit);
-    const offset = limit * (page - 1);
-    condition = {
-      ...condition,
-      ...{
-        offset: offset,
-        limit: limit,
-      },
-    };
+    let pages = 1;
+
+    if (limit > 0 && page >= 0) {
+      pages = Math.ceil(cont / limit);
+      const offset = limit * page;
+      condition = {
+        ...condition,
+        ...{
+          offset: offset,
+          limit: limit,
+        },
+      };
+    }
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     //@ts-ignore - getJobs(): metodo autogenerato dall'ORM Sequelize dopo l'associazione

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "crawler-handler",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Handler per il validatore di comuni e scuole",
   "main": "index.js",
   "type": "module",

package.json

@@ -414,6 +414,18 @@ router.post(
  *           type: string
  *         description: La tipologia di Entity
  *         example: "municipality"
+ *       - name: limit
+ *         in: query
+ *         schema:
+ *           type: number
+ *         description: Paginazione - quantità di risultati restituiti per pagina
+ *         example: 10
+ *       - name: page
+ *         in: query
+ *         schema:
+ *           type: number
+ *         description: Paginazione - pagina da visualizzare
+ *         example: 5
  *     responses:
  *       "200":
  *         description: OK
@@ -613,11 +625,8 @@ router.get(
       const dateFrom = req.query.dateFrom;
       const dateTo = req.query.dateTo;
 
-      const page =
-        req.query.page === "0" || req.query.page === undefined
-          ? "1"
-          : req.query.page;
-      const limit = req.query.limit ?? "0";
+      const page = req.query.page ?? "0";
+      const limit = req.query.limit ?? "-1";
 
       const result = await new jobController(dbWS).list(
         externalEntityId,
@@ -944,9 +953,9 @@ router.post(
     try {
       await jwtVerify(process.env.JWT_SECRET, await getToken(req));
 
-      const page = req.query.page;
-
+      const page = req.query.page ?? "0";
       const limit = req.query.limit ?? "-1";
+
       const countOnly = req.query.countOnly
         ? req.query.countOnly == "true"
         : false;