Merge main into branch

Author: jgreaves8

dist/index.js

@@ -1435,6 +1435,17 @@ class JsonApiSerializer {
       console.warn(`No model class found for type: ${model.type}`);
       return { data: [] };
     }
+    if (!Array.isArray(relationships)) {
+      if (relationships?.id !== undefined) {
+        return {
+          data: {
+            type: model.type,
+            id: relationships.id
+          }
+        };
+      }
+      return { data: null };
+    }
     const data = relationships.filter((relationship) => relationship.id !== undefined).map((relationship) => ({
       type: model.type,
       id: relationship.id
@@ -1660,10 +1671,17 @@ class VehiclesService extends BaseService {
     resp.data = hydrator.hydrateResponse(resp.data, resp.included);
     return resp;
   }
+<<<<<<< HEAD
   async patchEquipment(equipmentItems) {
     const jsonApiSerializer = new JsonApiSerializer(this.hydrator.getModelMap());
     const payload = jsonApiSerializer.buildRelationshipPayload(new Equipment, equipmentItems);
     return await this.client.makePatchRequest(`${this.endpoint}/relationships/equipment`, payload);
+=======
+  async patchAssignee(user) {
+    const jsonApiSerializer = new JsonApiSerializer(this.hydrator.getModelMap());
+    const payload = jsonApiSerializer.buildRelationshipPayload(new User, user);
+    return await this.client.makePatchRequest(`${this.endpoint}/relationships/assignee`, payload);
+>>>>>>> main
   }
 }
 

dist/services/VehiclesService.d.ts

@@ -1,12 +1,17 @@
 import { Client } from "../Client";
 import { BaseService } from "./BaseService";
 import { Vehicle } from "../models/Vehicle";
+import { User } from "../models/User";
 import type { InternalResponse } from '../types/Response';
 import type { MotRecord } from "../models/MotRecord";
 import { Equipment } from "../models/Equipment";
 export declare class VehiclesService extends BaseService<Vehicle> {
     constructor(client: Client, vehicleId?: string);
     enquiry(registration: string): Promise<InternalResponse<any[]>>;
     motRecords(vehicleId: string): Promise<InternalResponse<MotRecord[]>>;
+<<<<<<< HEAD
     patchEquipment(equipmentItems: Array<Equipment>): Promise<any>;
+=======
+    patchAssignee(user: User): Promise<any>;
+>>>>>>> main
 }

dist/services/VehiclesService.js

@@ -1,9 +1,14 @@
 import { Client } from "../Client";
 import { BaseService } from "./BaseService";
 import { Vehicle } from "../models/Vehicle";
+import { User } from "../models/User";
 import { Hydrator } from "../utils/Hydrator";
+<<<<<<< HEAD
 import { Equipment } from "../models/Equipment";
 import { JsonApiSerializer } from "../utils/JsonSerializer";
+=======
+import { JsonApiSerializer } from '../utils/JsonSerializer';
+>>>>>>> main
 export class VehiclesService extends BaseService {
     constructor(client, vehicleId) {
         const endpoint = vehicleId ? `/v3/orgs/:orgId/assets/vehicles/${vehicleId}` : `/v3/orgs/:orgId/assets/vehicles`;
@@ -28,9 +33,16 @@ export class VehiclesService extends BaseService {
         resp.data = hydrator.hydrateResponse(resp.data, resp.included);
         return resp;
     }
+<<<<<<< HEAD
     async patchEquipment(equipmentItems) {
         const jsonApiSerializer = new JsonApiSerializer(this.hydrator.getModelMap());
         const payload = jsonApiSerializer.buildRelationshipPayload(new Equipment, equipmentItems);
         return await this.client.makePatchRequest(`${this.endpoint}/relationships/equipment`, payload);
+=======
+    async patchAssignee(user) {
+        const jsonApiSerializer = new JsonApiSerializer(this.hydrator.getModelMap());
+        const payload = jsonApiSerializer.buildRelationshipPayload(new User, user);
+        return await this.client.makePatchRequest(`${this.endpoint}/relationships/assignee`, payload);
+>>>>>>> main
     }
 }

dist/utils/JsonSerializer.d.ts

@@ -7,10 +7,13 @@ type JsonApiRelationship = {
     };
 };
 type JsonApiRelationshipsPayload = {
-    data: Array<{
+    data: {
+        type: string;
+        id: string;
+    } | Array<{
         type: string;
         id: string;
-    }>;
+    }> | null;
 };
 type JsonApiPayload = {
     data: {
@@ -26,7 +29,7 @@ export declare class JsonApiSerializer {
     buildCreatePayload(model: Model & Partial<JsonApiMapping>): JsonApiPayload;
     buildUpdatePayload(model: Model & Partial<JsonApiMapping>): JsonApiPayload;
     private buildPayload;
-    buildRelationshipPayload(model: Model, relationships: Array<Model>): JsonApiRelationshipsPayload;
+    buildRelationshipPayload(model: Model, relationships: Model | Array<Model>): JsonApiRelationshipsPayload;
     private buildDefaultPayload;
 }
 export {};

dist/utils/JsonSerializer.js

@@ -70,6 +70,17 @@ export class JsonApiSerializer {
             console.warn(`No model class found for type: ${model.type}`);
             return { data: [] };
         }
+        if (!Array.isArray(relationships)) {
+            if (relationships?.id !== undefined) {
+                return {
+                    data: {
+                        type: model.type,
+                        id: relationships.id
+                    }
+                };
+            }
+            return { data: null };
+        }
         const data = relationships
             .filter(relationship => relationship.id !== undefined)
             .map(relationship => ({

package.json

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

src/services/VehiclesService.ts

@@ -1,6 +1,7 @@
 import {Client} from "Client";
 import {BaseService} from "./BaseService";
 import {Vehicle} from "../models/Vehicle";
+import {User} from "../models/User";
 import type { InternalResponse } from '../types/Response';
 import { Hydrator } from "@utils/Hydrator";
 import type { MotRecord } from "@models/MotRecord";
@@ -44,4 +45,10 @@ export class VehiclesService extends BaseService<Vehicle> {
         return await this.client.makePatchRequest(`${this.endpoint}/relationships/equipment`, payload);
     }
 
+
+    public async patchAssignee(user: User) {
+        const jsonApiSerializer = new JsonApiSerializer(this.hydrator.getModelMap());
+        const payload = jsonApiSerializer.buildRelationshipPayload(new User, user);
+        return await this.client.makePatchRequest(`${this.endpoint}/relationships/assignee`, payload);
+    }
 }

src/utils/JsonSerializer.ts

@@ -9,10 +9,13 @@ type JsonApiRelationship = {
 };
 
 type JsonApiRelationshipsPayload = {
-    data: Array<{
+    data: {
+        type: string;
+        id: string;
+    } | Array<{
         type: string;
         id: string;
-    }>;
+    }> | null;
 };
 
 type JsonApiPayload = {
@@ -107,14 +110,26 @@ export class JsonApiSerializer {
         return this.buildDefaultPayload(model, isUpdate);
     }
 
-    buildRelationshipPayload(model: Model, relationships: Array<Model>): JsonApiRelationshipsPayload {
+    buildRelationshipPayload(model: Model, relationships: Model | Array<Model>): JsonApiRelationshipsPayload {
         const ModelClass = this.modelMap[model.type];
 
         if (!ModelClass) {
             console.warn(`No model class found for type: ${model.type}`);
             return { data: [] };
         }
 
+        if (!Array.isArray(relationships)) {
+            if (relationships?.id !== undefined) {
+                return {
+                    data: {
+                        type: model.type,
+                        id: relationships.id!
+                    }
+                };
+            }
+            return { data: null };
+        }
+
         const data = relationships
             .filter(relationship => relationship.id !== undefined)
             .map(relationship => ({