34 get all activities doesnt return response details if it fails (#35)

Author: miquelgall

package-lock.json

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

package.json

@@ -112,12 +112,42 @@ export class OFS {
                         response.headers.get("Content-Type") || undefined
                     );
                 } else {
-                    return new OFSResponse(
-                        theURL,
-                        response.status,
-                        response.statusText,
-                        undefined
-                    );
+                    try {
+                        var data;
+                        if (
+                            response.headers
+                                .get("Content-Type")
+                                ?.includes("json")
+                        ) {
+                            data = await response.json();
+                        } else if (
+                            response.headers
+                                .get("Content-Type")
+                                ?.includes("text")
+                        ) {
+                            data = await response.text();
+                        } else {
+                            data = await response.blob();
+                        }
+                        return new OFSResponse(
+                            theURL,
+                            response.status,
+                            undefined,
+                            data,
+                            response.headers.get("Content-Type") || undefined
+                        );
+                    } catch (error) {
+                        console.log(
+                            "error trying to capture the response with status >400",
+                            error
+                        );
+                        return new OFSResponse(
+                            theURL,
+                            response.status,
+                            response.statusText,
+                            undefined
+                        );
+                    }
                 }
             })
             .catch((error) => {
@@ -590,7 +620,13 @@ export class OFS {
         var offset = 0;
         var limit = 100;
         var result: any = undefined;
-        var allResults: any = { status: 200, totalResults: 0, items: [] };
+        var allResults: any = {
+            status: 200,
+            detail: "",
+            title: "",
+            totalResults: 0,
+            items: [],
+        };
         do {
             result = await this._get(partialURL, {
                 ...params,

src/OFS.ts

@@ -351,3 +351,19 @@ test("Get All Activities with all the parameters", async () => {
     expect(result.items.length).toBeGreaterThan(0);
     expect(result.items[0].activityId).toBeGreaterThan(0);
 });
+test("Get All Activities with incorrect data", async () => {
+    var result = await myProxy.getAllActivities({
+        resources: "FLUSA",
+        dateFrom: "2024-02-01",
+        dateTo: "2025-02-01",
+        includeChildren: "all",
+        includeNonScheduled: true,
+    });
+    if (result.status !== 200) {
+        console.log(result);
+    }
+    expect(result.status).toBe(400);
+    expect(result.data.detail).toContain(
+        "Date interval contains more than 31 days"
+    );
+});

test/general/core.activities.test.ts

@@ -8,7 +8,6 @@ import myCredentials from "../credentials_test.json";
 
 import test_info from "../test_config.json";
 import { fa, faker } from "@faker-js/faker";
-
 import type { Config } from "jest";
 import { defaults } from "jest-config";
 
@@ -26,7 +25,11 @@ TEST_CONFIG.set("23.11", {
     numberOfResourceProperties: 34,
     numberOfTimeslots: 9,
 });
-
+TEST_CONFIG.set("25A", {
+    numberOfProperties: 464,
+    numberOfResourceProperties: 45,
+    numberOfTimeslots: 8,
+});
 // Setup info
 beforeAll(() => {
     myProxy = new OFS(myCredentials);

test/general/meta.test.ts

@@ -1,3 +1,3 @@
 {
-    "ofsVersion": "23.11"
+    "ofsVersion": "25A"
 }