Filter out the partition key property when it is the same as id

Fixes #24872
dotnet · May 10, 2021 · 7249f62 · 7249f62
1 parent fd599b2
commit 7249f62
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/EFCore.Cosmos/Metadata/Conventions/StoreKeyConvention.cs b/src/EFCore.Cosmos/Metadata/Conventions/StoreKeyConvention.cs
@@ -106,7 +106,8 @@ private static void ProcessIdProperty(IConventionEntityTypeBuilder entityTypeBui
                     if (partitionKey != null)
                     {
                         var partitionKeyProperty = entityType.FindProperty(partitionKey);
-                        if (partitionKeyProperty == null)
+                        if (partitionKeyProperty == null
+                            || partitionKeyProperty == idProperty)
                         {
                             newKey = entityTypeBuilder.HasKey(new[] { idProperty })?.Metadata;
                         }

diff --git a/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs b/test/EFCore.Cosmos.Tests/ModelBuilding/CosmosModelBuilderGenericTest.cs
@@ -177,6 +177,28 @@ public virtual void No_alternate_key_is_created_if_primary_key_contains_id_and_p
                 Assert.Empty(entity.GetKeys().Where(k => k != entity.FindPrimaryKey()));
             }
 
+            [ConditionalFact]
+            public virtual void No_alternate_key_is_created_if_id_is_partition_key()
+            {
+                var modelBuilder = CreateModelBuilder();
+
+                modelBuilder.Entity<Customer>().HasKey(nameof(Customer.AlternateKey));
+                modelBuilder.Entity<Customer>()
+                    .Ignore(b => b.Details)
+                    .Ignore(b => b.Orders)
+                    .HasPartitionKey(b => b.AlternateKey)
+                    .Property(b => b.AlternateKey).HasConversion<string>().ToJsonProperty("id");
+
+                var model = modelBuilder.FinalizeModel();
+
+                var entity = model.FindEntityType(typeof(Customer));
+
+                Assert.Equal(
+                    new[] { nameof(Customer.AlternateKey) },
+                    entity.FindPrimaryKey().Properties.Select(p => p.Name));
+                Assert.Empty(entity.GetKeys().Where(k => k != entity.FindPrimaryKey()));
+            }
+
             protected override TestModelBuilder CreateModelBuilder()
                 => CreateTestModelBuilder(CosmosTestHelpers.Instance);
         }