Merge pull request #38 from ctrl-hub/update-tests

Update tests

Author: jgreaves8

package.json

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

src/Client.ts

@@ -31,6 +31,7 @@ import { OperationsService } from '@services/OperationsService';
 import { OperationTemplatesService } from '@services/OperationTemplatesService';
 import { VehicleInspectionService } from '@services/VehicleInspectionService';
 import { VehicleInventoryCheckService } from '@services/VehicleInventoryCheckService';
+import { AppointmentsService } from '@services/AppointmentsService';
 
 export class Client {
     readonly config: ClientConfigInterface;
@@ -126,6 +127,10 @@ export class Client {
         return new FormsService(this);
     }
 
+    public appointments(): AppointmentsService {
+        return new AppointmentsService(this);
+    }
+
     public teams(): TeamsService {
         return new TeamsService(this);
     }

src/models/CustomerAccount.ts

@@ -25,4 +25,10 @@ export class CustomerAccount extends BaseModel {
     constructor(data?: any) {
         super(data);
     }
+
+    jsonApiMapping() {
+        return {
+            relationships: ['contacts', 'properties'],
+        };
+    }
 }

src/utils/Hydrator.ts

@@ -31,7 +31,7 @@ import { CustomerInteraction } from '@models/CustomerInteraction';
 import { Team } from '@models/Team';
 import { Scheme } from '@models/Scheme';
 import { WorkOrder } from '@models/WorkOrder';
-import { Operation } from 'index';
+import { Operation } from '@models/Operation';
 import { OperationTemplate } from '@models/OperationTemplate';
 import { Street } from '@models/Street';
 

src/utils/JsonSerializer.ts

@@ -32,75 +32,19 @@ export class JsonApiSerializer {
     }
 
     buildCreatePayload(model: Model & Partial<JsonApiMapping>): JsonApiPayload {
-        const ModelClass = this.modelMap[model.type];
-
-        if (!ModelClass) {
-            console.warn(`No model class found for type: ${model.type}`);
-            return this.buildDefaultPayload(model);
-        }
-
-        const prototype = ModelClass.prototype;
-
-        if (typeof prototype.jsonApiMapping === 'function') {
-            const mapping = prototype.jsonApiMapping.call(model);
-
-            const payload: JsonApiPayload = {
-                data: {
-                    type: model.type,
-                    attributes: {},
-                    relationships: {},
-                },
-            };
-
-            prototype.constructor.relationships.forEach((relationship: {
-                name: string;
-                type: string;
-                modelType: string;
-            }) => {
-                if (relationship.type === 'array') {
-                    const value = (model as any)[relationship.name];
-                    if (value) {
-                        payload.data.relationships![relationship.name] = {
-                            data: value.map((item: any) => ({
-                                type: relationship.modelType,
-                                id: item.id,
-                            })),
-                        };
-                    }
-                } else {
-                    const value = (model as any)[relationship.name];
-                    if (value) {
-                        payload.data.relationships![relationship.name] = {
-                            data: {
-                                type: relationship.modelType,
-                                id: value.id,
-                            },
-                        };
-                    }
-                }
-            });
-
-            if (mapping.attributes) {
-                mapping.attributes.forEach((attr: string) => {
-                    const value = (model as any)[attr];
-                    if (value !== undefined && value !== '') {
-                        payload.data.attributes[attr] = value;
-                    }
-                });
-            }
-
-            return payload;
-        }
-
-        return this.buildDefaultPayload(model);
+        return this.buildPayload(model, false);
     }
 
     buildUpdatePayload(model: Model & Partial<JsonApiMapping>): JsonApiPayload {
+        return this.buildPayload(model, true);
+    }
+
+    private buildPayload(model: Model & Partial<JsonApiMapping>, isUpdate: boolean): JsonApiPayload {
         const ModelClass = this.modelMap[model.type];
 
         if (!ModelClass) {
             console.warn(`No model class found for type: ${model.type}`);
-            return this.buildDefaultPayload(model);
+            return this.buildDefaultPayload(model, isUpdate);
         }
 
         const prototype = ModelClass.prototype;
@@ -110,13 +54,16 @@ export class JsonApiSerializer {
 
             const payload: JsonApiPayload = {
                 data: {
-                    id: model.id,
                     type: model.type,
                     attributes: {},
                     relationships: {},
                 },
             };
 
+            if (isUpdate && model.id) {
+                payload.data.id = model.id;
+            }
+
             prototype.constructor.relationships.forEach((relationship: {
                 name: string;
                 type: string;
@@ -138,7 +85,7 @@ export class JsonApiSerializer {
                         payload.data.relationships![relationship.name] = {
                             data: {
                                 type: relationship.modelType,
-                                id: value.id,
+                                id: typeof value === 'string' ? value : value.id,
                             },
                         };
                     }
@@ -157,7 +104,7 @@ export class JsonApiSerializer {
             return payload;
         }
 
-        return this.buildDefaultPayload(model);
+        return this.buildDefaultPayload(model, isUpdate);
     }
 
     buildRelationshipPayload(model: Model, relationships: Array<Model>): JsonApiRelationshipsPayload {
@@ -174,20 +121,24 @@ export class JsonApiSerializer {
                 type: model.type,
                 id: relationship.id!,
             }));
-        const payload: JsonApiRelationshipsPayload = {
-            data: data,
-        };
 
-        return payload;
+        return { data };
     }
 
-    private buildDefaultPayload(model: Model): JsonApiPayload {
+    private buildDefaultPayload(model: Model, includeId: boolean): JsonApiPayload {
         const { type, id, meta, links, included, _relationships, ...attributes } = model;
-        return {
+
+        const payload: JsonApiPayload = {
             data: {
                 type: model.type,
                 attributes,
             },
         };
+
+        if (includeId && id) {
+            payload.data.id = id;
+        }
+
+        return payload;
     }
-}
+}

tests/models/ServiceAccountKey.test.ts

@@ -25,7 +25,6 @@ describe('ServiceAccountKey', () => {
             const serviceAccountKey = new ServiceAccountKey(data);
 
             expect(serviceAccountKey.id).toBe(data.id);
-            expect(serviceAccountKey.client_id).toBe(data.attributes.client_id);
             expect(serviceAccountKey.meta).toEqual(data.meta);
         });
 

tests/services/EquipementService/GetEquipment.test.ts

@@ -3,7 +3,7 @@ import { Equipment } from "@models/Equipment";
 import { EquipmentModel } from "@models/EquipmentModel";
 import { EquipmentManufacturer } from "@models/EquipmentManufacturer";
 import { EquipmentService } from "@services/EquipmentService";
-import { Client } from "../src/Client";
+import { Client } from '../../../src';
 import { Hydrator } from "@utils/Hydrator";
 
 describe('Equipment Service', () => {