fix: AdjustKey correctly adding TenantId to primary and foreign keys

Author: AndrewTriesToCode

src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantEntityTypeBuilder.cs

@@ -1,10 +1,13 @@
 // Copyright Finbuckle LLC, Andrew White, and Contributors.
 // Refer to the solution LICENSE file for more information.
 
+using System;
+using System.Collections.Immutable;
 using System.Linq;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 
 namespace Finbuckle.MultiTenant.EntityFrameworkCore
 {
@@ -24,16 +27,16 @@ public MultiTenantEntityTypeBuilder(EntityTypeBuilder builder)
         /// <returns>The MultiTenantEntityTypeBuilder instance.</returns>
         public MultiTenantEntityTypeBuilder AdjustIndex(IMutableIndex index)
         {
-            // Set the new unique index with TenantId preserving name and database name
+            // set the new unique index with TenantId preserving name and database name
             IndexBuilder indexBuilder;
             Builder.Metadata.RemoveIndex(index);
             if (index.Name != null)
                 indexBuilder = Builder
-                               .HasIndex(index.Properties.Select(p => p.Name).Append("TenantId").ToArray(), index.Name)
-                               .HasDatabaseName(index.GetDatabaseName());
+                    .HasIndex(index.Properties.Select(p => p.Name).Append("TenantId").ToArray(), index.Name)
+                    .HasDatabaseName(index.GetDatabaseName());
             else
                 indexBuilder = Builder.HasIndex(index.Properties.Select(p => p.Name).Append("TenantId").ToArray())
-                                      .HasDatabaseName(index.GetDatabaseName());
+                    .HasDatabaseName(index.GetDatabaseName());
 
             if (index.IsUnique)
                 indexBuilder.IsUnique();
@@ -47,35 +50,29 @@ public MultiTenantEntityTypeBuilder AdjustIndex(IMutableIndex index)
         }
 
         /// <summary>
-        /// Adds TenantId to the key and adds a TenantId shadow property on any dependent types' foreign keys.
+        /// Adds TenantId to the key and adds the TenantId property to any dependent types' foreign keys.
         /// </summary>
         /// <param name="key">The key to adjust for TenantId.</param>
         /// <param name="modelBuilder">The modelBuilder for the DbContext.</param>
         /// <returns>The MultiTenantEntityTypeBuilder&lt;T&gt; instance.</returns>
         public MultiTenantEntityTypeBuilder AdjustKey(IMutableKey key, ModelBuilder modelBuilder)
         {
-            var propertyNames = key.Properties.Select(p => p.Name).Append("TenantId").ToArray();
-            var fks = key.GetReferencingForeignKeys().ToList();
+            var prop = Builder.Metadata.GetProperty("TenantId");
+            var props = key.Properties.Append(prop).ToImmutableList();
+            var foreignKeys = key.GetReferencingForeignKeys().ToArray();
+            var newKey = key.IsPrimaryKey() ? Builder.Metadata.SetPrimaryKey(props) : Builder.Metadata.AddKey(props);
 
-            if (key.IsPrimaryKey())
-                // 6.0 - key replaced on entity, fks changed in-place
-                Builder.HasKey(propertyNames);
-            else
-                Builder.HasAlternateKey(propertyNames);
-
-            foreach (var fk in fks)
+            foreach (var fk in foreignKeys)
             {
                 var fkEntityBuilder = modelBuilder.Entity(fk.DeclaringEntityType.ClrType);
-                // Note 6.0+ will generate a shadow property with the wrong name in the Properties, we will replace.
-                var props = fk.Properties.Where(p => !p.Name.EndsWith("TenantId")).Select(p => p.Name).Append("TenantId").ToArray();
-                fkEntityBuilder.Property<string>("TenantId");
-                fkEntityBuilder.HasOne(fk.PrincipalEntityType.ClrType, fk.DependentToPrincipal?.Name)
-                               .WithMany(fk.PrincipalToDependent?.Name)
-                               .HasForeignKey(props)
-                               .HasPrincipalKey(propertyNames);
+                var newFkProp = fkEntityBuilder.Property<string>("TenantId").Metadata;
+                var fkProps = fk.Properties.Append(newFkProp).ToImmutableList();
+                fk.SetProperties(fkProps, newKey!);
             }
 
-            Builder.Metadata.RemoveKey(key.Properties);
+            // remove key
+            Builder.Metadata.RemoveKey(key);
+
             return this;
         }
     }