Updates to data model and data sources for related objects

Author: julie-gordon

src/dataModel/model.cto

@@ -105,11 +105,11 @@ concept MasterRecordId identified by Id {
 
   @Term("Address Relationship")
   @Crud("Createable,Readable,Updateable")
-  --> Address addy
+  --> Address addy2 optional
 
   @Term("Address Object")
   @Crud("Createable,Readable,Updateable")
-  o Address addy2
+  o Address addy
 }
 
 // Concept: Address

src/db/Account.json

@@ -2,7 +2,7 @@
   {
     "Id": "0",
     "Name": "Account 0",
-    "MasterRecordId": "1",
+    "msRecord2": "1",
     "PushCount": 100.0,
     "Type": "Customer_Direct",
     "ShippingLatitude": null,
@@ -11,7 +11,7 @@
   {
     "Id": "1",
     "Name": "Account 1",
-    "MasterRecordId": "1",
+    "msRecord2": "1",
     "PushCount": null,
     "Type": null,
     "ShippingLatitude": null,
@@ -20,7 +20,7 @@
   {
     "Id": "2",
     "Name": "updatedTestAccount",
-    "MasterRecordId": "2",
+    "msRecord2": "2",
     "PushCount": 7.0,
     "Type": null,
     "ShippingLatitude": 11.0,
@@ -29,7 +29,7 @@
   {
     "Id": "3",
     "Name": "Account 3",
-    "MasterRecordId": "2",
+    "msRecord2": "2",
     "PushCount": null,
     "Type": null,
     "ShippingLatitude": null,
@@ -38,7 +38,7 @@
   {
     "Id": "4",
     "Name": "Account 4",
-    "MasterRecordId": "1",
+    "msRecord2": "1",
     "PushCount": null,
     "Type": null,
     "ShippingLatitude": null,
@@ -47,7 +47,7 @@
   {
     "Id": "5",
     "Name": "Test Account",
-    "MasterRecordId": "2",
+    "msRecord2": "2",
     "PushCount": 6.0,
     "Type": null,
     "ShippingLatitude": 10.0,
@@ -56,7 +56,7 @@
   {
     "Id": "6",
     "Name": "TechCorp Solutions",
-    "MasterRecordId": "1",
+    "msRecord2": "1",
     "PushCount": 6.0,
     "Type": null,
     "ShippingLatitude": 10.0,

src/db/MasterRecordId.json

@@ -7,17 +7,8 @@
     "Type": "Customer_Direct",
     "ShippingLatitude": 1.0052,
     "lastUpdated": "2025-03-15T14:30:00Z",
-    "addy": "1",
+    "addy2": "1",
     "Name": "Master Record 0",
-    "addy2": {
-      "$class": "org.example.Address",
-      "street1": "123 Tech Valley Dr",
-      "street2": "Suite 2100",
-      "locality": "San Francisco",
-      "subdivision": "CA",
-      "countryOrRegion": "USA",
-      "postalCode": "94105"
-    },
     "ChildMasterRecordIds": ["2"]
   },
   {
@@ -28,7 +19,7 @@
     "Type": "Prospect",
     "ShippingLatitude": null,
     "lastUpdated": "2025-03-16T09:45:00Z",
-    "addy": "2",
+    "addy2": "2",
     "Name": "Primary Record",
     "ChildMasterRecordIds": []
   }