fix: bulk save TPH fallback support not matching props specifically enough.

Author: ascott18

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.3.8
+
+- Fix error in bulk saves where inheritance workaround added in 5.3.6 was not specific enough.
+
 # 5.3.7
 
 - Fix error in bulk saves where children of a model that has been `$remove()`'d where neither the children nor the removed model have PKs would still attempt to create.

src/IntelliTect.Coalesce.Tests/TargetClasses/TestDbContext/MultipleParents.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+
+namespace IntelliTect.Coalesce.Tests.TargetClasses.TestDbContext
+{
+    public class MultipleParents
+    {
+        public int Id { get; set; }
+
+        public int? Parent1Id { get; set; }
+        public Parent1 Parent1 { get; set; }
+
+        public int? Parent2Id { get; set; }
+        public Parent2 Parent2 { get; set; }
+    }
+
+    public class Parent1
+    {
+        public int Id { get; set; }
+        public List<MultipleParents> Children { get; set; }
+    }
+
+    public class Parent2
+    {
+        public int Id { get; set; }
+        public List<MultipleParents> Children { get; set; }
+    }
+}

src/IntelliTect.Coalesce.Tests/TargetClasses/TestDbContext/TestDbContext.cs

@@ -43,6 +43,10 @@ public class AppDbContext : DbContext
         public DbSet<OneToOneChild2> OneToOneChild2s { get; set; }
         public DbSet<OneToOneManyChildren> OneToOneManyChildren { get; set; }
 
+        public DbSet<MultipleParents> MultipleParents { get; set; }
+        public DbSet<Parent1> Parent1s { get; set; }
+        public DbSet<Parent2> Parent2s { get; set; }
+
 
         public AppDbContext() : this(Guid.NewGuid().ToString()) { }
 

src/coalesce-vue/src/viewmodel.ts

@@ -749,7 +749,14 @@ export abstract class ViewModel<
                 // The collection is the same collection, but has a different metadata instance
                 // so direct equality won't work.
                 (collection.$metadata.name == prop.inverseNavigation?.name &&
-                  collection.$metadata.type == prop.inverseNavigation.type))
+                  collection.$metadata.type == prop.inverseNavigation.type &&
+                  //@ts-expect-error
+                  collection.$metadata.itemType?.typeDef ==
+                    //@ts-expect-error
+                    prop.inverseNavigation.itemType?.typeDef &&
+                  //@ts-expect-error
+                  collection.$metadata.foreignKey?.name ==
+                    prop.inverseNavigation.foreignKey?.name))
             ) {
               // The reference navigation property has no value,
               // and the foreign key has no value,

src/coalesce-vue/test/viewmodel.spec.ts

@@ -38,6 +38,9 @@ import {
   TestViewModel,
   ZipCodeViewModel,
   AbstractImpl1ViewModel,
+  MultipleParentsViewModel,
+  Parent1ViewModel,
+  Parent2ViewModel,
 } from "../../test-targets/viewmodels.g";
 import {
   StudentViewModel,
@@ -1450,6 +1453,59 @@ describe("ViewModel", () => {
       bulkSaveEndpoint.destroy();
     });
 
+    test("child with multiple parents that reference child by same-named collection navigation", async () => {
+      // This test tests that the TPH type variance allowances aren't too permissive when
+      // comparing navigation properties by name.
+
+      const bulkSaveEndpoint = mockEndpoint(
+        "/Parent1/bulkSave",
+        vitest.fn((req) => ({
+          wasSuccessful: true,
+          object: null,
+        }))
+      );
+
+      const vm = new Parent1ViewModel({
+        children: [{}],
+      });
+
+      // Preconditions:
+      // Navigation property from the child must not be set,
+      // forcing bulk save to find the parent via `$parent.
+      expect(vm.children[0].parent1).toBeNull();
+      // There should be a collection nav on the other parent with the same name
+      expect(new Parent2ViewModel().$metadata.props.children.name).toBe(
+        vm.$metadata.props.children.name
+      );
+
+      await vm.$bulkSave();
+
+      const data = JSON.parse(bulkSaveEndpoint.mock.calls[0][0].data);
+      expect(data.items[1].refs).not.toHaveProperty("parent2Id");
+      expect(JSON.parse(bulkSaveEndpoint.mock.calls[0][0].data)).toMatchObject({
+        items: [
+          {
+            action: "save",
+            type: "Parent1",
+            data: { id: null },
+            refs: { id: vm.$stableId },
+            root: true,
+          },
+          {
+            action: "save",
+            type: "MultipleParents",
+            data: { id: null },
+            refs: {
+              id: vm.children[0].$stableId,
+              parent1Id: vm.$stableId,
+            },
+          },
+        ],
+      });
+
+      bulkSaveEndpoint.destroy();
+    });
+
     test("added children, then removed, do not attempt to create", async () => {
       const bulkSaveEndpoint = mockEndpoint(
         "/Person/bulkSave",