Allow a one-to-one relationship to be an ID (string) or an object (which has ID in it) - fix Equipment Model test

Author: jgreaves8

src/utils/JsonSerializer.ts

@@ -70,12 +70,22 @@ export class JsonApiSerializer {
                 } else {
                     const value = (model as any)[relationship.name];
                     if (value) {
-                        payload.data.relationships![relationship.name] = {
-                            data: {
-                                type: relationship.modelType,
-                                id: value.id,
-                            },
-                        };
+                        // value could be a string (ID) or an object
+                        if (typeof value === 'string') {
+                            payload.data.relationships![relationship.name] = {
+                                data: {
+                                    type: relationship.modelType,
+                                    id: value,
+                                },
+                            };
+                        } else {
+                            payload.data.relationships![relationship.name] = {
+                                data: {
+                                    type: relationship.modelType,
+                                    id: value.id,
+                                },
+                            };
+                        }
                     }
                 }
             });
@@ -135,12 +145,22 @@ export class JsonApiSerializer {
                 } else {
                     const value = (model as any)[relationship.name];
                     if (value) {
-                        payload.data.relationships![relationship.name] = {
-                            data: {
-                                type: relationship.modelType,
-                                id: value.id,
-                            },
-                        };
+                        // value could be a string (ID) or an object
+                        if (typeof value === 'string') {
+                            payload.data.relationships![relationship.name] = {
+                                data: {
+                                    type: relationship.modelType,
+                                    id: value,
+                                },
+                            };
+                        } else {
+                            payload.data.relationships![relationship.name] = {
+                                data: {
+                                    type: relationship.modelType,
+                                    id: value.id,
+                                },
+                            };
+                        }
                     }
                 }
             });
@@ -190,4 +210,4 @@ export class JsonApiSerializer {
             },
         };
     }
-}
+}

tests/utils/JsonSerializer.test.ts renamed to tests/utils/JsonSerializer/EquipmentAndEquipmentModel.test.ts

@@ -1,10 +1,10 @@
 import { describe, it, expect } from "bun:test";
 import { JsonApiSerializer } from "@utils/JsonSerializer";
 import { Equipment } from "@models/Equipment";
-import { FormCategory } from '../../src';
-import { Hydrator } from '../../src/utils/Hydrator';
+import { FormCategory } from '@models/FormCategory';
+import { Hydrator } from '@utils/Hydrator'
 
-describe('JsonApiSerializer', () => {
+describe('JsonApiSerializer for Equipment and Model', () => {
 
     const hydrator = new Hydrator();