Browse Source

Rename SetCustomEntityName to SetEntityName in repositories

Refactored repository interfaces and implementations to replace SetCustomEntityName and CustomEntityName with SetEntityName and EntityName for consistency and clarity. Updated related extension methods and tests to use the new naming.
pull/23619/head
Halil İbrahim Kalkan 1 year ago
parent
commit
53a8babfa7
  1. 6
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/BasicRepositoryBase.cs
  2. 2
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IRepository.cs
  3. 9
      framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryExtensions.cs
  4. 4
      framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
  5. 2
      framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs
  6. 8
      framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/Repositories/SharedEntity_Repository_Tests.cs

6
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/BasicRepositoryBase.cs

@ -44,11 +44,11 @@ public abstract class BasicRepositoryBase<TEntity> :
public bool? IsChangeTrackingEnabled { get; protected set; } public bool? IsChangeTrackingEnabled { get; protected set; }
protected string? CustomEntityName { get; private set; } protected string? EntityName { get; private set; }
public void SetCustomEntityName(string? name) public void SetEntityName(string? name)
{ {
CustomEntityName = name; EntityName = name;
} }
protected BasicRepositoryBase() protected BasicRepositoryBase()

2
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/IRepository.cs

@ -14,7 +14,7 @@ public interface IRepository
{ {
bool? IsChangeTrackingEnabled { get; } bool? IsChangeTrackingEnabled { get; }
void SetCustomEntityName(string? name); void SetEntityName(string? name);
} }
public interface IRepository<TEntity> : IReadOnlyRepository<TEntity>, IBasicRepository<TEntity> public interface IRepository<TEntity> : IReadOnlyRepository<TEntity>, IBasicRepository<TEntity>

9
framework/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Repositories/RepositoryExtensions.cs

@ -250,4 +250,13 @@ public static class RepositoryExtensions
hardDeleteEntities.Add(entity); hardDeleteEntities.Add(entity);
await repository.DeleteAsync(entity, autoSave, cancellationToken); await repository.DeleteAsync(entity, autoSave, cancellationToken);
} }
public static TRepository WithEntityName<TRepository>(
this TRepository repository,
string name
) where TRepository : class, IRepository
{
repository.SetEntityName(name);
return repository;
}
} }

4
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs

@ -122,8 +122,8 @@ public class EfCoreRepository<TDbContext, TEntity> : RepositoryBase<TEntity>, IE
private DbSet<TEntity> GetDbSetInternal(TDbContext dbContext) private DbSet<TEntity> GetDbSetInternal(TDbContext dbContext)
{ {
return CustomEntityName != null return EntityName != null
? dbContext.Set<TEntity>(CustomEntityName) ? dbContext.Set<TEntity>(EntityName)
: dbContext.Set<TEntity>(); : dbContext.Set<TEntity>();
} }

2
framework/test/Volo.Abp.Ddd.Tests/Volo/Abp/Domain/Repositories/RepositoryRegistration_Tests.cs

@ -409,7 +409,7 @@ public class RepositoryRegistration_Tests
{ {
public bool? IsChangeTrackingEnabled { get; set; } public bool? IsChangeTrackingEnabled { get; set; }
public void SetCustomEntityName(string name) public void SetEntityName(string name)
{ {
} }

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

@ -29,7 +29,7 @@ public class SharedEntity_Repository_Tests : EntityFrameworkCoreTestBase
{ {
await WithUnitOfWorkAsync(async () => await WithUnitOfWorkAsync(async () =>
{ {
TestSharedTypeEntityRepository.SetCustomEntityName("TestSharedEntity1"); TestSharedTypeEntityRepository.SetEntityName("TestSharedEntity1");
var tenantId = Guid.NewGuid(); var tenantId = Guid.NewGuid();
await TestSharedTypeEntityRepository.InsertManyAsync(new List<TestSharedEntity>() await TestSharedTypeEntityRepository.InsertManyAsync(new List<TestSharedEntity>()
@ -121,7 +121,7 @@ public class SharedEntity_Repository_Tests : EntityFrameworkCoreTestBase
} }
} }
TestSharedTypeEntityRepository.SetCustomEntityName("TestSharedEntity2"); TestSharedTypeEntityRepository.SetEntityName("TestSharedEntity2");
await TestSharedTypeEntityRepository.InsertManyAsync(new List<TestSharedEntity>() await TestSharedTypeEntityRepository.InsertManyAsync(new List<TestSharedEntity>()
{ {
new TestSharedEntity(Guid.NewGuid()) new TestSharedEntity(Guid.NewGuid())
@ -146,7 +146,7 @@ public class SharedEntity_Repository_Tests : EntityFrameworkCoreTestBase
{ {
await WithUnitOfWorkAsync(async () => await WithUnitOfWorkAsync(async () =>
{ {
TestSharedTypeEntityRepository.SetCustomEntityName("TestSharedEntity1"); TestSharedTypeEntityRepository.SetEntityName("TestSharedEntity1");
var entity = new TestSharedEntity(Guid.NewGuid()) var entity = new TestSharedEntity(Guid.NewGuid())
{ {
@ -169,7 +169,7 @@ public class SharedEntity_Repository_Tests : EntityFrameworkCoreTestBase
entity.Birthday.ShouldNotBeNull(); entity.Birthday.ShouldNotBeNull();
entity["DynamicProperty"].ShouldBe("Test Value1"); entity["DynamicProperty"].ShouldBe("Test Value1");
TestSharedTypeEntityRepository.SetCustomEntityName("TestSharedEntity2"); TestSharedTypeEntityRepository.SetEntityName("TestSharedEntity2");
entity = await TestSharedTypeEntityRepository.FindAsync(x => x.Id == entity.Id!); entity = await TestSharedTypeEntityRepository.FindAsync(x => x.Id == entity.Id!);
entity.ShouldBeNull(); entity.ShouldBeNull();
}); });

Loading…
Cancel
Save