fix: prevent duplicate key annotation in AdjustKey() (#883)

Finbuckle · Oct 12, 2024 · f75ba2c · f75ba2c
1 parent 4208149
commit f75ba2c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantEntityTypeBuilder.cs b/src/Finbuckle.MultiTenant.EntityFrameworkCore/MultiTenantEntityTypeBuilder.cs
@@ -76,7 +76,13 @@ public MultiTenantEntityTypeBuilder AdjustKey(IMutableKey key, ModelBuilder mode
                 fk.SetProperties(fkProps, newKey!);
             }
 
-            newKey?.AddAnnotations(annotations);
+            foreach (var annotation in annotations)
+            {
+                if (newKey?.FindAnnotation(annotation.Name) is null)
+                {
+                    newKey?.AddAnnotation(annotation.Name, annotation.Value);
+                }
+            }
 
             // remove key
             Builder.Metadata.RemoveKey(key);

diff --git a/...tityFrameworkCore.Test/MultiTenantEntityTypeBuilder/MultiTenantEntityTypeBuilderShould.cs b/...tityFrameworkCore.Test/MultiTenantEntityTypeBuilder/MultiTenantEntityTypeBuilderShould.cs
@@ -181,7 +181,7 @@ public void AdjustDependentForeignKeyOnAdjustAlternateKey()
     }
 
     [Fact]
-    public void PreserveAnnotations()
+    public void PreserveAnnotationsOnIndex()
     {
         using var db = GetDbContext(builder =>
         {