Simplify JsonSerializer relationship logic

Author: jgreaves8

src/utils/JsonSerializer.ts

@@ -70,22 +70,12 @@ export class JsonApiSerializer {
                 } else {
                     const value = (model as any)[relationship.name];
                     if (value) {
-                        // 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,
-                                },
-                            };
-                        }
+                        payload.data.relationships![relationship.name] = {
+                            data: {
+                                type: relationship.modelType,
+                                id: value.id ?? value,
+                            },
+                        };
                     }
                 }
             });
@@ -145,22 +135,12 @@ export class JsonApiSerializer {
                 } else {
                     const value = (model as any)[relationship.name];
                     if (value) {
-                        // 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,
-                                },
-                            };
-                        }
+                        payload.data.relationships![relationship.name] = {
+                            data: {
+                                type: relationship.modelType,
+                                id: value.id ?? value,
+                            },
+                        };
                     }
                 }
             });

tests/utils/JsonSerializer/CustomerAccountAndRelationships.test.ts

@@ -5,7 +5,6 @@ import { CustomerAccount, Property, Contact } from '../../../src';
 
 describe('JsonApiSerializer for Customer Account and Relationships', () => {
     const hydrator = new Hydrator();
-    const jsonApiSerializer = new JsonApiSerializer(hydrator.getModelMap());
 
     describe('buildCreatePayload', () => {
         it('should transform customer account and relationships to correct JSONAPI format', () => {