Merge pull request #61 from ctrl-hub/add-equipment-exposures-get

Added getExposures function

Author: pjrctrlhub

dist/Client.d.ts

@@ -64,7 +64,7 @@ export declare class Client {
     vehicleCategories(): VehicleCategoriesService;
     vehicleModels(): VehicleModelsService;
     equipment(): EquipmentService;
-    equipmentExposures(): EquipmentExposureService;
+    equipmentExposures(equipmentId?: string): EquipmentExposureService;
     equipmentManufacturers(): EquipmentManufacturersService;
     equipmentModels(): EquipmentModelsService;
     equipmentCategories(): EquipmentCategoriesService;

dist/Client.js

@@ -135,8 +135,8 @@ export class Client {
     equipment() {
         return new EquipmentService(this);
     }
-    equipmentExposures() {
-        return new EquipmentExposureService(this);
+    equipmentExposures(equipmentId) {
+        return new EquipmentExposureService(this, equipmentId);
     }
     equipmentManufacturers() {
         return new EquipmentManufacturersService(this);
@@ -231,7 +231,7 @@ export class Client {
         try {
             // @todo switch on cookie, "X-Session-Token" or client_credentials
             const fetchResponse = await fetch(url, {
-                credentials: 'include', // @todo only required for cookie based auth,
+                credentials: 'include',
                 headers: headers,
             });
             let json = await fetchResponse.json();

dist/index.js

@@ -1523,15 +1523,13 @@ 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);
@@ -1729,8 +1727,9 @@ class EquipmentService extends BaseService {
 
 // src/services/EquipmentExposureService.ts
 class EquipmentExposureService extends BaseService {
-  constructor(client) {
-    super(client, "/v3/orgs/:orgId/assets/equipment/exposures");
+  constructor(client, equipmentId) {
+    const endpoint = equipmentId ? `/v3/orgs/:orgId/assets/equipment/${equipmentId}/exposures` : `/v3/orgs/:orgId/assets/equipment/exposures`;
+    super(client, endpoint);
   }
 }
 
@@ -2051,8 +2050,8 @@ class Client {
   equipment() {
     return new EquipmentService(this);
   }
-  equipmentExposures() {
-    return new EquipmentExposureService(this);
+  equipmentExposures(equipmentId) {
+    return new EquipmentExposureService(this, equipmentId);
   }
   equipmentManufacturers() {
     return new EquipmentManufacturersService(this);
@@ -2194,9 +2193,6 @@ class ClientConfig {
 }
 // src/models/Organisation.ts
 class Organisation extends BaseModel {
-  constructor() {
-    super(...arguments);
-  }
   type = "organisations";
   static relationships = [];
 }

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;
+            id?: string | undefined;
             type: string;
             attributes: Record<string, any>;
             relationships?: Record<string, {
                 data: {
                     type: string;
                     id: string;
                 };
-            }>;
+            }> | undefined;
         };
     };
     get(): Promise<InternalResponse<T[]>>;

dist/services/EquipmentExposureService.d.ts

@@ -2,5 +2,5 @@ import { Client } from "../Client";
 import { BaseService } from "./BaseService";
 import { EquipmentExposure } from "../models/EquipmentExposure";
 export declare class EquipmentExposureService extends BaseService<EquipmentExposure> {
-    constructor(client: Client);
+    constructor(client: Client, equipmentId?: string);
 }

dist/services/EquipmentExposureService.js

@@ -2,7 +2,8 @@ import { Client } from "../Client";
 import { BaseService } from "./BaseService";
 import { EquipmentExposure } from "../models/EquipmentExposure";
 export class EquipmentExposureService extends BaseService {
-    constructor(client) {
-        super(client, "/v3/orgs/:orgId/assets/equipment/exposures");
+    constructor(client, equipmentId) {
+        const endpoint = equipmentId ? `/v3/orgs/:orgId/assets/equipment/${equipmentId}/exposures` : `/v3/orgs/:orgId/assets/equipment/exposures`;
+        super(client, endpoint);
     }
 }

dist/utils/Requests.js

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

src/Client.ts

@@ -169,8 +169,8 @@ export class Client {
         return new EquipmentService(this);
     }
 
-    public equipmentExposures(): EquipmentExposureService {
-        return new EquipmentExposureService(this);
+    public equipmentExposures(equipmentId?: string): EquipmentExposureService {
+        return new EquipmentExposureService(this, equipmentId);
     }
 
     public equipmentManufacturers(): EquipmentManufacturersService {

src/models/EquipmentExposure.ts

@@ -50,7 +50,7 @@ export class EquipmentExposure extends BaseModel implements Partial<JsonApiMappi
 
     constructor(data?: any) {
         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) {
@@ -70,22 +70,11 @@ export class EquipmentExposure extends BaseModel implements Partial<JsonApiMappi
             }
         }
 
-        if (data?.attributes?.ppe) {
-            const ppeData = data.attributes?.ppe;
+        const ppe = data?.ppe ?? 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
-            }
+        this.ppe = {
+            mask: ppe?.mask ?? false,
+            ear_defenders: ppe?.ear_defenders ?? false
         }
     }
 }

src/services/EquipmentExposureService.ts

@@ -3,7 +3,8 @@ import {BaseService} from "./BaseService";
 import {EquipmentExposure} from "@models/EquipmentExposure";
 
 export class EquipmentExposureService extends BaseService<EquipmentExposure> {
-    constructor(client: Client) {
-        super(client, "/v3/orgs/:orgId/assets/equipment/exposures");
+    constructor(client: Client, equipmentId?: string) {
+        const endpoint = equipmentId? `/v3/orgs/:orgId/assets/equipment/${equipmentId}/exposures` : `/v3/orgs/:orgId/assets/equipment/exposures`;
+        super(client, endpoint);
     }
 }