Merge pull request #38 from oracle-samples/37-add-limit-in-get-all-activities-and-check-hasmore-to-finish-the-loop

37 add limit in get all activities and check hasmore to finish the loop

Author: miquelgall

package-lock.json

@@ -5,7 +5,7 @@
     ],
     "name": "@ofs-users/proxy",
     "type": "module",
-    "version": "1.15.0",
+    "version": "1.15.2",
     "description": "A Javascript proxy to access Oracle Field Service via REST API",
     "main": "dist/ofs.es.js",
     "module": "dist/ofs.es.js",

package.json

@@ -614,11 +614,14 @@ export class OFS {
      * Retrieves all activities from the OFS API.
      * @returns An object containing all activities.
      */
-    async getAllActivities(params: OFSGetActivitiesParams) {
+    async getAllActivities(
+        params: OFSGetActivitiesParams,
+        limit: number = 1000
+    ) {
         const partialURL = "/rest/ofscCore/v1/activities";
         // Start with offset 0 and keep getting results until we get less than 100
         var offset = 0;
-        var limit = 100;
+
         var result: any = undefined;
         var allResults: any = {
             status: 200,
@@ -633,21 +636,21 @@ export class OFS {
                 offset: offset,
                 limit: limit,
             });
-            if (result.status < 400) {
+            if (result.status == 200) {
                 if (allResults.totalResults == 0) {
                     allResults = result.data;
                     allResults.status = 200;
                 } else {
                     allResults.items = allResults.items.concat(
                         result.data.items
                     );
-                    allResults.totalResults = allResults.items.length;
                 }
+                allResults.totalResults = allResults.items.length;
                 offset += limit;
             } else {
                 return result;
             }
-        } while (result.data.items.length == limit);
+        } while (result.data.hasMore == true);
         return allResults;
     }
     // Metadata: Plugin Management

src/OFS.ts

@@ -343,11 +343,7 @@ test("Get All Activities with all the parameters", async () => {
         includeChildren: "all",
         includeNonScheduled: true,
     });
-    if (result.status !== 200) {
-        console.log(result);
-    }
     expect(result.status).toBe(200);
-    expect(result.totalResults).toBeGreaterThan(0);
     expect(result.items.length).toBeGreaterThan(0);
     expect(result.items[0].activityId).toBeGreaterThan(0);
 });