Add `SharedEntity` base class and unit tests.

framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/Entity.cs

@@ -54,3 +54,55 @@ public abstract class Entity<TKey> : Entity, IEntity<TKey>
         return $"[ENTITY: {GetType().Name}] Id = {Id}";
     }
 }
+
+/// <inheritdoc/>
+[Serializable]
+public abstract class SharedEntity : Dictionary<string, object>, IEntity
+{
+    protected SharedEntity()
+    {
+        EntityHelper.TrySetTenantId(this);
+    }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"[ENTITY: {GetType().Name}] Keys = {GetKeys().JoinAsString(", ")}";
+    }
+
+    public abstract object?[] GetKeys();
+
+    public bool EntityEquals(IEntity other)
+    {
+        return EntityHelper.EntityEquals(this, other);
+    }
+}
+
+/// <inheritdoc cref="IEntity{TKey}" />
+[Serializable]
+public abstract class SharedEntity<TKey> : SharedEntity, IEntity<TKey>
+{
+    /// <inheritdoc/>
+    public virtual TKey Id { get; protected set; } = default!;
+
+    protected SharedEntity()
+    {
+
+    }
+
+    protected SharedEntity(TKey id)
+    {
+        Id = id;
+    }
+
+    public override object?[] GetKeys()
+    {
+        return new object?[] { Id };
+    }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return $"[ENTITY: {GetType().Name}] Id = {Id}";
+    }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/SharedEntity_Repository_Tests.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Shouldly;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Repositories;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.TestApp.Domain;
+using Xunit;
+
+namespace Volo.Abp.EntityFrameworkCore.Repositories;
+
+public class SharedEntity_Repository_Tests : EntityFrameworkCoreTestBase
+{
+    protected readonly IRepository<TestSharedEntity> TestSharedTypeEntityRepository;
+    protected readonly ICurrentTenant CurrentTenant;
+    protected readonly IDataFilter<ISoftDelete> dataFilter;
+
+    public SharedEntity_Repository_Tests()
+    {
+        TestSharedTypeEntityRepository = GetRequiredService<IRepository<TestSharedEntity>>();
+        CurrentTenant = GetRequiredService<ICurrentTenant>();
+        dataFilter = GetRequiredService<IDataFilter<ISoftDelete>>();
+    }
+
+    [Fact]
+    public async Task SharedEntity_Test()
+    {
+        await WithUnitOfWorkAsync(async () =>
+        {
+            TestSharedTypeEntityRepository.SetCustomEntityName("TestSharedEntity1");
+
+            var tenantId = Guid.NewGuid();
+            await TestSharedTypeEntityRepository.InsertManyAsync(new List<TestSharedEntity>()
+            {
+                new TestSharedEntity(Guid.NewGuid())
+                {
+                    TenantId = null,
+                    IsDeleted = false,
+
+                    ["Name"] = "Test Person1",
+                    ["Age"] = 10,
+                    ["Birthday"] = DateTime.Now
+                }.SetProperty("testProperty", "Test Value1"),
+                new TestSharedEntity(Guid.NewGuid())
+                {
+                    TenantId = tenantId,
+                    IsDeleted = false,
+
+                    ["Name"] = "Test Person2",
+                    ["Age"] = 20,
+                    ["Birthday"] = DateTime.Now
+                },
+                new TestSharedEntity(Guid.NewGuid())
+                {
+                    TenantId = tenantId,
+                    IsDeleted = true,
+
+                    ["Name"] = "Test Person3",
+                    ["Age"] = 30,
+                    ["Birthday"] = DateTime.Now
+                },
+                new TestSharedEntity(Guid.NewGuid())
+                {
+                    TenantId = null,
+                    IsDeleted = true,
+
+                    ["Name"] = "Test Person4",
+                    ["Age"] = 40,
+                    ["Birthday"] = DateTime.Now
+                }
+            }, true);
+
+            var entities = (await TestSharedTypeEntityRepository.GetListAsync()).OrderBy(x => x["Name"]).ToList();
+            entities.Count.ShouldBe(1);
+            entities[0].TenantId.ShouldBeNull();
+            entities[0].IsDeleted.ShouldBe(false);
+            entities[0]["Name"].ShouldBe("Test Person1");
+            entities[0]["Age"].ShouldBe(10);
+            entities[0].GetProperty("testProperty").ShouldBe("Test Value1");
+
+            using (CurrentTenant.Change(tenantId))
+            {
+                entities = (await TestSharedTypeEntityRepository.GetListAsync()).OrderBy(x => x["Name"]).ToList();
+                entities.Count.ShouldBe(1);
+                entities[0].TenantId.ShouldBe(tenantId);
+                entities[0].IsDeleted.ShouldBe(false);
+                entities[0]["Name"].ShouldBe("Test Person2");
+                entities[0]["Age"].ShouldBe(20);
+            }
+
+            using (dataFilter.Disable())
+            {
+                entities = (await TestSharedTypeEntityRepository.GetListAsync()).OrderBy(x => x["Name"]).ToList();
+                entities.Count.ShouldBe(2);
+
+                entities[0].TenantId.ShouldBeNull();
+                entities[0].IsDeleted.ShouldBe(false);
+                entities[0]["Name"].ShouldBe("Test Person1");
+                entities[0]["Age"].ShouldBe(10);
+
+                entities[1].TenantId.ShouldBeNull();
+                entities[1].IsDeleted.ShouldBe(true);
+                entities[1]["Name"].ShouldBe("Test Person4");
+                entities[1]["Age"].ShouldBe(40);
+            }
+
+            using (CurrentTenant.Change(tenantId))
+            {
+                using (dataFilter.Disable())
+                {
+                    entities = (await TestSharedTypeEntityRepository.GetListAsync()).OrderBy(x => x["Name"]).ToList();
+                    entities.Count.ShouldBe(2);
+
+                    entities[0].TenantId.ShouldBe(tenantId);
+                    entities[0].IsDeleted.ShouldBe(false);
+                    entities[0]["Name"].ShouldBe("Test Person2");
+                    entities[0]["Age"].ShouldBe(20);
+
+                    entities[1].TenantId.ShouldBe(tenantId);
+                    entities[1].IsDeleted.ShouldBe(true);
+                    entities[1]["Name"].ShouldBe("Test Person3");
+                    entities[1]["Age"].ShouldBe(30);
+                }
+            }
+
+            TestSharedTypeEntityRepository.SetCustomEntityName("TestSharedEntity2");
+            await TestSharedTypeEntityRepository.InsertManyAsync(new List<TestSharedEntity>()
+            {
+                new TestSharedEntity(Guid.NewGuid())
+                {
+                    ["Name"] = "Test Person1 from Second Table",
+                    ["Age"] = 110,
+                    ["Birthday"] = DateTime.Now
+                }
+            }, true);
+
+            var entitiesFromSecondTable = (await TestSharedTypeEntityRepository.GetListAsync()).OrderBy(x => x["Name"]).ToList();
+            entitiesFromSecondTable.Count.ShouldBe(1);
+            entitiesFromSecondTable[0].TenantId.ShouldBeNull();
+            entitiesFromSecondTable[0].IsDeleted.ShouldBe(false);
+            entitiesFromSecondTable[0]["Name"].ShouldBe("Test Person1 from Second Table");
+            entitiesFromSecondTable[0]["Age"].ShouldBe(110);
+        });
+    }
+}

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs

@@ -1,5 +1,6 @@
 using System;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Volo.Abp.EntityFrameworkCore.Modeling;
 using Volo.Abp.EntityFrameworkCore.TestApp.SecondContext;
 using Volo.Abp.EntityFrameworkCore.TestApp.ThirdDbContext;
@@ -33,6 +34,9 @@ public class TestMigrationsDbContext : AbpDbContext<TestMigrationsDbContext>
     public DbSet<Blog> Blogs { get; set; }
     public DbSet<BlogPost> BlogPosts { get; set; }
 
+    public DbSet<TestSharedEntity> TestSharedEntity => Set<TestSharedEntity>("TestSharedEntity1");
+    public DbSet<TestSharedEntity> TestSharedEntity2 => Set<TestSharedEntity>("TestSharedEntity2");
+
     public TestMigrationsDbContext(DbContextOptions<TestMigrationsDbContext> options)
         : base(options)
     {
@@ -41,8 +45,23 @@ public class TestMigrationsDbContext : AbpDbContext<TestMigrationsDbContext>
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
+        // Owned and SharedTypeEntity should be configured before the base OnModelCreating call
+
         modelBuilder.Owned<District>();
 
+        Action<EntityTypeBuilder<TestSharedEntity>> sharedEntityBuildAction = b =>
+        {
+            b.ConfigureByConvention();
+            b.Property<Guid>("Id");
+            b.Property<Guid?>("TenantId");
+            b.Property<bool>("IsDeleted");
+            b.Property<string>("Name");
+            b.Property<int>("Age");
+            b.Property<DateTime?>("Birthday");
+        };
+        modelBuilder.SharedTypeEntity("TestSharedEntity1", sharedEntityBuildAction);
+        modelBuilder.SharedTypeEntity("TestSharedEntity2", sharedEntityBuildAction);
+
         base.OnModelCreating(modelBuilder);
 
         modelBuilder.Entity<Phone>(b =>

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs

@@ -1,6 +1,7 @@
 using System;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.EntityFrameworkCore;
@@ -40,6 +41,9 @@ public class TestAppDbContext : AbpDbContext<TestAppDbContext>, IThirdDbContext,
     public DbSet<Blog> Blogs { get; set; }
     public DbSet<BlogPost> BlogPosts { get; set; }
 
+    public DbSet<TestSharedEntity> TestSharedEntity => Set<TestSharedEntity>("TestSharedEntity1");
+    public DbSet<TestSharedEntity> TestSharedEntity2 => Set<TestSharedEntity>("TestSharedEntity2");
+
     public TestAppDbContext(DbContextOptions<TestAppDbContext> options)
         : base(options)
     {
@@ -54,8 +58,23 @@ public class TestAppDbContext : AbpDbContext<TestAppDbContext>, IThirdDbContext,
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
+        // Owned and SharedTypeEntity should be configured before the base OnModelCreating call
+
         modelBuilder.Owned<District>();
 
+        Action<EntityTypeBuilder<TestSharedEntity>> sharedEntityBuildAction = b =>
+        {
+            b.ConfigureByConvention();
+            b.Property<Guid>("Id");
+            b.Property<Guid?>("TenantId");
+            b.Property<bool>("IsDeleted");
+            b.Property<string>("Name");
+            b.Property<int>("Age");
+            b.Property<DateTime?>("Birthday");
+        };
+        modelBuilder.SharedTypeEntity("TestSharedEntity1", sharedEntityBuildAction);
+        modelBuilder.SharedTypeEntity("TestSharedEntity2", sharedEntityBuildAction);
+
         base.OnModelCreating(modelBuilder);
 
         modelBuilder.Entity<Phone>(b =>

framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Domain/TestSharedTypeEntity.cs

@@ -0,0 +1,28 @@
+using System;
+using Volo.Abp.Data;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.TestApp.Domain;
+
+public class TestSharedEntity : SharedEntity<Guid>, IMultiTenant, ISoftDelete, IHasExtraProperties
+{
+    public Guid? TenantId { get; set; }
+
+    public bool IsDeleted { get; set; }
+
+    public TestSharedEntity()
+    {
+        ExtraProperties = new ExtraPropertyDictionary();
+        this.SetDefaultsForExtraProperties();
+    }
+
+    public TestSharedEntity(Guid id)
+        : base(id)
+    {
+        ExtraProperties = new ExtraPropertyDictionary();
+        this.SetDefaultsForExtraProperties();
+    }
+
+    public ExtraPropertyDictionary ExtraProperties { get; set; }
+}