fix(i): Require secondary id field for one-ones (#1770)

## Relevant issue(s) Resolves #1769 ## Description Require secondary id field for one-ones. Simple silly bug caused by developer misunderstanding. Simple fix.
sourcenetwork · Aug 10, 2023 · 480f1a9 · 480f1a9
1 parent 5034cdc
commit 480f1a9
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/db/collection.go b/db/collection.go
@@ -437,7 +437,9 @@ func validateUpdateCollectionFields(
 				if proposedField.Kind == client.FieldKind_FOREIGN_OBJECT_ARRAY {
 					return false, NewErrPrimarySideOnMany(proposedField.Name)
 				}
+			}
 
+			if proposedField.Kind == client.FieldKind_FOREIGN_OBJECT {
 				idFieldName := proposedField.Name + "_id"
 				idField, idFieldFound := proposedDesc.Schema.GetField(idFieldName)
 				if !idFieldFound {

diff --git a/tests/integration/schema/updates/add/field/kind/foreign_object_test.go b/tests/integration/schema/updates/add/field/kind/foreign_object_test.go
@@ -462,6 +462,38 @@ func TestSchemaUpdatesAddFieldKindForeignObject_RelatedRelationTypeMismatch(t *t
 	testUtils.ExecuteTestCase(t, test)
 }
 
+func TestSchemaUpdatesAddFieldKindForeignObject_MissingSecondaryID(t *testing.T) {
+	test := testUtils.TestCase{
+		Description: "Test schema update, add field with kind foreign object (16), valid, functional",
+		Actions: []any{
+			testUtils.SchemaUpdate{
+				Schema: `
+					type Users {
+						name: String
+					}
+				`,
+			},
+			testUtils.SchemaPatch{
+				Patch: `
+					[
+						{ "op": "add", "path": "/Users/Schema/Fields/-", "value": {
+							"Name": "foo", "Kind": 16, "RelationType": 133, "Schema": "Users", "RelationName": "foo"
+						}},
+						{ "op": "add", "path": "/Users/Schema/Fields/-", "value": {
+							"Name": "foo_id", "Kind": 1, "RelationType": 64, "RelationName": "foo"
+						}},
+						{ "op": "add", "path": "/Users/Schema/Fields/-", "value": {
+							"Name": "foobar", "Kind": 16, "RelationType": 5, "Schema": "Users", "RelationName": "foo"
+						}}
+					]
+				`,
+				ExpectedError: "missing id field for relation object field. Field: foobar, ExpectedIDFieldName: foobar_id",
+			},
+		},
+	}
+	testUtils.ExecuteTestCase(t, test)
+}
+
 func TestSchemaUpdatesAddFieldKindForeignObject_Succeeds(t *testing.T) {
 	key1 := "bae-decf6467-4c7c-50d7-b09d-0a7097ef6bad"
 
@@ -486,6 +518,9 @@ func TestSchemaUpdatesAddFieldKindForeignObject_Succeeds(t *testing.T) {
 						}},
 						{ "op": "add", "path": "/Users/Schema/Fields/-", "value": {
 							"Name": "foobar", "Kind": 16, "RelationType": 5, "Schema": "Users", "RelationName": "foo"
+						}},
+						{ "op": "add", "path": "/Users/Schema/Fields/-", "value": {
+							"Name": "foobar_id", "Kind": 1, "RelationType": 64, "RelationName": "foo"
 						}}
 					]
 				`,