Merge pull request #66 from ctrl-hub/add-template-to-schemes-work-orders

add template to schemes and work order models

Author: Karl456

dist/Client.js

@@ -239,7 +239,7 @@ export class Client {
         try {
             // @todo switch on cookie, "X-Session-Token" or client_credentials
             const fetchResponse = await fetch(url, {
-                credentials: 'include',
+                credentials: 'include', // @todo only required for cookie based auth,
                 headers: headers,
             });
             let json = await fetchResponse.json();

dist/index.js

@@ -250,7 +250,7 @@ class EquipmentExposure extends BaseModel {
   ];
   constructor(data) {
     super(data);
-    this.start_time = data?.attributes?.start_time?.id ?? data?.start_time ?? "";
+    this.start_time = data?.attributes?.start_time ?? data?.start_time ?? "";
     this.end_time = data?.attributes?.end_time ?? data?.end_time ?? "";
     if (data?.attributes?.location) {
       const locationData = data.attributes.location;
@@ -266,20 +266,11 @@ class EquipmentExposure extends BaseModel {
         coordinates: locationData.coordinates ?? []
       };
     }
-    if (data?.attributes?.ppe) {
-      const ppeData = data.attributes?.ppe;
-      this.ppe = {
-        mask: ppeData.ppe?.mask ?? false,
-        ear_defenders: ppeData.ppe?.ear_defenders ?? false
-      };
-    }
-    if (data?.ppe) {
-      const ppeData = data.ppe;
-      this.ppe = {
-        mask: ppeData.mask ?? false,
-        ear_defenders: ppeData.ear_defenders ?? false
-      };
-    }
+    const ppe = data?.ppe ?? data?.attributes?.ppe;
+    this.ppe = {
+      mask: ppe?.mask ?? false,
+      ear_defenders: ppe?.ear_defenders ?? false
+    };
   }
 }
 
@@ -1058,6 +1049,11 @@ class Scheme extends BaseModel {
       name: "work_orders",
       type: "array",
       modelType: "work-orders"
+    },
+    {
+      name: "template",
+      type: "single",
+      modelType: "scheme-templates"
     }
   ];
   constructor(data) {
@@ -1090,6 +1086,11 @@ class WorkOrder extends BaseModel {
       name: "operations",
       type: "array",
       modelType: "operations"
+    },
+    {
+      name: "template",
+      type: "single",
+      modelType: "work-order-templates"
     }
   ];
   constructor(data) {
@@ -1561,13 +1562,15 @@ class BaseService extends RequestBuilder {
     };
   }
   async create(model, params) {
-    if (params) {}
+    if (params) {
+    }
     const jsonApiSerializer = new JsonApiSerializer(this.hydrator.getModelMap());
     const payload = jsonApiSerializer.buildCreatePayload(model);
     return await this.client.makePostRequest(this.endpoint, payload);
   }
   async update(id, model, params) {
-    if (params) {}
+    if (params) {
+    }
     const jsonApiSerializer = new JsonApiSerializer(this.hydrator.getModelMap());
     const payload = jsonApiSerializer.buildUpdatePayload(model);
     return await this.client.makePatchRequest(`${this.endpoint}/${id}`, payload);
@@ -2251,6 +2254,9 @@ class ClientConfig {
 }
 // src/models/Organisation.ts
 class Organisation extends BaseModel {
+  constructor() {
+    super(...arguments);
+  }
   type = "organisations";
   static relationships = [];
 }

dist/models/EquipmentExposure.js

@@ -34,7 +34,7 @@ export class EquipmentExposure extends BaseModel {
     ];
     constructor(data) {
         super(data);
-        this.start_time = data?.attributes?.start_time?.id ?? data?.start_time ?? '';
+        this.start_time = data?.attributes?.start_time ?? data?.start_time ?? '';
         this.end_time = data?.attributes?.end_time ?? data?.end_time ?? '';
         if (data?.attributes?.location) {
             const locationData = data.attributes.location;
@@ -50,19 +50,10 @@ export class EquipmentExposure extends BaseModel {
                 coordinates: locationData.coordinates ?? []
             };
         }
-        if (data?.attributes?.ppe) {
-            const ppeData = data.attributes?.ppe;
-            this.ppe = {
-                mask: ppeData.ppe?.mask ?? false,
-                ear_defenders: ppeData.ppe?.ear_defenders ?? false
-            };
-        }
-        if (data?.ppe) {
-            const ppeData = data.ppe;
-            this.ppe = {
-                mask: ppeData.mask ?? false,
-                ear_defenders: ppeData.ear_defenders ?? false
-            };
-        }
+        const ppe = data?.ppe ?? data?.attributes?.ppe;
+        this.ppe = {
+            mask: ppe?.mask ?? false,
+            ear_defenders: ppe?.ear_defenders ?? false
+        };
     }
 }

dist/models/Scheme.js

@@ -13,6 +13,11 @@ export class Scheme extends BaseModel {
             type: 'array',
             modelType: 'work-orders',
         },
+        {
+            name: 'template',
+            type: 'single',
+            modelType: 'scheme-templates',
+        }
     ];
     constructor(data) {
         super(data);

dist/models/WorkOrder.js

@@ -13,6 +13,11 @@ export class WorkOrder extends BaseModel {
             type: 'array',
             modelType: 'operations',
         },
+        {
+            name: 'template',
+            type: 'single',
+            modelType: 'work-order-templates',
+        }
     ];
     constructor(data) {
         super(data);

dist/services/BaseService.d.ts

@@ -13,15 +13,15 @@ export declare class BaseService<T extends Model> extends RequestBuilder {
     constructor(client: Client, endpoint: string);
     convertToJsonApi(model: Model): {
         data: {
-            id?: string | undefined;
+            id?: string;
             type: string;
             attributes: Record<string, any>;
             relationships?: Record<string, {
                 data: {
                     type: string;
                     id: string;
                 };
-            }> | undefined;
+            }>;
         };
     };
     get(): Promise<InternalResponse<T[]>>;

dist/utils/Requests.js

@@ -12,7 +12,7 @@ export class Requests {
     }
     static buildInternalResponse(fetchResponse, json) {
         return {
-            ok: fetchResponse.ok,
+            ok: fetchResponse.ok, // @todo convert to own version
             statusCode: fetchResponse.status,
             headers: fetchResponse.headers,
             meta: json?.meta || null,
@@ -29,7 +29,7 @@ export class Requests {
     static buildInternalErrorResponse(error) {
         return {
             ok: false,
-            statusCode: error.statusCode || 0,
+            statusCode: error.statusCode || 0, // If there's no response, status code is 0
             headers: error.headers,
             data: null,
             errors: {

package.json

@@ -4,7 +4,7 @@
         "type": "git",
         "url": "https://github.com/ctrl-hub/sdk.ts"
     },
-    "version": "0.1.139",
+    "version": "0.1.140",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "type": "module",

src/models/Scheme.ts

@@ -18,6 +18,11 @@ export class Scheme extends BaseModel {
             type: 'array',
             modelType: 'work-orders',
         },
+        {
+            name: 'template',
+            type: 'single',
+            modelType: 'scheme-templates',
+        }
     ];
 
     constructor(data?: any) {

src/models/WorkOrder.ts

@@ -18,6 +18,11 @@ export class WorkOrder extends BaseModel {
             type: 'array',
             modelType: 'operations',
         },
+        {
+            name: 'template',
+            type: 'single',
+            modelType: 'work-order-templates',
+        }
     ];
 
     constructor(data?: any) {